问题修改

src/main/java/com/tld/mapper/AskGoodsMapper.java

@@ -145,4 +145,10 @@ public interface AskGoodsMapper {
     void delNoticeSubtabulation(@Param("orderNumber") String orderNumber);
 
     String getAmount(AskGoods goods);
+
+    void updateRemoval(String removalCode);
+
+    void updateRemovalHalfProduct(String wmsCode);
+
+    void updateRemovalHalf(String wmsCode);
 }

src/main/java/com/tld/mapper/QueryListMapper.java

@@ -57,4 +57,6 @@ public interface QueryListMapper {
     String getAmounts(Delivery delivery1);
 
     List<Notice> getOtherReceivingGoods(Notice notice);
+
+    void updateType(String wmsCode);
 }

src/main/java/com/tld/model/Inventory.java

@@ -132,6 +132,14 @@ public class Inventory implements Serializable {
      * 公司名称
      */
     private String companyName;
+    /**
+     * 计量单位
+     */
+    private String unitOfMeasurement;
+    /**
+     * 物料类别
+     */
+    private String partType;
     /**
      * 页数
      */

src/main/java/com/tld/service/impl/AskGoodsServiceImpl.java

@@ -39,6 +39,9 @@ public class AskGoodsServiceImpl implements AskGoodsService {
     private DeliveryMapper deliveryMapper;
     @Autowired
     private DictionaryMapper dictionaryMapper;
+    @Autowired
+    private QueryListMapper queryListMapper;
+
 
     /**
     * @Description: 要货申请单（生产领用申请）
@@ -129,12 +132,24 @@ public class AskGoodsServiceImpl implements AskGoodsService {
         try{
             List<AskGoods> list = askGoodsMapper.getAskGoodsMaterial(askGoods);
             List<String> scanNum = new LinkedList<>();
+            List<String> mapVal = new LinkedList<>();
             for(AskGoods askGoods1 : list){
                 askGoods1.setUniqueCode(askGoods.getUniqueCode());
                 askGoods1.setWllbCode(askGoods1.getMaterialCode());
                 scanNum.add(askGoodsMapper.getScanNum(askGoods1));//扫描总数
+                Inventory inventory = new Inventory()
+                        .setMaterialId(askGoods1.getMaterialId())
+                        .setWbs(askGoods1.getWbs())
+                        .setCompanyCode(askGoods1.getCompanyNumber());
+                List<Map<String, Object>> inventorVal = queryListMapper.storageLocation(inventory);
+                if(inventorVal.size() != 0){
+                    mapVal.add(inventorVal.get(0).get("sum").toString());
+                } else {
+                    mapVal.add("0");
+                }
             }
             map.put("scanNum", scanNum);
+            map.put("sum", mapVal);
             map.put("data", list);
             map.put("msg", "200");
         }catch (Exception e){
@@ -331,6 +346,10 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                 error.setErrorInfo(result.get("data").toString());
                 error.setUrl("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateProductiveOutStock");
                 error.setDataVal(returnData.toJSONString()).setType("出库回传");
+                //修改流水传输状态
+                for(Map<String, Object> map : askGoodsMapper.plugOutRemoval(removalCode)){
+                    askGoodsMapper.updateRemoval(map.get("removalCode").toString());
+                }
                 errorMapper.addError(error);
                 type = 1;
             }else {
@@ -342,6 +361,10 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     error.setUrl("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateProductiveOutStock");
                     error.setDataVal(returnData.toJSONString()).setType("出库回传");
                     errorMapper.addError(error);
+                    //修改流水传输状态
+                    for(Map<String, Object> map : askGoodsMapper.plugOutRemoval(removalCode)){
+                        askGoodsMapper.updateRemoval(map.get("removalCode").toString());
+                    }
                     type = 1;
                 }else {
                     List<JSONObject>  data1 = (List<JSONObject>) JSONObject.parse(jsonObject1.get("data").toString());
@@ -354,6 +377,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                                     error.setUrl("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateProductiveOutStock");
                                     error.setDataVal(jsonObject2.toString()).setType("出库回传");
                                     errorMapper.addError(error);
+                                    askGoodsMapper.updateRemoval(jsonObject2.get("WMSCode").toString());
                                 }
                             }
                         }
@@ -737,10 +761,8 @@ public class AskGoodsServiceImpl implements AskGoodsService {
             JSONObject ReqOutStocks = new JSONObject();
             ReqOutStocks.put("BILLs",retunList);
             returnData.put("strJson", JSON.toJSONString(ReqOutStocks));
-            System.out.println(returnData);
             HttpClientUtil httpClientUtil1 = new HttpClientUtil();
             Map<String, Object> result = httpClientUtil1.doPost("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateBOLOutStock", returnData);
-            System.out.println("result："+result);
             Error error = new Error();
             if(Integer.parseInt(result.get("msg").toString()) != 200){
                 //如果失败存入报错信息跟数据
@@ -835,7 +857,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
     }
 
     /**
-     *移库单接口文档
+     * 移库单接口文档
      */
     @Override
     public void CreateGMReqOutStock(String removalCode) {
@@ -882,10 +904,8 @@ public class AskGoodsServiceImpl implements AskGoodsService {
             ReqOutStocks.put("BILLs", retunList);
             List<JSONObject> retunList1 = new LinkedList<>();
             returnData.put("strJson", JSON.toJSONString(ReqOutStocks));
-            System.out.println(returnData);
             HttpClientUtil httpClientUtil1 = new HttpClientUtil();
             Map<String, Object> result = httpClientUtil1.doPost("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateGMReqOutStock", returnData);
-            System.out.println("result：" + result);
             Error error = new Error();
             if (Integer.parseInt(result.get("msg").toString()) != 200) {
                 //如果失败存入报错信息跟数据
@@ -921,9 +941,9 @@ public class AskGoodsServiceImpl implements AskGoodsService {
             }
             //删除父子表信息
             //根据code
-//            askGoodsMapper.delReturnWarehouseTransfer(removalCode);
-//            //根据id
-//            askGoodsMapper.delReturnWarehouseTransferZ(warehouseTransferTd);
+            askGoodsMapper.delReturnWarehouseTransfer(removalCode);
+            //根据id
+            askGoodsMapper.delReturnWarehouseTransferZ(warehouseTransferTd);
             //添加记录到tld_access
             String names = "移库单";
             String accessType = "1";
@@ -987,17 +1007,19 @@ public class AskGoodsServiceImpl implements AskGoodsService {
             ReqOutStocks.put("BILLs", retunList);
             List<JSONObject> retunList1 = new LinkedList<>();
             returnData.put("strJson", JSON.toJSONString(ReqOutStocks));
-            System.out.println(returnData);
             HttpClientUtil httpClientUtil1 = new HttpClientUtil();
             Map<String, Object> result = httpClientUtil1.doPost("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateGRReqInStock", returnData);
-            System.out.println("result：" + result);
             Error error = new Error();
             if (Integer.parseInt(result.get("msg").toString()) != 200) {
                 //如果失败存入报错信息跟数据
                 error.setErrorInfo(result.get("data").toString());
                 error.setUrl("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateGRReqInStock");
-                error.setDataVal(returnData.toJSONString()).setType("半成品入库");
+                error.setDataVal(returnData.toJSONString()).setType("生产收货");
                 errorMapper.addError(error);
+                //修改流水传输状态
+                for(Map<String, Object> map : askGoodsMapper.plugOutRemoval(removalCode)){
+                    askGoodsMapper.updateRemoval(map.get("removalCode").toString());
+                }
             } else {
                 JSONObject jsonObject = (JSONObject) JSONObject.parse(result.get("data").toString());
                 JSONObject jsonObject1 = (JSONObject) JSONObject.parse(jsonObject.get("result").toString());
@@ -1005,7 +1027,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     //如果失败存入报错信息跟数据
                     error.setErrorInfo(jsonObject1.get("Msg").toString());
                     error.setUrl("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateGRReqInStock");
-                    error.setDataVal(returnData.toJSONString()).setType("半成品入库");
+                    error.setDataVal(returnData.toJSONString()).setType("生产收货");
                     errorMapper.addError(error);
                 } else {
                     List<JSONObject> data1 = (List<JSONObject>) JSONObject.parse(jsonObject1.get("data").toString());
@@ -1016,7 +1038,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                                     //如果失败存入报错信息跟数据
                                     error.setErrorInfo(map.get("FailReason").toString());
                                     error.setUrl("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateGRReqInStock");
-                                    error.setDataVal(jsonObject2.toString()).setType("半成品入库");
+                                    error.setDataVal(jsonObject2.toString()).setType("生产收货");
                                     errorMapper.addError(error);
                                 }
                             }
@@ -1026,9 +1048,9 @@ public class AskGoodsServiceImpl implements AskGoodsService {
             }
             //删除父子表信息
             //根据code
-//            askGoodsMapper.delNoticeParent(returnWarehousing.getOrderNumber());
-//            //根据id
-//            askGoodsMapper.delNoticeSubtabulation(returnWarehousing.getOrderNumber());
+            askGoodsMapper.delNoticeParent(returnWarehousing.getOrderNumber());
+            //根据id
+            askGoodsMapper.delNoticeSubtabulation(returnWarehousing.getOrderNumber());
             //添加记录到tld_access
             String names = "报工单";
             String accessType = "1";

src/main/java/com/tld/service/impl/InviteServiceImpl.java

@@ -3,6 +3,7 @@ package com.tld.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.tld.mapper.DictionaryMapper;
 import com.tld.mapper.InviteMapper;
+import com.tld.mapper.QueryListMapper;
 import com.tld.model.*;
 import com.tld.service.InviteService;
 import org.redisson.api.RLock;
@@ -25,6 +26,8 @@ public class InviteServiceImpl implements InviteService {
     private RedissonClient redissonClient;
     @Autowired
     private DictionaryMapper dictionaryMapper;
+    @Autowired
+    private QueryListMapper queryListMapper;
 
     @Override
     public Map<String, Object> getAskGoodsfList(AskGoods askGoods) {
@@ -47,12 +50,24 @@ public class InviteServiceImpl implements InviteService {
         try{
             List<AskGoods> list = inviteMapper.getAskGoodsMaterial(askGoods);
             List<String> scanNum = new LinkedList<>();
+            List<String> mapVal = new LinkedList<>();
             for(AskGoods askGoods1 : list){
                 askGoods1.setUniqueCode(askGoods.getUniqueCode());
                 askGoods1.setUniqueCode(askGoods.getUniqueCode());
                 scanNum.add(inviteMapper.getScanNum(askGoods1));//扫描总数
+                Inventory inventory = new Inventory()
+                        .setMaterialId(askGoods1.getMaterialId())
+                        .setWbs(askGoods1.getWbs())
+                        .setCompanyCode(askGoods1.getCompanyNumber());
+                List<Map<String, Object>> inventorVal = queryListMapper.storageLocation(inventory);
+                if(inventorVal.size() != 0){
+                    mapVal.add(inventorVal.get(0).get("sum").toString());
+                } else {
+                    mapVal.add("0");
+                }
             }
             map.put("scanNum", scanNum);
+            map.put("sum", mapVal);
             map.put("data", list);
             map.put("msg", "200");
         }catch (Exception e){

src/main/java/com/tld/service/impl/QueryListServiceImpl.java

@@ -5,8 +5,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.tld.excel.ExcelUtils;
+import com.tld.mapper.AskGoodsMapper;
 import com.tld.mapper.ErrorMapper;
 import com.tld.mapper.QueryListMapper;
+import com.tld.mapper.WarehousingMapper;
 import com.tld.model.*;
 import com.tld.model.Error;
 import com.tld.service.QueryListService;
@@ -28,6 +30,12 @@ public class QueryListServiceImpl implements QueryListService {
 
     @Autowired
     private ErrorMapper errorMapper;
+    //入库
+    @Autowired
+    private WarehousingMapper warehousingMapper;
+    //出库
+    @Autowired
+    private AskGoodsMapper askGoodsMapper;
 
     @Override
     public Map<String, Object> dullGoods(Inventory inventory) {
@@ -510,7 +518,7 @@ public class QueryListServiceImpl implements QueryListService {
             //导出数据汇总
             List<List<Object>> sheetDataList = new ArrayList<>();
             //表头数据
-            List<Object> head = Arrays.asList("接口路径", "错误信息", "传输数据","发生时间");
+            List<Object> head = Arrays.asList("接口路径", "错误信息", "传输数据","发生时间","请求类型");
             //查询数据
             List<Map<String, Object>> list = errorMapper.getErrorExcel(error);
             sheetDataList.add(head);
@@ -553,28 +561,26 @@ public class QueryListServiceImpl implements QueryListService {
                     error.setDataVal(errorVal.getDataVal()).setType(errorVal.getType());
                     errorMapper.addError(error);
                 } else {
-                    List<JSONObject> data1 = (List<JSONObject>) JSONObject.parse(jsonObject1.get("data").toString());
-                    for (JSONObject map : data1) {
-                        if (map.get("State").toString().equals("0")) {
-                            if (errorVal.getType().equals("入库回传")) {
-                                //如果失败存入报错信息跟数据
-                                error.setErrorInfo(jsonObject.get("Msg").toString());
-                                error.setUrl(errorVal.getUrl());
-                                error.setDataVal(errorVal.getDataVal()).setType("入库回传");
-                                errorMapper.addError(error);
-                            } else if (errorVal.getType().equals("移库") || errorVal.getType().equals("半成品入库") || errorVal.getType().equals("销售出库")) {
-                                JSONObject json = (JSONObject) JSONObject.parse(errorVal.getDataVal());
-                                List<JSONObject> data2 = (List<JSONObject>) json.get("BILLs");
-                                for (JSONObject jsonObject2 : data2) {
-                                    if(errorVal.getType().equals("移库")){
-                                        if (jsonObject2.get("WMSCode").toString().equals(map.get("WMSCode")) && jsonObject2.get("FromWareHouse").toString().equals(map.get("FromWareHouse"))) {
-                                            //如果失败存入报错信息跟数据
-                                            error.setErrorInfo(map.get("FailReason").toString());
-                                            error.setUrl(errorVal.getUrl());
-                                            error.setDataVal(jsonObject2.toString()).setType(errorVal.getType());
-                                            errorMapper.addError(error);
-                                        }
-                                    } else {
+                    if (errorVal.getType().equals("入库回传")) {
+                        JSONObject jsonObject2 = JSONObject.parseObject(JSON.parseObject((String) result.get("data")).get("result").toString());
+                        if (jsonObject2.get("State").toString().equals("0")) {
+                            //如果失败存入报错信息跟数据
+                            error.setErrorInfo(jsonObject2.get("Msg").toString());
+                            error.setUrl("http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateProductiveOutStock");
+                            error.setDataVal(errorVal.getDataVal()).setType(errorVal.getType());
+                            errorMapper.addError(error);
+                        } else {
+                            //增加流水传输状态
+                            warehousingMapper.updateWarehousingType(jsonObject2.get("WMSCode").toString(), 0);
+                        }
+                    } else {
+                        List<JSONObject> data1 = (List<JSONObject>) JSONObject.parse(jsonObject1.get("data").toString());
+                        for (JSONObject map : data1) {
+                            if (map.get("State").toString().equals("0")) {
+                                if(errorVal.getType().equals("出库回传")){
+                                    JSONObject json = (JSONObject) JSONObject.parse(errorVal.getDataVal());
+                                    List<JSONObject> data2 = (List<JSONObject>) json.get("ReqOutStocks");
+                                    for (JSONObject jsonObject2 : data2) {
                                         if (jsonObject2.get("WMSCode").toString().equals(map.get("WMSCode")) && jsonObject2.get("WareHouse").toString().equals(map.get("WareHouse"))) {
                                             //如果失败存入报错信息跟数据
                                             error.setErrorInfo(map.get("FailReason").toString());
@@ -583,17 +589,47 @@ public class QueryListServiceImpl implements QueryListService {
                                             errorMapper.addError(error);
                                         }
                                     }
+                                } else {
+                                    JSONObject json = (JSONObject) JSONObject.parse(errorVal.getDataVal());
+                                    List<JSONObject> data2 = (List<JSONObject>) json.get("BILLs");
+                                    for (JSONObject jsonObject2 : data2) {
+                                        if(errorVal.getType().equals("移库")){
+                                            if (jsonObject2.get("WMSCode").toString().equals(map.get("WMSCode")) && jsonObject2.get("FromWareHouse").toString().equals(map.get("FromWareHouse"))) {
+                                                //如果失败存入报错信息跟数据
+                                                error.setErrorInfo(map.get("FailReason").toString());
+                                                error.setUrl(errorVal.getUrl());
+                                                error.setDataVal(jsonObject2.toString()).setType(errorVal.getType());
+                                                errorMapper.addError(error);
+                                            }
+                                        } else {
+                                            if (jsonObject2.get("WMSCode").toString().equals(map.get("WMSCode")) && jsonObject2.get("WareHouse").toString().equals(map.get("WareHouse"))) {
+                                                //如果失败存入报错信息跟数据
+                                                error.setErrorInfo(map.get("FailReason").toString());
+                                                error.setUrl(errorVal.getUrl());
+                                                error.setDataVal(jsonObject2.toString()).setType(errorVal.getType());
+                                                errorMapper.addError(error);
+                                            }
+                                        }
+                                    }
                                 }
-                            } else if(errorVal.getType().equals("出库回传")){
-                                JSONObject json = (JSONObject) JSONObject.parse(errorVal.getDataVal());
-                                List<JSONObject> data2 = (List<JSONObject>) json.get("ReqOutStocks");
-                                for (JSONObject jsonObject2 : data2) {
-                                    if (jsonObject2.get("WMSCode").toString().equals(map.get("WMSCode")) && jsonObject2.get("WareHouse").toString().equals(map.get("WareHouse"))) {
-                                        //如果失败存入报错信息跟数据
-                                        error.setErrorInfo(map.get("FailReason").toString());
-                                        error.setUrl(errorVal.getUrl());
-                                        error.setDataVal(jsonObject2.toString()).setType(errorVal.getType());
-                                        errorMapper.addError(error);
+                            } else {
+                                if(errorVal.getType().equals("移库")) {
+                                    queryListMapper.updateType(map.get("WMSCode").toString());
+                                } else if(errorVal.getType().equals("销售出库")){
+                                    JSONObject json = (JSONObject) JSONObject.parse(errorVal.getDataVal());
+                                    List<JSONObject> data2 = (List<JSONObject>) json.get("BILLs");
+                                    for (JSONObject jsonObject2 : data2) {
+                                        if (jsonObject2.get("WMSCode").toString().equals(map.get("WMSCode")) && jsonObject2.get("WareHouse").toString().equals(map.get("WareHouse"))) {
+                                            //查询物料信息
+                                            MaterialClass material = warehousingMapper.getMaterial(new Notice().setMaterialId(jsonObject2.get("Material").toString()));
+                                            if(material.getPartType().equals("原材料")) {
+                                                askGoodsMapper.updateRemoval(jsonObject2.get("WMSCode").toString());
+                                            } else if(material.getPartType().equals("半成品")) {
+                                                askGoodsMapper.updateRemovalHalfProduct(jsonObject2.get("WMSCode").toString());
+                                            } else if(material.getPartType().equals("产成品")){
+                                                askGoodsMapper.updateRemovalHalf(jsonObject2.get("WMSCode").toString());
+                                            }
+                                        }
                                     }
                                 }
                             }

src/main/java/com/tld/service/impl/WarehousingServiceImpl.java

@@ -180,7 +180,7 @@ public class WarehousingServiceImpl implements WarehousingService {
                 warehousingVirtual.setPurchaseNum(receiveGoods1.getPurchaseNum());
                 list.add(warehousingVirtual);
 
-                if(Integer.parseInt(warehousingVirtual.getNum()) <= 0){
+                if(Double.parseDouble(warehousingVirtual.getNum()) <= 0){
                     break;
                 }
                 receiveGoods1.setWarehousingNum(warehousingVirtual.getNum());
@@ -673,8 +673,8 @@ public class WarehousingServiceImpl implements WarehousingService {
     public Map<String, Object> getProductWarehousingRecommend(String uniqueCode, String type, String noticeId) {
         Map<String, Object> map = new HashMap<>();
         try {
-            //返回采购单id
-            StringBuilder stringBuilder = new StringBuilder();
+            //入库流水
+            String storageCode = codeGenerateRk();
             //查询入库所需要的信息
             for (WarehousingVirtual warehousingVirtual : warehousingMapper.getVirtualNotice(uniqueCode, type, noticeId)) {
                 //查询物料信息
@@ -701,8 +701,6 @@ public class WarehousingServiceImpl implements WarehousingService {
                 }
                 warehousingMapper.addInventoryNotice(notice2);//入库存
                 warehousingMapper.updateNotice(notice2);//修改报工单数量
-                //入库流水
-                String storageCode = codeGenerateRk();
                 WarehousingVirtual warehousingVirtual1 = new WarehousingVirtual()
                         .setWllbCode(material.getWllbCode())
                         .setUserId(warehousingVirtual.getUserId())
@@ -729,13 +727,10 @@ public class WarehousingServiceImpl implements WarehousingService {
                         .setId(notice1.getId())//分录单id
                         .setWarehousingNum(warehousingVirtual.getNum());//入库数量
                 warehousingMapper.addReturnWarehousing(returnWarehousing);
-                if (!stringBuilder.toString().contains(notice1.getNoticeId() + ",")) {
-                    stringBuilder.append(notice1.getNoticeId() + ",");
-                }
                 warehousingMapper.delVirtual(uniqueCode);//删除临时表数据
             }
             map.put("msg", "200");
-            map.put("data", stringBuilder.toString());
+            map.put("data", storageCode);
         } catch (Exception e) {
             e.printStackTrace();
             map.put("msg", "500");

src/main/resources/application.yml

@@ -41,8 +41,8 @@ spring:
     async:
       request-timeout: 20000
   redis:
-#    host: 8.142.144.205
-    host: 10.2.111.91
+    host: 8.142.144.205
+#    host: 10.2.111.91
     port: 6379
     password: '#09SilverB'
     jedis:

src/main/resources/mapper/AskGoodsMapper.xml

@@ -301,9 +301,9 @@
     <!-- 插入出库流水 -->
     <insert id="addRemoval">
         insert into tld_removal(wllb_code, supplier_id, serial, num, type, user_id, storage_location_code, scrq,
-                                process, ask_goods_id, produc_date, department, storage_code, wbs, account_sleeve)
+                                process, ask_goods_id, produc_date, department, storage_code, wbs, account_sleeve,transmission_type)
         values (#{wllbCode}, #{supplierId}, #{serial}, #{num}, #{type}, #{userId}, #{storageLocationCode}, now(),
-                #{process}, #{askGoodsId}, #{producDate}, #{department}, #{storageCode}, #{wbs}, #{companyNumber})
+                #{process}, #{askGoodsId}, #{producDate}, #{department}, #{storageCode}, #{wbs}, #{companyNumber},'0')
     </insert>
     <!-- 查询指定物料类型的id -->
     <select id="getMaterialId" resultType="String">
@@ -986,7 +986,7 @@
     <select id="getWarehouseWhere" resultType="String">
         SELECT DISTINCT b.warehouse_where
         FROM tld_return_gs_removal_z a
-                 JOIN tld_storage_location b ON a.storage_location_code = b.storage_location_code
+        JOIN tld_storage_location b ON a.storage_location_code = b.storage_location_code
         WHERE a.document_id = #{removalCode}
     </select>
     <!-- 查询半成品原始数据 -->
@@ -1150,4 +1150,16 @@
     <select id="getAmount" resultType="java.lang.String">
         select ifnull(sum(amount),'0') as amount from tld_inventory where wbs = #{wbs} and account_sleeve = #{companyNumber} and wllb_code = #{materialCode}
     </select>
+    <!-- 修改数据传输状态 -->
+    <update id="updateRemoval">
+        update tld_removal set transmission_type = "1" where storage_code = #{removalCode}
+    </update>
+    <!-- 修改数据传输状态 -->
+    <update id="updateRemovalHalfProduct">
+        update tld_removal_half_product set transmission_type = "1" where storage_code = #{removalCode}
+    </update>
+    <!-- 修改数据传输状态 -->
+    <update id="updateRemovalHalf">
+        update tld_removal_half set transmission_type = "1" where storage_code = #{removalCode}
+    </update>
 </mapper>

src/main/resources/mapper/DeliveryMapper.xml

@@ -112,8 +112,8 @@
     </update>
     <!-- 产成品出库流水 -->
     <insert id="addRemovalHalf">
-        insert into tld_removal_half(wllb_code,num,user_id,scrq,delivery_id,company_number,customer_code,storage_code,wbs,account_sleeve)
-        value(#{materialCode},#{outNum},#{userId},now(),#{deliveryId},#{companyNumber},#{customerCode},#{storageCode},#{wbs},#{companyNumber})
+        insert into tld_removal_half(wllb_code,num,user_id,scrq,delivery_id,company_number,customer_code,storage_code,wbs,account_sleeve,transmission_type)
+        value(#{materialCode},#{outNum},#{userId},now(),#{deliveryId},#{companyNumber},#{customerCode},#{storageCode},#{wbs},#{companyNumber},0)
     </insert>
     <!-- 查询销售单父级信息 -->
     <select id="getDeliveryF" resultType="com.tld.model.Delivery">
@@ -242,7 +242,7 @@
     </select>
     <!-- 新增半成品流水 -->
     <insert id="addRemovalHalfProduct">
-        insert into tld_removal_half_product(wllb_code,num,user_id,scrq,ask_goods_id,storage_code,wbs,company_number)
-            value(#{materialCode},#{outNum},#{userId},now(),#{deliveryId},#{storageCode},#{wbs},#{companyNumber})
+        insert into tld_removal_half_product(wllb_code,num,user_id,scrq,ask_goods_id,storage_code,wbs,company_number,transmission_type)
+            value(#{materialCode},#{outNum},#{userId},now(),#{deliveryId},#{storageCode},#{wbs},#{companyNumber},0)
     </insert>
 </mapper>

src/main/resources/mapper/ErrorMapper.xml

@@ -49,7 +49,8 @@
         url,
         error_info,
         data_val,
-        scrq
+        scrq,
+        type
         FROM
         tld_error
         <trim prefix="WHERE" prefixOverrides="and |or">
@@ -68,6 +69,12 @@
             <if test="dataVal != null and dataVal != ''">
                 and data_val like CONCAT(CONCAT('%', #{dataVal}), '%')
             </if>
+            <if test="type != null and type != ''">
+                and type like CONCAT(CONCAT('%', #{type}), '%')
+            </if>
+            <if test="transmissionType != null and transmissionType != ''">
+                and transmission_type like CONCAT(CONCAT('%', #{transmissionType}), '%')
+            </if>
         </trim>
         ORDER BY scrq DESC
     </select>

src/main/resources/mapper/QueryListMappeer.xml

@@ -77,26 +77,26 @@
     <select id="storageLocation" resultType="java.util.Map">
         SELECT
             a.id,
-            a.storage_location_code as storageLocationCode,
-            a.material_id as materialId,
+            YEAR(CURDATE()) AS year,
+            MONTH(CURDATE()) AS month,
+            f.code as warehouseCode,
+            f.name as warehouseName,
+            b.storage_location_name as storageLocationName,
+            c.code as code,
+            c.name as name,
+            c.unit_of_measurement as unitOfMeasurement,
             sum( a.amount ) AS sum,
-            a.serial,
             a.wbs as wbs,
-            a.produc_batch as producBatch,
+            c.max_num as maxNum,
+            DATEDIFF(now(), scrq) as day,
+            c.part_type as partType,
+            c.wllb_class as wllbClass,
+            p.code as companyCode,
+            p.name as companyName,
+            a.account_sleeve as accountSleeve,
             a.supplier_id as supplierId,
-            b.storage_location_name as storageLocationName ,
-            b.warehouse_where as warehouseWhere,
-            b.storage_location_type as storageLocationType,
-            b.storage_location_capacity as storageLocationCapacity,
-            b.is_not_disable as isNotDisable,
-            b.create_time as createTime,
-            b.is_product as isProduct,
-            c.name as name,
-            c.code as code,
             e.name as supplierName,
-            f.name as warehouseName,
-            p.name as companyName,
-            a.account_sleeve as accountSleeve
+            a.storage_location_code as storageLocationCode
         FROM
         tld_inventory a
         LEFT JOIN tld_storage_location b ON a.storage_location_code = b.storage_location_code
@@ -135,6 +135,15 @@
             <if test="warehouseId != null and warehouseId != ''">
                 and f.tld_id = #{warehouseId}
             </if>
+            <if test="partType != null and partType != ''">
+                and c.part_type = #{partType}
+            </if>
+            <if test="wllbClass != null and wllbClass != ''">
+                and c.wllb_class = #{wllbClass}
+            </if>
+            <if test="unitOfMeasurement != null and unitOfMeasurement != ''">
+                and c.unit_of_measurement = #{unitOfMeasurement}
+            </if>
         </trim>
         GROUP BY
         a.storage_location_code,
@@ -1000,4 +1009,9 @@
         </trim>
         order by a.id desc
     </select>
+    <!-- 移库修改状态 -->
+    <update id="updateType">
+        update tld_storage set transmission_type = 0 where storage_code = #{wmsCode};
+        update tld_removal set transmission_type = 0 where storage_code = #{wmsCode};
+    </update>
 </mapper>

src/main/resources/mapper/WarehousingMapper.xml

@@ -156,10 +156,10 @@
     <!-- 插入入库流水 -->
     <insert id="addStorage">
         insert into
-        tld_storage(wllb_code,supplier_id,serial,produc_date,produc_batch,capacity,seq,type,user_id,department_id,storage_location_code,scrq,storage_code,wbs,order_code,account_sleeve,purchase_num)
+        tld_storage(wllb_code,supplier_id,serial,produc_date,produc_batch,capacity,seq,type,user_id,department_id,storage_location_code,scrq,storage_code,wbs,order_code,account_sleeve,purchase_num,transmission_type)
         values
         <foreach collection="list" index="index" item="item" separator=",">
-            (#{item.wllbCode},#{item.suppId},#{item.serial},#{item.producDate},#{item.producDate},#{item.num},#{item.seq},#{item.type},#{item.userId},#{item.departmentId},#{item.storageLocationCode},now(),#{item.storageCode},#{item.wbs},#{item.warehouseTransferId},#{item.accountSleeve},#{item.purchaseNum})
+            (#{item.wllbCode},#{item.suppId},#{item.serial},#{item.producDate},#{item.producDate},#{item.num},#{item.seq},#{item.type},#{item.userId},#{item.departmentId},#{item.storageLocationCode},now(),#{item.storageCode},#{item.wbs},#{item.warehouseTransferId},#{item.accountSleeve},#{item.purchaseNum},0)
         </foreach>
     </insert>
     <!-- 插入库存 -->
@@ -556,8 +556,8 @@
     <!-- 新增半成品入库流水 -->
     <insert id="addProduct">
         insert into tld_half_product(wllb_code, produc_date, produc_batch, capacity, user_id, storage_location_code,
-                                     scrq, storage_code, wbs, production_code,account_sleeve)
-            value (#{wllbCode},#{producDate},#{producDate},#{num},#{userId},#{storageLocationCode},now(),#{storageCode},#{wbs}, #{productionCode},#{accountSleeve})
+                                     scrq, storage_code, wbs, production_code,account_sleeve,transmission_type)
+            value (#{wllbCode},#{producDate},#{producDate},#{num},#{userId},#{storageLocationCode},now(),#{storageCode},#{wbs}, #{productionCode},#{accountSleeve},0)
     </insert>
     <!-- 查询半成品入库流水-->
     <select id="getProduct" resultType="com.tld.model.Notice">
@@ -763,8 +763,8 @@
     <!-- 产成品入库 -->
     <insert id="addHalf">
         insert into tld_half(wllb_code, produc_date, produc_batch, capacity, user_id, storage_location_code, scrq,
-                             serial, seq, attribute, storage_code, wbs, production_code,account_sleeve)
-            value (#{wllbCode},#{producDate},#{producDate},#{num},#{userId},#{storageLocationCode},now(),#{serial},#{seq},#{attribute},#{storageCode},#{wbs},#{productionCode},#{accountSleeve})
+                             serial, seq, attribute, storage_code, wbs, production_code,account_sleeve,transmission_type)
+            value (#{wllbCode},#{producDate},#{producDate},#{num},#{userId},#{storageLocationCode},now(),#{serial},#{seq},#{attribute},#{storageCode},#{wbs},#{productionCode},#{accountSleeve},0)
     </insert>
     <!-- 查询虚拟表数据进行入库 -->
     <select id="getVirtualNotice" resultType="com.tld.model.WarehousingVirtual">