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

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

@@ -153,6 +153,10 @@ public class WmsInboundResultController extends BaseRESTfulController {
                 Map<String,Object> item=mapList.get(i);
                 //二、获得同一批的第i个的网格  解释：目前还没有设计出来网格的结构 没有做默认为 第一库、第一月台、第一垛位、第一行、第一列 \推送信息给行车工、让他们抢单代码备注了
                 BigDecimal houseGrid = wmsInboundResultServiceImpl.getGrid(conditionMap.get("distributeId").toString(), i+1);
+                //如果差不多、说明上一个人少扫了一次
+                if (houseGrid==null){
+                    houseGrid = rmsPwarehouseGridService.selectGrid(mapList.size()-1, personnelWorkshopid);
+                }
                 //遗留 批次、网格
                 //三、创建一个入库作业实绩
                 WmspInboundResult wmspInboundResult = wmsInboundResultServiceImpl.initAndWmspInboundResult(i+1,personnelWorkshopid,groupId,userName,new BigDecimal(conditionMap.get("distributeId").toString()),houseGrid,item);

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

@@ -210,6 +210,7 @@ public class WmspOutboundResultController extends BaseRESTfulController {
             wmspOutboundResult.setMaterialId(materialId);
             Integer res = wmspOutboundResultService.insertSelective(wmspOutboundResult);
             if(res == 1){
+
                 //返回出库单详情信息
                 outBoundDetailedInfo = wmspOutboundResultService.getOutBoundDetailedInfo(orderId);
                 outBoundDetailedInfo.put("orderNumber",orderNumber);
@@ -260,19 +261,25 @@ public class WmspOutboundResultController extends BaseRESTfulController {
     @Transactional
     @PostMapping(value = "/insertwmspOutboundScanResult")
     public synchronized RESTfulResult insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map){
-        //获取装卸工扫描吊牌结果                                                           HRB400-14-21706854-9-3049-280-20211001015115-7a63cd87a4095e7f-08010103010100003-4
+      ///获得前台传来得信息
+
+       //获取装卸工扫描吊牌结果                                                           HRB400-14-21706854-9-3049-280-20211001015115-7a63cd87a4095e7f-08010103010100003-4
         String resultMaterial = (String) map.get("resultMaterial");
         String subResultMaterial = resultMaterial.substring(0,resultMaterial.length() - 1);
         //获取出库单号
         Integer resultId1 = (Integer) map.get("resultId");
         //通过出库单号查询出库实绩ID
         BigDecimal resultId = new BigDecimal(resultId1);
-        /**根据扫描结果查询扫描实绩
+        /**根据扫描结果查询扫描实绩、判断是否一件出库
          *          若scanCount大于0,则不是第一次扫描，已经新增出库扫描实绩,返回已扫描过
          *          若scanCount等于0，则是第一次扫描，需要增加出库扫描实绩，再返回已扫描并稽核成功的物资信息
          * */
+
+        ///判断物质是否已经被扫描
         int scanCount = wmspOutboundResultService.ExistScanResult(subResultMaterial);
+        ///如果没有被扫描
         if(scanCount==0){
+
             //wmspOutboundResultService.getOutBoundId(resultNumber);
             //获取装卸工工号
             String personnelJobNumber = (String) map.get("personnelJobNumber");
@@ -284,6 +291,7 @@ public class WmspOutboundResultController extends BaseRESTfulController {
                 //相等返回装货数量已够
                 return failed("装货数量已够");
             }else {
+                ///解析物质二维码信息
                 //截取扫描结果，得到物资唯一编码
                 String[] split = resultMaterial.split("-");
                 //唯一编码

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

@@ -190,10 +190,17 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
         return result;
     }
 
+    /**
+     * 判断物质是否已经都已经被扫描
+     * @param resultId
+     * @return
+     */
     @Override
     public int EqualMaterialsNumber(BigDecimal resultId) {
         int EqualMaterialsNumber = 0;
+        //获得被扫描物质
         List<Map<String,Object>> materialNumberList = wmspOutboundResultMapper.getScanMaterialNumber(resultId);
+        //获得运单中间表的物资件数
         List<Map<String,Object>> orderMaterialNumberList = wmspOutboundResultMapper.getOunboundOrderNumber(resultId);
         BigDecimal orderMaterialNumber = (BigDecimal) orderMaterialNumberList.get(0).get("orderMaterialNumber");
         int outboundMaterialNumber = materialNumberList.size();
@@ -202,6 +209,7 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
         }else {
             EqualMaterialsNumber = 0;
         }
+        //返回结果
         return EqualMaterialsNumber;
     }
 }

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

@@ -814,32 +814,34 @@
     select outbound_scan.RESULT_MATERIAL "resultMaterial",
            r_pl.PERSONNEL_NAME "personnelName",
            outbound_scan.RESULT_LOAD_TIME "resultLoadTime",
-           outbound_scan.INSERT_UPDATE_REMARK "insertUpdateRemark"
+           outbound_scan.INSERT_UPDATE_REMARK "insertUpdateRemark",
+           outbound_scan.RESULT_CHECK "check"
     from WMSP_OUTBOUND_SCAN_RESULT outbound_scan
            left join WMSP_OUTBOUND_RESULT w_outbound
                      on w_outbound.RESULT_ID=outbound_scan.OUTBOUND_RESULT_ID
            left join RMS_PERSONNEL r_pl
                      on r_pl.PERSONNEL_ID=outbound_scan.LOAD_ID
-    where outbound_scan.OUTBOUND_RESULT_ID = #{resultId} and outbound_scan.RESULT_CHECK = 0
+    where outbound_scan.OUTBOUND_RESULT_ID = #{resultId}
+    ---and outbound_scan.RESULT_CHECK = 0
   </select>
 
   <!--  通过唯一编码获取物资名称、计量单位、垛位-->
   <select id="getOtherInfoByMaterialOnlyCode" parameterType="String" resultType="java.util.Map">
-    select distinct r_material.MATERIAL_NAME "materialName",
+   select distinct r_material.MATERIAL_NAME "materialName",
            r_unit.UNIT_OF_MEASURE_NAME "unitOfMeasureName",
-           r_stacking.STACKING_NO "stackingNo"
+          r_stacking.STACKING_NO "stackingNo"
     from RMS_MATERIAL_STEEL material_steel
            left join RMS_MATERIAL r_material
                      on material_steel.MATERIAL_ID=r_material.MATERIAL_ID
            left join RMS_UNIT_OF_MEASURE r_unit
                      on r_material.UNIT_OF_MEASURE_ID=r_unit.UNIT_OF_MEASURE_ID
-           left join WMSP_GRID_MATERIAL grid_material
-                     on grid_material.MATERIAL_ID=material_steel.MATERIAL_STEEL_ID
-           left join RMS_PWAREHOUSE_GRID r_grid
-                     on grid_material.GRID_ID=r_grid.GRID_ID
+           left join Wmsp_Inbound_Result wir
+                     on wir.MATERIAL_ID= material_steel.MATERIAL_STEEL_ID
+            left join RMS_PWAREHOUSE_GRID r_grid
+                     on wir.GRID_ID=r_grid.GRID_ID
            left join RMS_STACKING r_stacking
                      on r_stacking.STACKING_ID=r_grid.STACKING_ID
-    where material_steel.MATERIAL_ONLY_CODE=#{MaterialOnlyCode1}
+    where material_steel.MATERIAL_ONLY_CODE=#{MaterialOnlyCode1} and rownum=1
   </select>
 
   <select id="getScanMaterialNumber" parameterType="DECIMAL" resultType="java.util.Map" >