问题修改

src/main/java/com/tld/controller/GsPlugOutController.java

@@ -25,7 +25,7 @@ public class GsPlugOutController {
     private QueryListService queryListService;
 
     /**
-     * 入库回传/质检单
+     * 入库回传/质检单 5
      * @param orderNumber 参数
      */
     @GetMapping("plugOutWarehousing")

src/main/java/com/tld/controller/WarehousingController.java

@@ -119,6 +119,15 @@ public class WarehousingController {
     public Map<String, Object> getNotice(Notice notice){
         return warehousingService.getNotice(notice);
     }
+    
+    /** 
+    * @Description: 报工单导出
+    * @Param:
+    * @return: 
+    * @Author: XiaoChen
+    * @Date: 2023/5/11
+    */
+    
 
     /**
      * 报工单导出

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

@@ -247,7 +247,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
             for(AskGoods askGoods : list){
                 askGoods.setStorageCode(removalCode);
                 askGoods.setCompanyNumber(askGoods.getAccountSleeve());
-                Inventory inventory = askGoodsMapper.getInventory(askGoods);
+                Inventory inventory = askGoodsMapper.getInventory(askGoods);//查询库存数量
                 if(inventory == null){
 //                    throw new Exception("库存不存在");
 //                    System.out.println("库存不存在");
@@ -349,8 +349,12 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                         retunList.add(strJson);//*3  将父子表信息放在集合中
                         ReqOutStocks.put("ReqOutStocks",retunList);//*4 将放集合的数据封装到ReqOutStocks
                         returnData.put("strJson", JSON.toJSONString(ReqOutStocks));//*5 将封装好的ReqOutStocks放进strJson
+                        //添加记录到tld_access
+                        String names = "出库回传" ;
+                        String accessType = "1" ;
+                        String returnGsRemoval = returnData.toString() ;
+                        askGoodsMapper.addAccess(names,returnGsRemoval,accessType);
                         System.out.println("封装好的:"+returnData);
-
                         //回传地址
                         String url = "https://erp4.teld.cn:8443/cwbase/sg/V1/ERP/TELD/TELD_WMS/TELD_API_WMS_StockManage/CreateProductiveOutStock";
 //                        String url = "http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateProductiveOutStock";
@@ -415,11 +419,6 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                                 }
                             }
                         }
-                        //添加记录到tld_access
-                        String names = "出库回传" ;
-                        String accessType = "1" ;
-                        String returnGsRemoval = returnData.toString() ;
-                        askGoodsMapper.addAccess(names,returnGsRemoval,accessType);
                     }
                 }
             }
@@ -807,8 +806,12 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                         retunList.add(strJson);
                         ReqOutStocks.put("BILLs",retunList);
                         returnData.put("strJson", JSON.toJSONString(ReqOutStocks));
-                        System.out.println("封装好的:"+returnData);
-
+                        //添加记录到tld_access
+                        String names = "销售发货单" ;
+                        String accessType = "1" ;
+                        String returnGsRemoval = returnData.toString() ;
+                        askGoodsMapper.addAccess(names,returnGsRemoval,accessType);
+                        System.out.println("封装好的:"+returnData.toString());
                         //回传地址
                         //            String url = "http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateBOLOutStock";
                         String url = "https://erp4.teld.cn:8443/cwbase/sg/V1/ERP/TELD/TELD_WMS/TELD_API_WMS_StockManage/CreateBOLOutStock";
@@ -867,11 +870,6 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                                 }
                             }
                         }
-                        //添加记录到tld_access
-                        String names = "销售发货单" ;
-                        String accessType = "1" ;
-                        String returnGsRemoval = returnData.toString() ;
-                        askGoodsMapper.addAccess(names,returnGsRemoval,accessType);
                     }
                 }
             }
@@ -977,6 +975,11 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                         retunList.add(strJson);
                         ReqOutStocks.put("BILLs", retunList);
                         returnData.put("strJson", JSON.toJSONString(ReqOutStocks));
+                        //添加记录到tld_access
+                        String names = "移库单";
+                        String accessType = "1";
+                        String returnGsRemoval = returnData.toString();
+                        askGoodsMapper.addAccess(names, returnGsRemoval, accessType);
                         System.out.println("封装好的:"+returnData);
 
                         //
@@ -1029,11 +1032,6 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                                 }
                             }
                         }
-                        //添加记录到tld_access
-                        String names = "移库单";
-                        String accessType = "1";
-                        String returnGsRemoval = returnData.toString();
-                        askGoodsMapper.addAccess(names, returnGsRemoval, accessType);
                     }
                 }
             }
@@ -1101,7 +1099,12 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                         retunList.add(strJson);
                         ReqOutStocks.put("BILLs", retunList);
                         returnData.put("strJson", JSON.toJSONString(ReqOutStocks));
-                        System.out.println("封装好的:"+returnData);
+                        //添加记录到tld_access
+                        String names = "生产收货";
+                        String accessType = "1";
+                        String returnGsRemoval = returnData.toString();
+                        askGoodsMapper.addAccess(names, returnGsRemoval, accessType);
+                        System.out.println("封装好的:"+returnData.toString());
 
                         //回传地址
 //            String url = "http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateGRReqInStock";
@@ -1155,11 +1158,6 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                                 }
                             }
                         }
-                        //添加记录到tld_access
-                        String names = "生产收货";
-                        String accessType = "1";
-                        String returnGsRemoval = returnData.toString();
-                        askGoodsMapper.addAccess(names, returnGsRemoval, accessType);
                     }
                 }
             }
@@ -1223,7 +1221,12 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                             retunList.add(strJson);
                             ReqOutStocks.put("BILLs", retunList);
                             returnData.put("strJson", JSON.toJSONString(ReqOutStocks));
-                            System.out.println("封装好的:"+returnData);
+                            //添加记录到tld_access
+                            String names = "其它入库";
+                            String accessType = "1";
+                            String returnGsRemoval = returnData.toString();
+                            askGoodsMapper.addAccess(names, returnGsRemoval, accessType);
+                            System.out.println("封装好的:"+returnData.toString());
 
                             //            String url = "http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateOtherInStock";
                             String url = "https://erp4.teld.cn:8443/cwbase/sg/V1/ERP/TELD/TELD_WMS/TELD_API_WMS_StockManage/CreateOtherInStock";
@@ -1275,11 +1278,6 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                                     }
                                 }
                             }
-                            //添加记录到tld_access
-                            String names = "其它入库";
-                            String accessType = "1";
-                            String returnGsRemoval = returnData.toString();
-                            askGoodsMapper.addAccess(names, returnGsRemoval, accessType);
                         }
                     }
                     noticeIds.add(returnWarehousing1.get("noticeId").toString());
@@ -1343,7 +1341,12 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                         retunList.add(strJson);
                         ReqOutStocks.put("ReqOutStocks", retunList);
                         returnData.put("strJson", JSON.toJSONString(ReqOutStocks));
-                        System.out.println("封装好的:"+returnData);
+                        //添加记录到tld_access
+                        String names = "其它出库";
+                        String accessType = "1";
+                        String returnGsRemoval = returnData.toString();
+                        askGoodsMapper.addAccess(names, returnGsRemoval, accessType);
+                        System.out.println("封装好的:"+returnData.toString());
 
                         //            String url = "http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateMakeUpOtherOutStock";
                         String url = "https://erp4.teld.cn:8443/cwbase/sg/V1/ERP/TELD/TELD_WMS/TELD_API_WMS_StockManage/CreateMakeUpOtherOutStock";
@@ -1395,11 +1398,6 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                                 }
                             }
                         }
-                        //添加记录到tld_access
-                        String names = "其它出库";
-                        String accessType = "1";
-                        String returnGsRemoval = returnData.toString();
-                        askGoodsMapper.addAccess(names, returnGsRemoval, accessType);
                     }
                 }
             }
@@ -1464,6 +1462,11 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                         retunList.add(strJson);
                         ReqOutStocks.put("ReqOutStocks", retunList);
                         returnData.put("strJson", JSON.toJSONString(ReqOutStocks));
+                        //添加记录到tld_access
+                        String names = "其它出库";
+                        String accessType = "1";
+                        String returnGsRemoval = returnData.toString();
+                        askGoodsMapper.addAccess(names, returnGsRemoval, accessType);
                         System.out.println("封装好的:"+returnData);
 
                         HttpClientUtil httpClientUtil1 = new HttpClientUtil();
@@ -1516,11 +1519,6 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                                 }
                             }
                         }
-                        //添加记录到tld_access
-                        String names = "其它出库";
-                        String accessType = "1";
-                        String returnGsRemoval = returnData.toString();
-                        askGoodsMapper.addAccess(names, returnGsRemoval, accessType);
                     }
                 }
             }
@@ -1555,9 +1553,10 @@ public class AskGoodsServiceImpl implements AskGoodsService {
     public void test03() {
         List<Map<String,Object>> mapList = askGoodsMapper.test03();
         System.out.println("mapList:"+mapList);
-        //生产收货接口文档/报工单 w
+        //入库回传 5
         for (Map<String, Object> map : mapList) {
-            CreateGRReqInStock(map.get("orderNumber").toString(),"李兆峰");
+//            CreateGRReqInStock(map.get("orderNumber").toString(),"李兆峰");//生产收货接口文档
+            warehousingService.plugOutWarehousing(map.get("orderNumber").toString(),"李兆峰");//入库回传
         }
     }
 

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

@@ -178,6 +178,7 @@ public class InviteServiceImpl implements InviteService {
                 inviteMapper.updateOutNum(askGoods.getNum(), askGoodsId, materialId, askGoods.getEntryNumber());//修改出库数量
             }
             //查询要货单父级信息
+            //新增销售/出库回传出库数据
             AskGoods askGoods3 = inviteMapper.getAskDetailedF(askGoodsId);
             ReturRemoval returRemoval1 = new ReturRemoval()
                     .setDocumentId(askGoods3.getAskGoodsId())

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

@@ -289,6 +289,12 @@ public class WarehousingServiceImpl implements WarehousingService {
                 list.add(BillItems);
                 strJson.put("BillItems", list);
                 returnData.put("strJson", JSON.toJSONString(strJson));
+                //添加记录到tld_access
+                String names = "入库回传";
+                String accessType = "1";
+                String returnGsRemoval = returnData.toString();
+                askGoodsMapper.addAccess(names, returnGsRemoval, accessType);
+                System.out.println("封装好的："+returnData.toString());
                 //回传地址
 //                String url = "http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreatePurInStock";
                 String url = "https://erp4.teld.cn:8443/cwbase/sg/V1/ERP/TELD/TELD_WMS/TELD_API_WMS_StockManage/CreatePurInStock";
@@ -315,12 +321,6 @@ public class WarehousingServiceImpl implements WarehousingService {
                         type = 1;
                     }
                 }
-
-                //添加记录到tld_access
-                String names = "入库回传";
-                String accessType = "1";
-                String returnGsRemoval = returnData.toString();
-                askGoodsMapper.addAccess(names, returnGsRemoval, accessType);
                 //增加流水传输状态
                 warehousingMapper.updateWarehousingType(returnWarehousing.getStorageCode(), type);
             }

src/main/resources/application.yml

@@ -16,13 +16,13 @@ spring:
         master:
           username: root
           password: "#09SilverB"
-          url: jdbc:mysql://10.2.111.91:3306/tld?useUnicode=true&characterEncoding=utf-8&useSSL=true&rewriteBatchedStatements=true&allowMultiQueries=true
+          url: jdbc:mysql://8.142.144.205:3306/tld?useUnicode=true&characterEncoding=utf-8&useSSL=true&rewriteBatchedStatements=true&allowMultiQueries=true
           driver-class-name: com.mysql.cj.jdbc.Driver
         # 从数据源
         slave:
           # 从数据源开关/默认关闭
           enabled: true
-          url: jdbc:mysql://10.2.111.92:3306/tld?useUnicode=true&characterEncoding=utf-8&useSSL=true&rewriteBatchedStatements=true&allowMultiQueries=true
+          url: jdbc:mysql://8.142.144.205:3306/tld?useUnicode=true&characterEncoding=utf-8&useSSL=true&rewriteBatchedStatements=true&allowMultiQueries=true
           username: root
           password: "#09SilverB"
           driver-class-name: com.mysql.cj.jdbc.Driver
@@ -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

@@ -1377,7 +1377,7 @@
         WHERE c.removal_code = #{removalCode}
     </select>
     <select id="test03" resultType="java.util.Map">
-        select storage_code as orderNumber from tld_return_gs_warehousing where source_type  <![CDATA[=]]> 'W'
+        select order_number as orderNumber from tld_return_gs_warehousing where source_type  <![CDATA[!=]]> 'W'
     </select>
     <!-- 修改数据传输状态 -->
     <update id="updateRemoval">

src/main/resources/mapper/InviteMapper.xml

@@ -376,9 +376,9 @@
     </insert>
     <!-- 交货单接口 -->
     <insert id="addDeliverys">
-        insert into tld_delivery_f (delivery_id, delivery_code, company_number, customer_code, bills_time, delivery_type,source_type,move_type,project_name)
+        insert into tld_delivery_f (delivery_id, delivery_code, company_number, customer_code, bills_time, delivery_type,source_type,move_type,project_name,project_code)
         values
-            (#{deliveryOrderId},#{deliveryOrderNo},#{companyNumber},#{customerNo},#{docDate},#{deloveryGoodsType},#{sourceType},#{moveType},#{projectName})
+            (#{deliveryOrderId},#{deliveryOrderNo},#{companyNumber},#{customerNo},#{docDate},#{deloveryGoodsType},#{sourceType},#{moveType},#{projectName},#{projectCode})
         ;
         insert into tld_delivery ( delivery_id, entry_number, material_id, wbs, measurement_id, gs_delivery_num, gs_cancel_num, out_num,status )
         values