Browse Source

问题修改

zhs 2 years ago
parent
commit
789a6b95d5

+ 10 - 7
src/main/java/com/tld/service/impl/AskGoodsServiceImpl.java

@@ -246,7 +246,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                 Inventory inventory = askGoodsMapper.getInventory(askGoods);
                 if(inventory == null){
 //                    throw new Exception("库存不存在");
-                    System.out.println("库存不存在");
+//                    System.out.println("库存不存在");
                     continue;
                 }
                 //如果出库库存等于虚拟表库存则删除此库存
@@ -273,7 +273,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
             }
             //查询要货单父级信息
             AskGoods askGoods3 = askGoodsMapper.getAskDetailedF(askGoodsId);
-            if(askGoods3 != null){
+//            if(askGoods3 != null){
                 ReturRemoval returRemoval1 = new ReturRemoval()
                         .setDocumentId(askGoods3.getAskGoodsId())
                         .setRemovalCode(removalCode)
@@ -281,9 +281,9 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                         .setMoveType(askGoods3.getMoveType());
                 askGoodsMapper.addReturnGsRemovalF(returRemoval1);//新增返回gs数据父表信息
                 map.put("data", askGoods3.getAskGoodsId());
-            } else {
-                map.put("data", "0");
-            }
+//            } else {
+//                map.put("data", "0");
+//            }
 
             map.put("msg", "200");
         }catch (Exception e){
@@ -1586,9 +1586,12 @@ public class AskGoodsServiceImpl implements AskGoodsService {
         for(Map<String, Object> map : list1){
             Map<String, Object> map1 = OutOfLibrary("1111", "计划出库", map.get("ask_goods_id").toString());
             System.out.println(map1.get("data"));
-//            if(map1.get("data") != null){
+            if(map1.get("data") != null){
+            System.out.println("-------------------------------------");
+            System.out.println("测试");
+            System.out.println("-------------------------------------");
                 plugOutRemoval(map1.get("data").toString(), "王孝苗");
-//            }
+            }
         }
     }
 

+ 5 - 5
src/main/java/com/tld/service/impl/InviteServiceImpl.java

@@ -458,15 +458,15 @@ public class InviteServiceImpl implements InviteService {
                 }
             }
             for(AskGoods askGoods : askGoodsList) {
-                int count = inviteMapper.getAskGoods(askGoods);
-                if (count != 0) {
-                    inviteMapper.updateAskGoodsNum(askGoods);
-                } else {
+//                int count = inviteMapper.getAskGoods(askGoods);
+//                if (count != 0) {
+//                    inviteMapper.updateAskGoodsNum(askGoods);
+//                } else {
                     if (inviteMapper.getAskGoodsf(askGoods) == 0) {
                         inviteMapper.addAskGoodsf(askGoods);
                     }
                     inviteMapper.addAskGoods(askGoods);
-                }
+//                }
                 inviteMapper.addAskGoodsLog(askGoods);
             }
             //新增日志

+ 1 - 1
src/main/resources/mapper/AskGoodsMapper.xml

@@ -94,7 +94,7 @@
         JOIN tld_material e ON a.material_id = e.tld_id
         WHERE (a.num + 0) <![CDATA[>]]> (
             IFNULL(a.out_num, 0) + 0)
-          and e.part_type != '半成品' and e.part_type != '产成品'
+          and e.part_type != '半成品' and e.part_type != '产成品' and b.sqrq <![CDATA[<]]> "2023-05-05"
     </select>
     <!-- 物料库位选择 -->
     <select id="getMaterialCk" resultType="com.tld.model.Inventory">