tiajio'

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

@@ -458,7 +458,7 @@
                  WHERE RPG.WAREHOUSE_ID =#{warehouseId}
                  AND WIR.INBOUND_ISCOMPLETE=#{status}
                  AND WIR.INBOUND_TYPE = 0
-                GROUP BY RM.MATERIAL_CODE
+      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' AND WIR.INSERT_UPDATE_REMARK IS NULL

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

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