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

src/main/java/com/steerinfo/dil/mapper/WmspGridMaterialMapper.java

@@ -45,7 +45,7 @@ public interface WmspGridMaterialMapper extends IBaseMapper<WmspGridMaterial, Bi
   List<Map<String, Object>> getMaterialTypeList(String warehouseid, BigDecimal stackingId, BigDecimal gradtionNumber);
 
   //根据物资唯一编码和网格id确定实时库存主键
-  Map<String,Object> selectGmIdByMaterialOnlyCode(@Param("GirdId")BigDecimal GirdId);
+  List<Map<String,Object>> selectGmIdByMaterialOnlyCode(@Param("GirdId")BigDecimal GirdId);
 
   //根据物资唯一编码查找仓储网格原来的主键id
   BigDecimal slelectGridIdByMaterialOnlyCode(@Param("materialOnlyCode")String materialOnlyCode);

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

@@ -253,6 +253,7 @@ public class WmsInboundResultServiceImpl implements IWmsInboundResultService {
             WmspInboundResult wmspInboundResult = new WmspInboundResult();
             wmspInboundResult.setInboundId(inboundId);
             wmspInboundResult.setInboundTime(new Date());
+            wmspInboundResult.setInsertTime(new Date());
             if (status == 0){
 //            将入库状态改为预留状态
                 wmspInboundResult.setInboundIscomplete(new BigDecimal(2));

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

@@ -174,7 +174,8 @@ public class WmspGridMaterialServiceImpl  implements IWmspGridMaterialService {
             //根据物资唯一编码查找原来垛位的仓储网格id
             BigDecimal GirdId = wmspGridMaterialMapper.slelectGridIdByMaterialOnlyCode(materialOnlyCode);
             //根据物资唯一编码和物资编码去查找物资现存仓存网格
-            Map<String,Object> stringObjectMap = wmspGridMaterialMapper.selectGmIdByMaterialOnlyCode(GirdId);
+            List<Map<String,Object>> list = wmspGridMaterialMapper.selectGmIdByMaterialOnlyCode(GirdId);
+            Map<String,Object> stringObjectMap = list.get(0);
             BigDecimal gmId = DataChange.dataToBigDecimal(stringObjectMap.get("gmId"));
             WmspGridMaterial wmspGridMaterial=new WmspGridMaterial();
             wmspGridMaterial.setGmId(gmId);

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

@@ -142,6 +142,8 @@ public class WmspRestackScanResultServiceImpl  implements IWmspRestackScanResult
         //设置状态
         //判断需要倒垛的类型
         int status= wmspRestackMakeResultMapper.getResultLoaderAudit(restackMake,onlyCode);
+//        判断这个倒垛的物资是否来自我们的原垛位中
+
         //查询倒垛的数量
         Map<String,Object> map=new HashMap<>();
 //            在map中放入我们需要倒垛的物资大类编码

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

@@ -712,11 +712,11 @@
     WHERE WGM.GRID_ID=#{GirdId}
   </select>
   <select id="slelectGridIdByMaterialOnlyCode" parameterType="java.lang.String" resultType="java.math.BigDecimal">
-   select WGM.GRID_ID "girdId"
+   select DISTINCT WGM.GRID_ID "girdId"
    from RMS_MATERIAL_STEEL RMS
    left join WMSP_GRID_MATERIAL WGM
    on  WGM.MATERIAL_ID = RMS.MATERIAL_STEEL_ID
-   WHERE WGM.GRID_ID IS NOT NULL AND RMS.MATERIAL_ONLY_CODE=#{materialOnlyCode}
+   WHERE WGM.GRID_ID IS NOT NULL AND WGM.DELETED = 0 AND RMS.MATERIAL_ONLY_CODE=#{materialOnlyCode}
   </select>
 <!--  根据物资编码和仓库id查询实时库存-->
   <select id="getStockTakingList" resultType="java.util.LinkedHashMap">

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

@@ -619,22 +619,34 @@
     <select id="selectWmsInboundResult" resultType="java.util.LinkedHashMap">
         select
         wir.INBOUND_ID "inboundId",
+        RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || '(' ||
+        RM.MATERIAL_MODEL || ')' "materialName",
         wir.inbound_number "inboundNo",
         wir.inbound_time "inboundTime",
         wir.inbound_iscomplete "isComplete",
         RW.WAREHOUSE_NAME "warehouseName",
         RS.STACKING_NO "stackingNo",
         RPG.GRID_GRADATION_NUMBER "gridGradationNumber"
+
         from wmsp_inbound_result wir
-        left join RMS_PWAREHOUSE_GRID rpg
+
+        LEFT JOIN RMS_MATERIAL_STEEL rms
+        ON rms.MATERIAL_STEEL_ID = wir.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL rm
+        ON rm.MATERIAL_ID = rms.MATERIAL_ID
+        LEFT JOIN RMS_PWAREHOUSE_GRID rpg
         ON RPG.GRID_ID = wir.GRID_ID
+
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = rpg.WAREHOUSE_ID
+
         LEFT JOIN RMS_STACKING RS
         ON RS.STACKING_ID = RPG.STACKING_ID
+
         where wir.inbound_type = 0
         and wir.result_deleted = 0
         and wir.INBOUND_ISCOMPLETE != 2
+        and wir.UPDATE_TIME is null
         order by wir.inbound_time desc
         <where>
             <if test="INBOUND_NUMBER != null">
@@ -745,19 +757,30 @@
     <select id="selectWmsReservedResult" resultType="java.util.LinkedHashMap">
         select
         wir.INBOUND_ID "inboundId",
+        RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || '(' ||
+        RM.MATERIAL_MODEL || ')' "materialName",
         wir.inbound_number "inboundNo",
         wir.inbound_time "inboundTime",
         wir.inbound_iscomplete "isComplete",
         RW.WAREHOUSE_NAME "warehouseName",
         RS.STACKING_NO "stackingNo",
         RPG.GRID_GRADATION_NUMBER "gridGradationNumber"
+
         from wmsp_inbound_result wir
-        left join RMS_PWAREHOUSE_GRID rpg
+
+        LEFT JOIN RMS_MATERIAL_STEEL rms
+        ON rms.MATERIAL_STEEL_ID = wir.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL rm
+        ON rm.MATERIAL_ID = rms.MATERIAL_ID
+        LEFT JOIN RMS_PWAREHOUSE_GRID rpg
         ON RPG.GRID_ID = wir.GRID_ID
+
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = rpg.WAREHOUSE_ID
+
         LEFT JOIN RMS_STACKING RS
         ON RS.STACKING_ID = RPG.STACKING_ID
+
         where wir.inbound_type = 0
         and wir.result_deleted = 0
         and wir.INBOUND_ISCOMPLETE = 2

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

@@ -574,8 +574,8 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <select id="selectRestackMakeResultList" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
-    select *
-    from(select
+    select distinct *
+    from(select distinct
     T4.STACKING_ID "stackingId",
     RPG.GRID_GRADATION_NUMBER "gridGradationNumber",
     t8.WAREHOUSE_ID "warehouseid",
@@ -1421,7 +1421,7 @@
              from WMSP_RESTACK_SCAN_RESULT WRSR
                     left join RMS_MATERIAL RM
                               on RM.MATERIAL_CODE = WRSR.MATERIAL_CODE
-             where WRSR.MATERIAL_CODE=#{materialCode}
+             where WRSR.MATERIAL_CODE=#{materialCode} and WRSR.RESULT_RESTACK_ID= #{restackMake}
            ) as "no"
     from WMSP_RESTACK_MAKE_TYPE_RESULT WRMTR
            left join WMSP_RESTACK_MAKE_RESULT WRMR

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

@@ -335,6 +335,7 @@
                FROM WMSP_RESTACK_SCAN_RESULT wrsr
                       LEFT JOIN RMS_MATERIAL rm2
                                 ON rm2.MATERIAL_CODE = wrsr.MATERIAL_CODE
+                        WHERE  wrsr.STATUS =0
              ) num,
              rm2.MATERIAL_Code materialCode
       from WMSP_RESTACK_SCAN_RESULT wrsr
@@ -372,6 +373,6 @@
     FROM WMSP_RESTACK_SCAN_RESULT WRSR
            LEFT JOIN WMSP_RESTACK_MAKE_RESULT WRMR
            ON WRMR.RESULT_ID = WRSR.RESULT_RESTACK_ID
-    WHERE WRSR.RESULT_LOADER_AUDIT = 1 AND WRSR.RESULT_RESTACK_ID = #{restackMake}
+    WHERE WRSR.RESULT_LOADER_AUDIT = 1 AND WRSR.STATUS = 0 AND WRSR.RESULT_RESTACK_ID = #{restackMake}
   </select>
 </mapper>

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

@@ -683,7 +683,7 @@
   </select>
   <select id="getWmspRestackScanResultCount" resultType="java.lang.Integer">
     select count(*) from WMSP_RESTACK_SCAN_RESULT WRSR
-    where WRSR.STATUS=1 AND RESULT_LOADER_AUDIT =1 AND  WRSR.MATERIAL_ONLY_CODE=#{onlyCode}
+    where RESULT_LOADER_AUDIT =1 AND  WRSR.MATERIAL_ONLY_CODE=#{onlyCode}
   </select>
   <select id="getResultId" resultType="java.math.BigDecimal">
     SELECT WRSR.RESULT_ID