堆垛发车和装车01

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/service/impl/BilletHotsendBaseServiceImpl.java

@@ -855,8 +855,13 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		billetBasicInfoService.saveOrUpdateBatch(billetBasicInfoList);
 
 		// 更新装运单 车次总序号、本车车次
-		storageBill.setCarAllNum(oConvertUtils.isEmpty(storageBill.getCarAllNum()) ? "1" : String.valueOf(Integer.valueOf(storageBill.getCarAllNum()) + 1));// 车次总序号
-		storageBill.setCarNum(oConvertUtils.isEmpty(storageBill.getCarNum()) ? 0 : storageBill.getCarNum() + 1);// 本车车次
+		LambdaQueryWrapper<StorageBill> queryWrapperSB = new LambdaQueryWrapper<>();
+		queryWrapperSB.eq(StorageBill::getCcmNo, storageBill.getCcmNo())
+				.eq(StorageBill::getShift, storageBill.getShift())
+				.eq(StorageBill::getShiftGroup, storageBill.getShiftGroup())
+				.eq(StorageBill::getLicensePlate, storageBill.getLicensePlate());
+		List<StorageBill> storageBillList = storageBillService.list(queryWrapperSB);
+		storageBill.setCarNum(oConvertUtils.listIsEmpty(storageBillList) ? 0 : storageBillList.size() + 1);// 本车车次
 		storageBill.setTypeConfigId(billetHotsendDetailsVo.getBilletHotsendTypeConfigId()); // 钢坯配置类型ID
 		storageBill.setDestination(billetHotsendTypeConfig.getTypeName());// 目的地
 		storageBill.setOutTime(new Date());
@@ -905,9 +910,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			}
 		}
 		storageCarLog.setDestination(billetHotsendTypeConfig.getTypeName());// 目的地
-		storageCarLog.setCarNm(storageCarLog.getCarNm());// 车号
+		storageCarLog.setCarNm(storageBill.getLicensePlate());// 车牌号
 //			storageCarLog.setFixedWeight();// 定重
-		storageCarLog.setOutCarNum(storageCarLog.getOutCarNum()); // 出车号
 		storageCarLog.setTypeConfigId(billetHotsendDetailsVo.getBilletHotsendTypeConfigId()); // 钢坯配置类型ID
 		storageCarLog.setHeatNo(String.join(",", heatNoList));
 		storageCarLog.setSize(String.join(",", sizeList));// 定尺

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/controller/StackingAndLoadingVehiclesController.java

