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

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

@@ -443,6 +443,12 @@ public class WmspOutboundResultController extends BaseRESTfulController {
     @PostMapping("/outbountResultToSuccess")
     public RESTfulResult sureOutbount(@RequestParam BigDecimal resultId){
         int result = wmspOutboundResultService.sureOutbount(resultId);
+        if(result == 1){
+            return success(1,"该类型已出库");
+        }
+        if(result == 2){
+            return success(2,"该订单已出库");
+        }
         return success();
     }
     @ApiOperation(value = "出库(非0:成功,0:失败)")

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

@@ -82,7 +82,7 @@ public class WmspSendReceiveController extends BaseRESTfulController {
     }*/
 
     @PostMapping("addSendReceive")
-    @Scheduled(cron =  "0 30 23 * * ? ")
+    @Scheduled(cron =  "0 45 23 * * ? ")
     public RESTfulResult addSendReceive(){
         int result = iWmspSendReceiveService.addSendReceive();
         return success(result);

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

@@ -435,6 +435,8 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
             for (OutBoundTypeDetailedInfo typeDetailedInfo :outBoundTypeDetailedInfos){
                 //这一个类型的物资
                 List<OutBoundMaterialDetailedInfo> thisMaterialDetailedInfos=new  ArrayList<>();
+
+                //获得当前类型的已扫描数量
                 int count=0;
                 for (OutBoundMaterialDetailedInfo outBoundMaterialDetailedInfo: outBoundMaterialDetailedInfos){
                     if (typeDetailedInfo.getMaterialId().equals(outBoundMaterialDetailedInfo.getMaterialId())){
@@ -444,17 +446,21 @@ public class WmspOutboundResultServiceImpl  implements IWmspOutboundResultServic
                 }
                 //统计完数量赋值
                 typeDetailedInfo.setScanCodeNumber(count);
+
                 //统计，并且判断是否有某种物资已经扫满了
                 if (typeDetailedInfo.getNumber()==typeDetailedInfo.getScanCodeNumber()){
                     //如果有某一种物资扫满了，需要将这一类物资，在实时库存删除，并且修改出库物资类型状态，发送计量委托
                     int cunt= wmspGridMaterialService.deleteGridMaterial(thisMaterialDetailedInfos);
                     cunt2=wmspOutboundResultMaterialService.updateStatus(typeDetailedInfo.getResultMaterialId());
+                    //表示一项完成
+                    return 1;
                 }
                 //如果所以物资都已经结束，需要改变提货单状态
                 if (outBoundTypeDetailedInfos==null||outBoundTypeDetailedInfos.size()-cunt2==0){
                     int cunt3=wmspOutboundResultMapper.updateStatus(resultId);
                     //返回结果
-                    return cunt3;
+                    //表示全部完成
+                    return 2;
                 }
             }
             outBoundDetailed.setOutBoundMaterialDetailedInfos(outBoundMaterialDetailedInfos);