问题修改

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

@@ -212,9 +212,30 @@ public class AskGoodsController {
         askGoodsService.testTwo();
     }
 
+    /**
+     * 入库回传
+     * */
     @GetMapping("test03")
     @PassToken
     public void test03(){
         askGoodsService.test03();
     }
+
+    /**
+     * 生产收货接口文档/报工单 w
+     * */
+    @GetMapping("test04")
+    @PassToken
+    public void test04(){
+        askGoodsService.test04();
+    }
+
+    /**
+     * 合并库存
+     * */
+    @GetMapping("merge")
+    @PassToken
+    public void merge(){
+        askGoodsService.merge();
+    }
 }

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

@@ -180,4 +180,7 @@ public interface AskGoodsMapper {
 
     List<Map<String, Object>> test03();
 
+    List<Map<String, Object>> test04();
+
+    List<Inventory> getInventoryList();
 }

src/main/java/com/tld/service/AskGoodsService.java

@@ -66,4 +66,7 @@ public interface AskGoodsService {
 
     void test03();
 
+    void merge();
+
+    void test04();
 }

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

@@ -322,7 +322,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     strJson.put("WMSCode", mapList.get(0).get("removalCode").toString());//出库单编号
                     strJson.put("WareHouse", warehouseWhere);//仓库ID
                     strJson.put("SourceBillDate",DateUtil.dateConversion(mapList.get(0).get("scrq").toString()));//业务日期
-                    strJson.put("SourceType", mapList.get(0).get("sourceType").toString());//来源类型
+                    strJson.put("SourceType", mapList.get(0).get("sourceType").toString());//来源类型 8
                     strJson.put("MoveType", mapList.get(0).get("moveType").toString());//移动类型
                     strJson.put("IsRed", 0);//是否红单1
                     strJson.put("Creator", realName);//制单人姓名1
@@ -1549,14 +1549,45 @@ public class AskGoodsServiceImpl implements AskGoodsService {
         return map;
     }
 
+    /**
+     * 入库回传
+     * */
     @Override
     public void test03() {
         List<Map<String,Object>> mapList = askGoodsMapper.test03();
         System.out.println("mapList:"+mapList);
         //入库回传 5
         for (Map<String, Object> map : mapList) {
-//            CreateGRReqInStock(map.get("orderNumber").toString(),"李兆峰");//生产收货接口文档
-            warehousingService.plugOutWarehousing(map.get("orderNumber").toString(),"李兆峰");//入库回传
+            warehousingService.plugOutWarehousing(map.get("orderNumber").toString()+",","李兆峰");//入库回传
+        }
+    }
+
+    /**
+     * 合并库存
+     * */
+    @Override
+    public void merge() {
+        //查询库存
+        List<Inventory> list = askGoodsMapper.getInventoryList();
+        //根据 库位编号 物料id wbs 所属公司 判断是否相同
+        for (int i = 0; i < list.size(); i++) {
+
+        }
+        //数量相加
+        //改变第一个数量
+        //删除多余的数据
+    }
+
+    /**
+     * 生产收货接口文档/报工单 w
+     * */
+    @Override
+    public void test04() {
+        List<Map<String,Object>> mapList = askGoodsMapper.test04();
+        System.out.println("mapList:"+mapList);
+        //生产收货接口文档/报工单 w
+        for (Map<String, Object> map : mapList) {
+            CreateGRReqInStock(map.get("storageCode").toString(),"李兆峰");//生产收货接口文档
         }
     }
 

src/main/resources/mapper/AskGoodsMapper.xml

@@ -1382,6 +1382,14 @@
     <select id="test03" resultType="java.util.Map">
         select order_number as orderNumber from tld_return_gs_warehousing where source_type  <![CDATA[!=]]> 'W'
     </select>
+    <!--生产收货接口文档/报工单 w-->
+    <select id="test04" resultType="java.util.Map">
+        select storage_code as storageCode from tld_return_gs_warehousing where source_type  <![CDATA[=]]> 'W'
+    </select>
+    <!--查询库存-->
+    <select id="getInventoryList" resultType="com.tld.model.Inventory">
+        select id,storage_location_code,material_id,amount,account_sleeve,wbs from tld_inventory
+    </select>
     <!-- 修改数据传输状态 -->
     <update id="updateRemoval">
         update tld_removal set transmission_type = "1" where storage_code = #{removalCode}