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

src/main/java/com/steerinfo/dil/controller/WmsInboundResultController.java

@@ -203,6 +203,7 @@ public class WmsInboundResultController extends BaseRESTfulController {
                                              Integer apiId,
                                              Integer pageNum,
                                              Integer pageSize,
+                                             Integer warehouseId,
                                              String con) {
         if (mapValue == null){
             mapValue = new HashMap<>();
@@ -213,6 +214,7 @@ public class WmsInboundResultController extends BaseRESTfulController {
                 return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
             }
         }
+        mapValue.put("warehouseId",warehouseId);
         List<Map<String,Object>>inboundResultList = null;
         if(mapValue.size() == 0){
             //将查询结果存入索引中
@@ -281,7 +283,7 @@ public class WmsInboundResultController extends BaseRESTfulController {
                     //获得一个默认的网格  解释：目前还没有设计出来网格的结构 没有做默认为 第一库、第一月台、第一垛位、第一行、第一列 \推送信息给行车工、让他们抢单代码备注了
                     BigDecimal houseGrid = rmsPwarehouseGridService.selectGrid(mapList.size()-(i+1), personnelWorkshopid,new BigDecimal(item.get("materialId").toString()));
                     //创建一个入库作业实绩
-                    WmspInboundResult wmspInboundResult = wmsInboundResultServiceImpl.initAndWmspInboundResult(0,i+1,personnelWorkshopid,groupId,userName,wmspInboundDistribute.getDistributeId(),houseGrid,item);
+                    WmspInboundResult wmspInboundResult = wmsInboundResultServiceImpl.initAndWmspInboundResult(1,i+1,personnelWorkshopid,groupId,userName,wmspInboundDistribute.getDistributeId(),houseGrid,item);
                     //改变扫码实绩里面的状态
                     int status= wmsInboundScanResultServiceImpl.updateInboundScanStatus(new BigDecimal(item.get("resultId").toString()),wmspInboundResult.getInboundId());
                     //创建实时库存

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

@@ -959,8 +959,9 @@
 
         where wir.inbound_type = 0
         and wir.result_deleted = 0
-        and wir.INBOUND_ISCOMPLETE = 1
+        and wir.INBOUND_ISCOMPLETE = 2
         and wgm.UPDATE_TIME is null
+        and rpg.WAREHOUSE_ID = #{warehouseId}
         order by wir.inbound_time desc
         )
         <where>

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

@@ -1021,7 +1021,7 @@ where wisr.result_id = #{stackResultId}
     </select>
     <select id="noIssueScanResultList" resultType="java.util.Map">
          select
-               rm.material_name             "materialName",
+             rm.material_name             "materialName",
                rm.material_specification    "materialSpecification",
                rm.material_model            "materialMode",
                rms.material_furnace_number  "materialFurnaceNo",