胡半仙 3 rokov pred
rodič
commit
0f4e11f242

+ 2 - 2
src/main/java/com/steerinfo/dil/service/impl/WmsInboundResultServiceImpl.java

@@ -240,9 +240,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);

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/WmspGridMaterialMapper.xml

@@ -734,7 +734,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

+ 2 - 2
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">