问题修改

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

@@ -1,5 +1,6 @@
 package com.tld.controller;
 
+import com.tld.mapper.WarehousingMapper;
 import com.tld.model.AskGoods;
 import com.tld.model.ReceiveGoods;
 import com.tld.service.AskGoodsService;
@@ -210,4 +211,10 @@ public class AskGoodsController {
     public void testTwo(){
         askGoodsService.testTwo();
     }
+
+    @GetMapping("test03")
+    @PassToken
+    public void test03(){
+        askGoodsService.test03();
+    }
 }

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

@@ -25,7 +25,7 @@ public class GsPlugOutController {
     private QueryListService queryListService;
 
     /**
-     * 入库回传
+     * 入库回传/质检单
      * @param orderNumber 参数
      */
     @GetMapping("plugOutWarehousing")
@@ -61,7 +61,7 @@ public class GsPlugOutController {
     }
 
     /**
-     * 生产收货接口文档/报工单
+     * 生产收货接口文档/报工单 w
      * @param removalCode 入库单编号
      */
     @GetMapping("CreateGRReqInStock")

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

@@ -177,4 +177,7 @@ public interface AskGoodsMapper {
     List<String> getWarehouseWheres(@Param("removalCode") String removalCode);
 
     void UpdSerial(AskGoods askGoods);
+
+    List<Map<String, Object>> test03();
+
 }

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

@@ -52,9 +52,13 @@ public class Delivery implements Serializable {
      */
     private String sourceType;
     /**
-     * 移动类型
+     * 移动类型  status
      */
     private String moveType;
+    /**
+     * 0没有强制完成1强制完成
+     */
+    private String status;
     /**
      * gs分录号
      */

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

@@ -63,4 +63,6 @@ public interface AskGoodsService {
     void testTwo();
 
     Map<String, Object> getRemovalHalfUpdSerial(AskGoods askGoods);
+
+    void test03();
 }

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

@@ -9,6 +9,7 @@ import com.tld.mapper.*;
 import com.tld.model.*;
 import com.tld.model.Error;
 import com.tld.service.AskGoodsService;
+import com.tld.service.WarehousingService;
 import com.tld.util.DateUtil;
 import com.tld.util.HttpClientUtil;
 import org.redisson.api.RLock;
@@ -33,6 +34,9 @@ public class AskGoodsServiceImpl implements AskGoodsService {
     //入库
     @Autowired
     private WarehousingMapper warehousingMapper;
+    //入库
+    @Autowired
+    private WarehousingService warehousingService;
     @Autowired
     private ErrorMapper errorMapper;
     @Autowired
@@ -810,7 +814,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                         String url = "https://erp4.teld.cn:8443/cwbase/sg/V1/ERP/TELD/TELD_WMS/TELD_API_WMS_StockManage/CreateBOLOutStock";
                         HttpClientUtil httpClientUtil1 = new HttpClientUtil();
                         Map<String, Object> result = httpClientUtil1.doPost(url, returnData);
-
+                        System.out.println("返回信息为:"+result.toString());
                         //
                         Error error = new Error();
                         if(Integer.parseInt(result.get("msg").toString()) != 200){
@@ -980,6 +984,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                         String url = "https://erp4.teld.cn:8443/cwbase/sg/V1/ERP/TELD/TELD_WMS/TELD_API_WMS_StockManage/CreateGMReqOutStock";
                         HttpClientUtil httpClientUtil1 = new HttpClientUtil();
                         Map<String, Object> result = httpClientUtil1.doPost(url, returnData);
+                        System.out.println("返回信息为:"+result.toString());
                         Error error = new Error();
                         if (Integer.parseInt(result.get("msg").toString()) != 200) {
                             //如果失败存入报错信息跟数据
@@ -1103,6 +1108,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                         String url = "https://erp4.teld.cn:8443/cwbase/sg/V1/ERP/TELD/TELD_WMS/TELD_API_WMS_StockManage/CreateGRReqInStock";
                         HttpClientUtil httpClientUtil1 = new HttpClientUtil();
                         Map<String, Object> result = httpClientUtil1.doPost(url, returnData);
+                        System.out.println("返回信息为:"+result.toString());
                         Error error = new Error();
                         if (Integer.parseInt(result.get("msg").toString()) != 200) {
                             //如果失败存入报错信息跟数据
@@ -1224,6 +1230,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                             HttpClientUtil httpClientUtil1 = new HttpClientUtil();
                             Map<String, Object> result = httpClientUtil1.doPost(url, returnData);
                             System.out.println("result：" + result);
+                            System.out.println("返回信息为:"+result.toString());
                             Error error = new Error();
                             if (Integer.parseInt(result.get("msg").toString()) != 200) {
                                 //如果失败存入报错信息跟数据
@@ -1343,6 +1350,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                         HttpClientUtil httpClientUtil1 = new HttpClientUtil();
                         Map<String, Object> result = httpClientUtil1.doPost(url, returnData);
                         System.out.println("result：" + result);
+                        System.out.println("返回信息为:"+result.toString());
                         Error error = new Error();
                         if (Integer.parseInt(result.get("msg").toString()) != 200) {
                             //如果失败存入报错信息跟数据
@@ -1463,6 +1471,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                         String url = "https://erp4.teld.cn:8443/cwbase/sg/V1/ERP/TELD/TELD_WMS/TELD_API_WMS_StockManage/CreateOtherOutStock";
                         Map<String, Object> result = httpClientUtil1.doPost(url, returnData);
                         System.out.println("result：" + result);
+                        System.out.println("返回信息为:"+result.toString());
                         Error error = new Error();
                         if (Integer.parseInt(result.get("msg").toString()) != 200) {
                             //如果失败存入报错信息跟数据
@@ -1542,6 +1551,16 @@ public class AskGoodsServiceImpl implements AskGoodsService {
         return map;
     }
 
+    @Override
+    public void test03() {
+        List<Map<String,Object>> mapList = askGoodsMapper.test03();
+        System.out.println("mapList:"+mapList);
+        //生产收货接口文档/报工单 w
+        for (Map<String, Object> map : mapList) {
+            CreateGRReqInStock(map.get("orderNumber").toString(),"李兆峰");
+        }
+    }
+
     @Override
     public void test() {
         AskGoods askGoods = new AskGoods();

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

@@ -82,6 +82,7 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
                 //查询物料信息
                 MaterialClass material = warehousingMapper.getMaterial(new Notice().setMaterialCode(askGoods.getWllbCode()));
                 Inventory inventory = new Inventory();
+                inventory = null;
                 askGoods.setCompanyNumber(askGoods.getAccountSleeve());
                 askGoods.setMaterialId(material.getTldId());
                 if(material.getPartType().equals("原材料")) {
@@ -94,6 +95,8 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
                     } else {
                         inventory = null;
                     }
+                } else if (material.getPartType().equals("低值易耗品")){
+                    inventory = deliveryMapper.getInventoryHalf(askGoods);
                 }
                 if(inventory == null){
                     map.put("msg", "500");

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

@@ -362,6 +362,9 @@ public class WarehousingServiceImpl implements WarehousingService {
         }
     }
 
+    /**
+    *  查询报工单
+    */
     @Override
     public Map<String, Object> getNotice(Notice notice) {
         Map<String, Object> map = new HashMap<>();

src/main/resources/mapper/AskGoodsMapper.xml

@@ -1375,6 +1375,9 @@
         join tld_return_gs_removal c on a.document_id = c.document_id
         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>
     <!-- 修改数据传输状态 -->
     <update id="updateRemoval">
         update tld_removal set transmission_type = "1" where storage_code = #{removalCode}

src/main/resources/mapper/QueryListMappeer.xml

@@ -598,6 +598,9 @@
             <if test="moveType != null and moveType != ''">
                 and b.move_type like CONCAT(CONCAT('%', #{moveType}), '%')
             </if>
+            <if test="status != null and status != ''">
+                and a.status like CONCAT(CONCAT('%', #{status}), '%')
+            </if>
         </trim>
         order by a.id desc
     </select>

src/main/resources/mapper/WarehousingMapper.xml

@@ -462,7 +462,7 @@
                 and c.part_type = #{partType}
             </if>
             <if test="partType != null and partType == '半成品'.toString()">
-                and c.part_type ='半成品' or c.part_type ='原材料'
+                and (c.part_type ='半成品' or c.part_type ='原材料')
             </if>
             <if test="companyNumber != null and companyNumber != ''">
                 and b.company_number = #{companyNumber}