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

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

@@ -254,9 +254,9 @@ public class WmsInboundResultServiceImpl implements IWmsInboundResultService {
             wmspInboundResult.setInboundId(inboundId);
             if (status == 0){
 //            将入库状态改为预留状态
-                wmspInboundResult.setResultStatus(new BigDecimal(2));
+                wmspInboundResult.setInboundIscomplete(new BigDecimal(2));
             }else if (status == 1){
-                wmspInboundResult.setResultStatus(new BigDecimal(1));
+                wmspInboundResult.setInboundIscomplete(new BigDecimal(1));
             }
 
             i+= wmspInboundResultMapper.updateByPrimaryKeySelective(wmspInboundResult);

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

@@ -446,7 +446,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}
@@ -736,7 +736,7 @@
 --         物资表
            LEFT JOIN RMS_MATERIAL RM
                      ON RMS.MATERIAL_ID = RM.MATERIAL_ID
-           WHERE WGM.DELETED = 0 AND WIR.RESULT_STATUS =1  AND RPG.WAREHOUSE_ID = #{warehouseId} AND RM.MATERIAL_CODE = #{materialCode}
+           WHERE WGM.DELETED = 0 AND WIR.INBOUND_ISCOMPLETE =1  AND RPG.WAREHOUSE_ID = #{warehouseId} AND RM.MATERIAL_CODE = #{materialCode}
   </select>
   <select id="getMaterialIds" resultType="java.math.BigDecimal">
     SELECT DISTINCT

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

@@ -634,7 +634,7 @@
         ON RS.STACKING_ID = RPG.STACKING_ID
         where wir.inbound_type = 0
         and wir.result_deleted = 0
-        and wir.RESULT_STATUS != 2
+        and wir.INBOUND_ISCOMPLETE != 2
         order by wir.inbound_time desc
         <where>
             <if test="INBOUND_NUMBER != null">
@@ -760,7 +760,7 @@
         ON RS.STACKING_ID = RPG.STACKING_ID
         where wir.inbound_type = 0
         and wir.result_deleted = 0
-        and wir.RESULT_STATUS = 2
+        and wir.INBOUND_ISCOMPLETE = 2
         order by wir.inbound_time desc
         <where>
             <if test="INBOUND_NUMBER != null">