问题修改

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

@@ -94,7 +94,7 @@ public class AskGoodsController {
      * @param response
      */
     @GetMapping("export")
-    public void userExport(AskGoods askGoods, HttpServletResponse response){
+    public void userExport(AskGoods askGoods, HttpServletResponse response) {
         askGoodsService.export(askGoods, response);
     }
 
@@ -114,7 +114,7 @@ public class AskGoodsController {
      * @return 返回结果
      */
     @GetMapping("delAskGoodsVitrual")
-    public Map<String, Object> delAskGoodsVitrual(String id, String type){
+    public Map<String, Object> delAskGoodsVitrual(String id, String type) {
         return askGoodsService.delAskGoodsVitrual(id, type);
     }
 

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

@@ -273,13 +273,18 @@ public class AskGoodsServiceImpl implements AskGoodsService {
             }
             //查询要货单父级信息
             AskGoods askGoods3 = askGoodsMapper.getAskDetailedF(askGoodsId);
-            ReturRemoval returRemoval1 = new ReturRemoval()
-                    .setDocumentId(askGoods3.getAskGoodsId())
-                    .setRemovalCode(removalCode)
-                    .setSourceType(askGoods3.getSourceType())
-                    .setMoveType(askGoods3.getMoveType());
-            askGoodsMapper.addReturnGsRemovalF(returRemoval1);//新增返回gs数据父表信息
-            map.put("data", askGoods3.getAskGoodsId());
+            if(askGoods3 != null){
+                ReturRemoval returRemoval1 = new ReturRemoval()
+                        .setDocumentId(askGoods3.getAskGoodsId())
+                        .setRemovalCode(removalCode)
+                        .setSourceType(askGoods3.getSourceType())
+                        .setMoveType(askGoods3.getMoveType());
+                askGoodsMapper.addReturnGsRemovalF(returRemoval1);//新增返回gs数据父表信息
+                map.put("data", askGoods3.getAskGoodsId());
+            } else {
+                map.put("data", "0");
+            }
+
             map.put("msg", "200");
         }catch (Exception e){
             e.printStackTrace();
@@ -306,7 +311,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
             for(String warehouseWhere : askGoodsMapper.getWarehouseWhere(removalCode)){
                 List<Map<String, Object>> mapList = askGoodsMapper.plugOutRemoval(removalCode);
                 if(mapList.size() >0 ) {
-                    JSONObject strJson = new JSONObject();//4
+                    JSONObject strJson = new JSONObject();
                     //父表
                     strJson.put("GIReqBillID", mapList.get(0).get("askGoodsId").toString());//要货单id
                     strJson.put("WMSID", mapList.get(0).get("id").toString());//出库单id
@@ -347,7 +352,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
 //                        String url = "http://42.159.85.29:52480/cwbase/sg/V1/ERP/TELD/DEVTEST/API_WMS_PurInStock/CreateProductiveOutStock";
                         HttpClientUtil httpClientUtil1 = new HttpClientUtil();
                         Map<String, Object> result = httpClientUtil1.doPost(url, returnData);
-
+                        System.out.println("返回信息" + result);
                         //如果失败存入错误信息
                         Error error = new Error();
                         if(Integer.parseInt(result.get("msg").toString()) != 200){
@@ -1580,7 +1585,10 @@ public class AskGoodsServiceImpl implements AskGoodsService {
         List<Map<String, Object>> list1 = queryListMapper.getTestTwo();
         for(Map<String, Object> map : list1){
             Map<String, Object> map1 = OutOfLibrary("1111", "计划出库", map.get("ask_goods_id").toString());
-            plugOutRemoval(map1.get("data").toString(), "王孝苗");
+            System.out.println(map1.get("data"));
+//            if(map1.get("data") != null){
+                plugOutRemoval(map1.get("data").toString(), "王孝苗");
+//            }
         }
     }
 

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

@@ -108,26 +108,25 @@ public class ReceiveGoodsSerivceImpl implements ReceiveGoodsSerivce {
 
                    receiveGoodsList.add(rg);
                }
-
-               for (ReceiveGoods receiveGoods : receiveGoodsList) {
-                   receiveGoods.setType("0");
-                   //存在一个采购单发送多次的情况  如果是一个采购单多次传输 则改变原数据的数量
-                   ReceiveGoods receiveGoods1 = new ReceiveGoods().setOrderCode(receiveGoods.getOrderCode()).setMaterialId(receiveGoods.getMaterialId()).setWbs(receiveGoods.getWbs()).setCompanyNumber(receiveGoods.getCompanyNumber());
+           }
+            for (ReceiveGoods receiveGoods : receiveGoodsList) {
+                receiveGoods.setType("0");
+                //存在一个采购单发送多次的情况  如果是一个采购单多次传输 则改变原数据的数量
+                ReceiveGoods receiveGoods1 = new ReceiveGoods().setOrderCode(receiveGoods.getOrderCode()).setMaterialId(receiveGoods.getMaterialId()).setWbs(receiveGoods.getWbs()).setCompanyNumber(receiveGoods.getCompanyNumber());
 //                   List<ReceiveGoods> listRepeat = receiveGoodsMapper.getReceiveGoods(receiveGoods1);
 //                   if (listRepeat.size() != 0) {
 //                       receiveGoods.setArrivalNum(String.valueOf(Integer.parseInt(listRepeat.get(0).getArrivalNum()) + Integer.parseInt(receiveGoods.getArrivalNum())));
 //                       receiveGoodsMapper.updateReceiveGoods(receiveGoods);
 //                   } else {
-                       if (receiveGoodsMapper.getReceiveGoodsf(receiveGoods1) == 0) {
-                           receiveGoodsMapper.addReceiveGoodsf(receiveGoods);
-                       }
-                       receiveGoodsMapper.addReceiveGoods(receiveGoods);
+                if (receiveGoodsMapper.getReceiveGoodsf(receiveGoods1) == 0) {
+                    receiveGoodsMapper.addReceiveGoodsf(receiveGoods);
+                }
+                receiveGoodsMapper.addReceiveGoods(receiveGoods);
 //                   }
-                   receiveGoodsMapper.updatePurchaseType(receiveGoods);
-                   //采购单日志
-                   receiveGoodsMapper.addReceiveGoodsLog(receiveGoods);
-               }
-           }
+                receiveGoodsMapper.updatePurchaseType(receiveGoods);
+                //采购单日志
+                receiveGoodsMapper.addReceiveGoodsLog(receiveGoods);
+            }
             //新增日志
             Access access = new Access().setType("质检信息").setData(JSON.toJSONString(jsonData)).setAccessType("0");
             dictionaryMapper.addAccess(access);

src/main/resources/mapper/AskGoodsMapper.xml

@@ -97,7 +97,9 @@
     </select>
     <!-- 物料库位选择 -->
     <select id="getMaterialCk" resultType="com.tld.model.Inventory">
-        select a.storage_location_code,
+        select
+               a.id,
+               a.storage_location_code,
                a.wllb_class,
                a.library_type,
                a.material_id,
@@ -226,7 +228,7 @@
         FROM tld_ask_goods a
                  join tld_material b on a.material_id = b.tld_id
         where a.ask_goods_id = #{askGoodsId}
-          and b.code = #{wllbCode}
+          and b.code = #{wllbCode} and a.entry_number = #{entryNumber}
     </select>
     <!-- 查询指定移庫單 -->
     <select id="getWareInfo" resultType="com.tld.model.AskGoods">

src/main/resources/mapper/InviteMapper.xml

@@ -65,6 +65,7 @@
             IFNULL( a.out_num, 0 ) AS out_num,
             e.NAME AS materialName,
             e.CODE AS materialCode,
+            e.part_type as partType,
             b.ask_goods_code,
             b.company_number,
             b.sqrq,
@@ -197,7 +198,7 @@
         FROM
             tld_invite a
             join tld_material b on a.material_id = b.tld_id
-        where a.ask_goods_id = #{askGoodsId} and b.code = #{wllbCode}
+        where a.ask_goods_id = #{askGoodsId} and b.code = #{wllbCode} and a.entry_number = #{entryNumber}
     </select>
     <!-- 查询已扫描总数 -->
     <select id="getAskInfoNumVitrual" resultType="int">

src/main/resources/mapper/QueryListMappeer.xml

@@ -1338,6 +1338,6 @@
     </select>
 
     <select id="getTestTwo" resultType="java.util.Map">
-        select DISTINCT ask_goods_id from tld_ask_goods_vitrual
+        select DISTINCT ask_goods_id from tld_ask_goods_vitrual where unique_code = "1111"
     </select>
 </mapper>