@@ -287,8 +287,8 @@ public class StackingAndLoadingVehiclesController extends JeecgController<Stacki
      @ApiOperation(value="钢坯-垛位装车", notes="钢坯-垛位装车")
      @PostMapping(value = "/loading")
      public Result<?> loading(@RequestBody LoadingParams loadingParams){
-    	 if(loadingParams.getStackingAndLoadingVehiclesList() == null || loadingParams.getStackingAndLoadingVehiclesList().size() < 3){
-    		return Result.OK("请至少装入3夹钢坯！");
+    	 if(oConvertUtils.listIsEmpty(loadingParams.getStackingAndLoadingVehiclesList())){
+    		return Result.OK("请装入钢坯！");
 		 }
 		 Set<String> heats = new HashSet<>();
 		 for (StackingAndLoadingVehicles stackingAndLoadingVehicles : loadingParams.getStackingAndLoadingVehiclesList()) {

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -460,17 +460,11 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 .eq(BilletHotsend::getShift, billetHotsend.getShift())
                 .eq(BilletHotsend::getShiftGroup, billetHotsend.getShiftGroup());
         BilletHotsend idExistBh = billetHotsendBaseService.getOne(queryWrapper);
-        if (oConvertUtils.isNotEmpty(idExistBh) && oConvertUtils.listIsEmpty(stackingAndLoadingVehiclesList)){
-            return;
-        }
-        if (oConvertUtils.isEmpty(idExistBh) && oConvertUtils.listIsEmpty(stackingAndLoadingVehiclesList)){
-            billetHotsend.setStackNum(0);
-            billetHotsend.setAmountTotal(0);
-            billetHotsendBaseService.save(billetHotsend);
+        if (oConvertUtils.isEmpty(idExistBh)){
+            log.info("{}{}", "钢坯热送基础信息不存在，垛位装车失败！", JSON.toJSONString(loadingParams));
             return;
         }else {
-            billetHotsend.setStackNum(idExistBh.getStackNum() + stackingAndLoadingVehiclesList.size()); // 堆垛总支数
-            billetHotsend.setAmountTotal(idExistBh.getAmountTotal() + stackingAndLoadingVehiclesList.size() * 4); //总支数
+            billetHotsend.setStackNum(idExistBh.getStackNum() - stackingAndLoadingVehiclesList.size()); // 堆垛总数
             LambdaUpdateWrapper<BilletHotsend> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.eq(BilletHotsend::getCcmNo, billetHotsend.getCcmNo())
                     .eq(BilletHotsend::getHeatNo, billetHotsend.getHeatNo())
@@ -478,7 +472,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                     .eq(BilletHotsend::getShiftGroup, billetHotsend.getShiftGroup());;
             billetHotsendBaseService.update(billetHotsend, updateWrapper);
         }
-        // 根据铸机号、位置、层数、类型配置ID更新 容器中的垛位信息
+        // 根据铸机号、位置、层数、类型配置ID更新 初始化容器中的垛位信息
         stackingAndLoadingVehiclesList.forEach(x ->{
             LambdaUpdateWrapper<StackingAndLoadingVehicles> queryWrapperSA = new LambdaUpdateWrapper<>();
             queryWrapperSA.eq(StackingAndLoadingVehicles::getCcmNo, x.getCcmNo())
@@ -487,19 +481,17 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                     .eq(StackingAndLoadingVehicles::getTypeConfigId, loadingParams.getBilletHotsendTypeConfigId());;
             StackingAndLoadingVehicles stackingAndLoadingVehicles = new StackingAndLoadingVehicles();
             BeanUtils.copyProperties(x, stackingAndLoadingVehicles);
+            stackingAndLoadingVehicles.setBilletNos(null);
+            stackingAndLoadingVehicles.setSpec(null);
+            stackingAndLoadingVehicles.setSteel(null);
+            stackingAndLoadingVehicles.setSize(null);
+            stackingAndLoadingVehicles.setShift(null);
+            stackingAndLoadingVehicles.setHeatNo(null);
+            stackingAndLoadingVehicles.setShiftGroup(null);
+            stackingAndLoadingVehicles.setCreateDate(null);
             baseMapper.update(stackingAndLoadingVehicles, queryWrapperSA);
         });
 
-        // 获取所有的坯号集合
-        List<String> billetNosList = stackingAndLoadingVehiclesList.stream().map(StackingAndLoadingVehicles::getBilletNos)
-                .flatMap(billetNos -> {
-                    if (billetNos!= null) {
-                        return java.util.stream.Stream.of(billetNos.split(","));
-                    } else {
-                        return java.util.stream.Stream.empty();
-                    }
-                }).collect(Collectors.toList());
-
         // 3 保存 下垛日志    stacking_up_log
         List<StackingDownLog> stackingDownLogList = new ArrayList<>();
         stackingAndLoadingVehiclesList.forEach(x ->{
@@ -514,6 +506,17 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             stackingDownLogList.add(stackingDownLog);
         });
         stackingDownLogService.saveBatch(stackingDownLogList);
+
+        // 获取所有的坯号集合
+        List<String> billetNosList = stackingAndLoadingVehiclesList.stream().map(StackingAndLoadingVehicles::getBilletNos)
+                .flatMap(billetNos -> {
+                    if (billetNos!= null) {
+                        return java.util.stream.Stream.of(billetNos.split(","));
+                    } else {
+                        return java.util.stream.Stream.empty();
+                    }
+                }).collect(Collectors.toList());
+
         //5 查询并批量更新钢坯基础信息 belongTable
         LambdaQueryWrapper<BilletBasicInfo> queryWrapperBB = new LambdaQueryWrapper<BilletBasicInfo>()
                 .eq(BilletBasicInfo::getCcmNo, Integer.valueOf(billetHotsend.getCcmNo()))
@@ -542,16 +545,11 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
                 .eq(BilletHotsend::getShift, billetHotsend.getShift())
                 .eq(BilletHotsend::getShiftGroup, billetHotsend.getShiftGroup());
         BilletHotsend idExistBh = billetHotsendBaseService.getOne(queryWrapper);
-        if ((oConvertUtils.isNotEmpty(idExistBh) && oConvertUtils.listIsEmpty(stackingAndLoadingVehiclesList)) || (oConvertUtils.isEmpty(idExistBh) && oConvertUtils.listIsEmpty(stackingAndLoadingVehiclesList))) {
-            if (oConvertUtils.isEmpty(idExistBh)) {
-                billetHotsend.setStackNum(0);
-                billetHotsendBaseService.save(billetHotsend);
-                log.info("{}{}", "stackingAndLoadingVehiclesList为空,新增钢坯热送基础信息", JSON.toJSON(loadingParams));
-            }
+        if (oConvertUtils.isEmpty(idExistBh)){
+            log.info("{}{}", "钢坯热送基础信息不存在，垛位发车失败！", JSON.toJSONString(loadingParams));
             return;
         } else {
-            billetHotsend.setStackNum(idExistBh.getStackNum() + stackingAndLoadingVehiclesList.size()); // 堆垛总支数
-            billetHotsend.setAmountTotal(idExistBh.getAmountTotal() + stackingAndLoadingVehiclesList.size() * 4); //总支数
+            billetHotsend.setStackNum(idExistBh.getStackNum() - stackingAndLoadingVehiclesList.size()); // 堆垛总数
             LambdaUpdateWrapper<BilletHotsend> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.eq(BilletHotsend::getCcmNo, billetHotsend.getCcmNo())
                     .eq(BilletHotsend::getHeatNo, billetHotsend.getHeatNo())
@@ -613,15 +611,22 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         billetBasicInfoService.saveOrUpdateBatch(billetBasicInfoList);
         // 6 更新装运单 storage_bill 新增储运信息
         StorageBill storageBill = loadingParams.getStorageBill();
-        storageBill.setCarAllNum(oConvertUtils.isEmpty(storageBill.getCarAllNum()) ? "1" : String.valueOf(Integer.valueOf(storageBill.getCarAllNum())+1));// 车次总序号
-        storageBill.setCarNum(storageBill.getCarNum() == 0 ? 0 : storageBill.getCarNum() + 1);// 本车车次
+        LambdaQueryWrapper<StorageBill> queryWrapperSB = new LambdaQueryWrapper<>();
+        queryWrapperSB.eq(StorageBill::getCcmNo, storageBill.getCcmNo())
+                     .eq(StorageBill::getShift, storageBill.getShift())
+                   .eq(StorageBill::getShiftGroup, storageBill.getShiftGroup())
+                    .eq(StorageBill::getLicensePlate, storageBill.getLicensePlate());
+        List<StorageBill> storageBillList = storageBillService.list(queryWrapperSB);
+        storageBill.setCarNum(oConvertUtils.listIsEmpty(storageBillList) ? 0 : storageBillList.size() + 1);// 本车车次
+        storageBill.setTypeConfigId(loadingParams.getBilletHotsendTypeConfigId()); // 钢坯配置类型ID
+        storageBill.setDestination(billetHotsendTypeConfig.getTypeName());// 目的地
+        storageBill.setOutTime(new Date());
         storageBillService.updateById(storageBill);
         // 7 发车后，新增钢坯堆垛储运信息,生成储运单 storage_car_log
         StorageCarLog storageCarLog = new StorageCarLog();
         BeanUtils.copyProperties(storageBill, storageCarLog);
         storageCarLog.setDestination(billetHotsendTypeConfig.getTypeName());// 目的地
-        storageCarLog.setCarNm(String.valueOf(storageBill.getCarNum()));// 车号
-        storageCarLog.setOutCarNum(storageBill.getLicensePlate()); // 出车号
+        storageCarLog.setCarNm(storageBill.getLicensePlate());// 车牌号
         storageCarLog.setTypeConfigId(billetHotsendTypeConfig.getId()); // 钢坯配置类型ID
         storageCarLog.setHeatNo(billetHotsend.getHeatNo());
 //			  storageCarLog.setFixedWeight();// 定重
@@ -697,14 +702,21 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             stackingUpLogList.add(stackingUpLog);
         });
         stackingUpLogService.saveBatch(stackingUpLogList);
-        //4 获取所有的坯号集合
-        List<String> billetNos = rollClubCommonList.stream().map(RollClubCommon::getBilletNo).collect(Collectors.toList());
 
+        //4 获取所有的坯号集合
+        List<String> billetNosList = stackingAndLoadingVehiclesList.stream().map(StackingAndLoadingVehicles::getBilletNos)
+                .flatMap(billetNoss -> {
+                    if (billetNoss!= null) {
+                        return java.util.stream.Stream.of(billetNoss.split(","));
+                    } else {
+                        return java.util.stream.Stream.empty();
+                    }
+                }).collect(Collectors.toList());
         //5 查询并批量更新钢坯基础信息 belongTable
         LambdaQueryWrapper<BilletBasicInfo> queryWrapperBB = new LambdaQueryWrapper<BilletBasicInfo>()
                 .eq(BilletBasicInfo::getCcmNo, Integer.valueOf(billetHotsend.getCcmNo()))
                 .eq(BilletBasicInfo::getHeatNo, billetHotsend.getHeatNo())
-                .in(BilletBasicInfo::getBilletNo, billetNos);
+                .in(BilletBasicInfo::getBilletNo, billetNosList);
         List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(queryWrapperBB);
         billetBasicInfoList.forEach(x ->{
             x.setBelongTable("stacking_and_loading_vehicles");

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/entity/StorageBill.java

@@ -56,7 +56,7 @@ public class StorageBill implements Serializable {
     /**序号*/
     @Excel(name = "车次总序号", width = 15)
     @ApiModelProperty(value = "车次总序号")
-    private String carAllNum;
+    private Integer carAllNum;
     /**日期*/
     @Excel(name = "日期", width = 15)
     @ApiModelProperty(value = "日期")

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageCarLog/entity/StorageCarLog.java

@@ -53,18 +53,14 @@ public class StorageCarLog implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private String sysOrgCode;
-	/**出车号*/
-	@Excel(name = "出车号", width = 15)
-    @ApiModelProperty(value = "出车号")
-    private String outCarNum;
 	/**铸机*/
 	@Excel(name = "铸机", width = 15)
     @ApiModelProperty(value = "铸机")
     @Dict(dicCode = "lg_zj")
     private String ccmNo;
 	/**车号*/
-	@Excel(name = "车号", width = 15)
-    @ApiModelProperty(value = "车号")
+	@Excel(name = "车牌号", width = 15)
+    @ApiModelProperty(value = "车牌号")
     @Dict(dicCode = "lg_car")
     private String carNm;
 	/**目的地*/