Jelajahi Sumber

问题修改

zhs 2 tahun lalu
induk
melakukan
760949e580

+ 2 - 0
src/main/java/com/tld/mapper/AskGoodsMapper.java

@@ -217,4 +217,6 @@ public interface AskGoodsMapper {
     List<Error> getStorageReturnError();
 
     List<Error> parkingReturnError();
+
+    List<AskGoods> getAskGoodsMaterialTest(AskGoods askGoods);
 }

+ 9 - 6
src/main/java/com/tld/service/impl/AskGoodsServiceImpl.java

@@ -1825,7 +1825,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
     @Override
     public void test() {
         AskGoods askGoods = new AskGoods();
-        List<AskGoods> list = askGoodsMapper.getAskGoodsMaterial(askGoods);
+        List<AskGoods> list = askGoodsMapper.getAskGoodsMaterialTest(askGoods);
         for(AskGoods askGoods1 : list) {
             Inventory inventory = new Inventory()
                     .setMaterialId(askGoods1.getMaterialId())
@@ -1842,11 +1842,14 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                 aaa = "8400";
                 bbb = "100000";
             }
+            if(list1.get(0).get("storageLocationCode").equals("1")){
+                continue;
+            }
             AskGoods askGoods2 = new AskGoods().setUniqueCode("1111")
                     .setSupplierId("EC13437")
                     .setSerial(bbb)
                     .setWllbCode(list1.get(0).get("code").toString())
-                    .setProducDate("20230425")
+                    .setProducDate("20230514")
                     .setAskGoodsId(askGoods1.getAskGoodsId())
                     .setType("计划出库")
                     .setStorageLocationCode(list1.get(0).get("storageLocationCode").toString())
@@ -1865,11 +1868,11 @@ 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());
-            System.out.println(map1.get("data"));
+//            System.out.println(map1.get("data"));
             if(map1.get("data") != null){
-            System.out.println("-------------------------------------");
-            System.out.println("测试");
-            System.out.println("-------------------------------------");
+//            System.out.println("-------------------------------------");
+//            System.out.println("测试");
+//            System.out.println("-------------------------------------");
                 plugOutRemoval(map1.get("data").toString(), "王孝苗");
             }
         }

+ 27 - 0
src/main/resources/mapper/AskGoodsMapper.xml

@@ -98,6 +98,33 @@
           and e.part_type != '半成品' and e.part_type != '产成品'
           and a.ask_goods_id = #{askGoodsId} and e.code in (select material_id from tld_user_material where user_id = #{userId})
     </select>
+    <!-- 查询指定生产单的物料 -->
+    <select id="getAskGoodsMaterialTest" resultType="com.tld.model.AskGoods">
+        SELECT a.ask_goods_id,
+               a.material_id,
+               a.num,
+               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,
+               c.name,
+               c.code,
+               c.id                 AS departmentId,
+               a.production_code,
+               a.wbs,
+               a.entry_number,
+               e.wllb_class,
+               b.sqrq
+        FROM tld_ask_goods a
+                 JOIN tld_ask_goods_f b ON a.ask_goods_id = b.ask_goods_id
+                 LEFT JOIN tld_department c ON b.department = c.code
+                 JOIN tld_material e ON a.material_id = e.tld_id
+        WHERE (a.num + 0) <![CDATA[>]]> (
+            IFNULL(a.out_num, 0) + 0) and b.sqrq > '2023-05-12'
+    </select>
     <!-- 物料库位选择 -->
     <select id="getMaterialCk" resultType="com.tld.model.Inventory">
         select

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

@@ -1397,7 +1397,7 @@
         a.account_sleeve as accountSleeve,
         a.supplier_id as supplierId,
         e.name as supplierName,
-        a.storage_location_code as storageLocationCode
+        ifnull(a.storage_location_code, "1") as storageLocationCode
         FROM
         tld_inventory a
         LEFT JOIN tld_storage_location b ON a.storage_location_code = b.storage_location_code