Merge branch 'master' of https://git.steerinfo.com/luobang/DIL-DAZHOU-WMS2

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

@@ -444,7 +444,7 @@
     on RM.MATERIAL_TYPE_ID=RMT.MATERIAL_TYPE_ID
     left join WMSP_INBOUND_RESULT WIR
     on WIR.GRID_ID = WGM.GRID_ID
-    where WGM.DELETED = 0 and WIR.RESULT_STATUS = 1 order by WGM.INSERT_TIME DESC
+    where WGM.DELETED = 0 and WIR.INBOUND_ISCOMPLETE = 1 order by WGM.INSERT_TIME DESC
     )
    <if test="con!=null">
     where "materialName" like #{con} or "warehouseName" like #{con} or "stackingNo" like #{con}