xiugai

src/main/java/com/steerinfo/dil/service/impl/WmspOutboundResultServiceImpl.java

@@ -570,9 +570,10 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
     public synchronized int disorderlyOutbound(Map<String, Object> mapVal) throws Exception {
         //需要获取几个因子,1.物资名称
         String masterialName = (String) mapVal.get("materialName");
-        if(!masterialName.contains("乱尺")){
-            return -1;
-        }
+        //注释掉这个判断
+        //if(!masterialName.contains("乱尺")){
+        //    return -1;
+        //}
         //获取运输订单ID
         BigDecimal orderId = DataChange.dataToBigDecimal(mapVal.get("orderId"));
         //根据运输订单ID查询订单类型

src/main/resources/application-prod.yml

@@ -10,7 +10,7 @@ spring:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   Im:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   TmsTruckFeign:

src/main/resources/com/steerinfo/dil/mapper/WmspCheckWarehouseMapper.xml

@@ -457,11 +457,12 @@
   
                  WHERE RPG.WAREHOUSE_ID =#{warehouseId}
                  AND WIR.INBOUND_ISCOMPLETE=#{status}
+                 AND WIR.INSERT_UPDATE_REMARK IS NULL
                  AND WIR.INBOUND_TYPE = 0
                 GROUP BY RM.MATERIAL_CODE
         ) table1
        ON table1.code = RM.MATERIAL_CODE
-      WHERE RPG.WAREHOUSE_ID = #{warehouseId} AND RM.MATERIAL_NAME IS NOT NULL AND WIR.ISUPLOAD='0'
+      WHERE RPG.WAREHOUSE_ID = #{warehouseId} AND RM.MATERIAL_NAME IS NOT NULL AND WIR.ISUPLOAD='0' AND WIR.INSERT_UPDATE_REMARK IS NULL
       <if test="con!=null and con!='null'">
         AND RM.MATERIAL_NAME LIKE (#{con})
         AND table1.count>0

src/main/resources/com/steerinfo/dil/mapper/WmspGridMaterialMapper.xml

@@ -791,6 +791,7 @@
     WHERE WIR.RESULT_DELETED =0
       AND WIR.INBOUND_ISCOMPLETE =#{status}
       AND WIR.RESULT_STATUS >1
+      AND WIR.INSERT_UPDATE_REMARK IS NULL
       AND RPG.WAREHOUSE_ID = #{warehouseId}
       AND WIR.INBOUND_TYPE = 0
       AND RM.MATERIAL_CODE = #{materialCode}