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

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

@@ -51,7 +51,7 @@ public interface WmspGridMaterialMapper extends IBaseMapper<WmspGridMaterial, Bi
   BigDecimal slelectGridIdByMaterialOnlyCode(@Param("materialOnlyCode")String materialOnlyCode);
 
 //  根据仓库id和物资类型编码查询对应的实时库存
-  int getStockTakingList(String warehouseId, String materialCode);
+  List<Map<String ,Object>> getStockTakingList(String warehouseId, String materialCode);
 //  根据物资编码查询对应的物资ID
   BigDecimal getMaterialIds(String materialCode);
 

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

@@ -252,10 +252,12 @@ public class WmsInboundResultServiceImpl implements IWmsInboundResultService {
 //            创建入库实体类
             WmspInboundResult wmspInboundResult = new WmspInboundResult();
             wmspInboundResult.setInboundId(inboundId);
+            wmspInboundResult.setInboundTime(new Date());
             if (status == 0){
 //            将入库状态改为预留状态
                 wmspInboundResult.setInboundIscomplete(new BigDecimal(2));
             }else if (status == 1){
+                //            将预留状态改为入库状态
                 wmspInboundResult.setInboundIscomplete(new BigDecimal(1));
             }
 

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

@@ -250,7 +250,9 @@ public class WmspGridMaterialServiceImpl  implements IWmspGridMaterialService {
     @Override
     public int insertStockTaking(String warehouseId, String materialCode, Integer quantity) {
 //        根据仓库id和物资类型编码，查询当前的今日库存以及今天入库和出库数量
-        int count = wmspGridMaterialMapper.getStockTakingList(warehouseId,materialCode);
+        List<Map<String,Object>> list= wmspGridMaterialMapper.getStockTakingList(warehouseId,materialCode);
+//        遍历list，得到list的个数
+        int count =list.size();
 //        调用插入库存盘点实绩接口
 //        创建库存盘点实绩类
         WmspCheckWarehouse wmspCheckWarehouse = new WmspCheckWarehouse();

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

@@ -719,9 +719,9 @@
    WHERE WGM.GRID_ID IS NOT NULL AND RMS.MATERIAL_ONLY_CODE=#{materialOnlyCode}
   </select>
 <!--  根据物资编码和仓库id查询实时库存-->
-  <select id="getStockTakingList" resultType="java.lang.Integer">
-    SELECT
-      COUNT(*)
+  <select id="getStockTakingList" resultType="java.util.LinkedHashMap">
+    SELECT DISTINCT
+      WGM.GM_ID
 --     实时库存
     FROM WMSP_GRID_MATERIAL WGM
 --                 仓储网格表
@@ -729,7 +729,7 @@
                 ON RPG.GRID_ID = WGM.GRID_ID
 --             关联入库实绩表
             LEFT JOIN WMSP_INBOUND_RESULT WIR
-                ON WIR.GRID_ID = WGM.GRID_ID
+                ON WIR.MATERIAL_ID = WGM.MATERIAL_ID
 --         物资钢材表
            LEFT JOIN  RMS_MATERIAL_STEEL RMS
                       ON WGM.MATERIAL_ID = RMS.MATERIAL_STEEL_ID