问题修改

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

@@ -1850,33 +1850,23 @@ public class AskGoodsServiceImpl implements AskGoodsService {
      * */
     @Override
     public void jsonError() {
-        //转JSON
         List<Error> errorList = askGoodsMapper.getJsonError();
         for (Error error : errorList) {
             System.out.println("字符串为:"+error.getDataVal());
             JSONObject jsonObject = JSONObject.parseObject(error.getDataVal());
+
             JSONObject jsonObject1 = JSONObject.parseObject(jsonObject.get("strJson").toString());
 
             JSONObject jsonObject2 = new JSONObject();
             jsonObject2.put("strJson",jsonObject1.toJSONString());
 
             System.out.println("toJsonString字符串为:"+ jsonObject2.toJSONString());
-
-            error.setDataVal(jsonObject2.toJSONString());
-            //修改
-            askGoodsMapper.updJSONError(error);
         }
     }
 
-    /**
-     * 生产收货错误信息回调
-     * */
     @Override
     public void ProductionReturnError() {
-        List<Error> list = askGoodsMapper.getProductionReturnError();
-        for (Error error : list) {
-            queryListService.anew(error);
-        }
+
     }
 
     @Override

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

@@ -43,7 +43,7 @@ public class DeliveryServiceImpl implements DeliveryService {
             Map<String, Object> mapVal = new HashMap<>();
             for(Delivery delivery1 : list){
                 int sumScan = deliveryMapper.getScanSum(delivery1);
-                mapVal.put(delivery1.getDeliveryId() + delivery1.getMaterialId(), sumScan);
+                mapVal.put(delivery1.getDeliveryId() + delivery1.getMaterialId() + delivery1.getEntryNumber(), sumScan);
             }
             map.put("data", list);
             map.put("scan", mapVal);
@@ -228,10 +228,10 @@ public class DeliveryServiceImpl implements DeliveryService {
                             ReturRemoval returRemoval = new ReturRemoval()
                                     .setMaterialId(map1.get("materialId").toString())
                                     .setDocumentId(deliveryId)
-                                    .setWbs(list.get(0).getWbs())
+                                    .setWbs(list2.get(0).getWbs())
                                     .setNum(askGoods.getNum())
-                                    .setEntryNumber(list.get(0).getEntryNumber())
-                                    .setDocumentPointsId(list.get(0).getId())
+                                    .setEntryNumber(list2.get(0).getEntryNumber())
+                                    .setDocumentPointsId(list2.get(0).getId())
                                     .setStorageLocationCode(askGoods.getStorageLocationCode());
                             askGoodsMapper.addReturnGsRemoval(returRemoval);//新增返回gs数据子表信息
                         }

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

@@ -236,6 +236,14 @@ public class WarehousingServiceImpl implements WarehousingService {
                             .setProducBatch(warehousingVirtual.getProducDate())
                             .setWllbCode(material.getWllbCode())
                             .setWllbClass(material.getWllbClass());
+                    if(material.getPartType().equals("低值易耗品")){
+                        notice.setSupplierId("EC13437");
+                        if(warehousingVirtual.getAccountSleeve().equals("8130")){
+                            notice.setSerial("000000");
+                        } else if(warehousingVirtual.getAccountSleeve().equals("8400")){
+                            notice.setSerial("100000");
+                        }
+                    }
                     if (warehousingMapper.getInventoryNotice(notice) != 0) {
                         warehousingMapper.updateInventoryNotice(notice);
                     } else {

src/main/resources/mapper/AskGoodsMapper.xml

@@ -710,7 +710,7 @@
             left join tld_department e on c.department = e.code
             left join tld_company g on c.company_number = g.code
         WHERE
+        (a.num + 0) <![CDATA[>]]> (a.out_num + 0) and
           b.part_type = #{partType}
         <if test="userId != null and userId != ''">
             and b.code in (select material_id from tld_user_material where user_id = #{userId})

src/main/resources/mapper/DeliveryMapper.xml

@@ -17,9 +17,12 @@
     <if test="projectName == ' '.toString()">
         AND b.project_name is null
     </if>
-    <if test="projectName != ' '.toString()">
+    <if test="projectName != ' '.toString() and projectName != null">
         AND b.project_name = #{projectName}
     </if>
+    <if test="code != '' and code != null">
+        AND b.delivery_code like CONCAT( '%',#{code}, '%' )
+    </if>
     </select>
     <!-- 查询销售单项目名称 -->
     <select id="getDeliveryProjectName" resultType="String">

src/main/resources/mapper/QueryListMappeer.xml

@@ -1322,8 +1322,7 @@
         FROM
             tld_delivery a
             JOIN tld_material b ON a.material_id = b.tld_id
-        where (out_num + 0) <![CDATA[<]]> (
-        a.gs_delivery_num + 0) and b.code in (select material_id from tld_user_material where user_id = #{userId}) and a.status = "0"
+        where ( a.gs_delivery_num - a.gs_cancel_num ) != a.out_num and b.code in (select material_id from tld_user_material where user_id = #{userId}) and a.status = "0"
     </select>
     <!-- 查询其他入库任务数量 -->
     <select id="getQiTaRu" resultType="int">
@@ -1456,7 +1455,7 @@
     </select>
 
     <select id="getTestTwo" resultType="java.util.Map">
-        select DISTINCT ask_goods_id from tld_ask_goods_vitrual where unique_code = "1111" and type = "非生产领料"
+        select DISTINCT ask_goods_id from tld_ask_goods_vitrual where unique_code = "1111" and type = "计划出库"
     </select>
     <!--查询领料日期计划出库-->
     <select id="getPlannedDelivery" resultType="java.lang.String">

src/main/resources/mapper/WarehousingMapper.xml

@@ -796,7 +796,7 @@
                  join tld_ask_goods_f b on a.ask_goods_id = b.ask_goods_id
                  left join tld_material c on a.material_id = c.tld_id
         where a.ask_goods_id = #{askGoodsId}
-          and a.material_id = #{materialId}
+          and a.material_id = #{materialId} and a.entry_number = #{entryNumber}
     </select>
     <!-- 修改要货单出库数量 -->
     <update id="updateAskGoodsHalf">