处理高线和棒一逻辑

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

@@ -175,27 +175,28 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		List<String> sizeLists = sizeList.stream().map(String::valueOf).collect(Collectors.toList());
 		String sizeString = String.join(",", sizeLists);
 		if (oConvertUtils.isEmpty(billetHotsendDetailsVo.getStorageBill()) || billetHotsendDetailsVo.getStorageBill() == null){
-			if ("roll_height".equals(billetHotsendDetailsVo.getBelongTable()) || "roll_club_one".equals(billetHotsendDetailsVo.getBelongTable())){
-				List<String> heatNoList = rollClubCommonList.stream().map(RollClubCommon::getHeatNo).distinct().collect(Collectors.toList());
-
-				// 生成钢坯装运单记录
-				StorageBill storageBillInfo = createStorageBill(billetHotsendDetailsVo, rollClubCommonList, sizeLists);
-				String distinctAssemblyNumber = billetBasicInfoList.stream()
-						.map(BilletBasicInfo::getAssemblyNumber)
-						.filter(assemblyNumber -> assemblyNumber!= null)
-						.distinct()
-						.collect(Collectors.joining(","));
-				storageBillInfo.setAssemblyNumber(distinctAssemblyNumber);
-				storageBillInfo.setId(rollClubOneOrHeightStorageBillId);
-				if ("roll_height".equals(billetHotsendDetailsVo.getBelongTable())){
-					storageBillInfo.setBtype("0");
-				}
-				storageBillService.save(storageBillInfo);
-				// 生成钢坯储运单记录
-				StorageCarLog storageCarLog = createStorageCarLog(storageBillInfo, rollClubCommonList, heatNoList, sizeLists);
-				storageCarLogService.save(storageCarLog);
-				result.put("success", "6".equals(billetHotsendDetailsVo.getBilletHotsend().getCcmNo()) ? "保存高线成功！" : "保存棒一成功！");
-			}
+			// 5号机棒一和6号机高线不产生，装运单和储运记录
+//			if ("roll_height".equals(billetHotsendDetailsVo.getBelongTable()) || "roll_club_one".equals(billetHotsendDetailsVo.getBelongTable())){
+//				List<String> heatNoList = rollClubCommonList.stream().map(RollClubCommon::getHeatNo).distinct().collect(Collectors.toList());
+//
+//				// 生成钢坯装运单记录
+//				StorageBill storageBillInfo = createStorageBill(billetHotsendDetailsVo, rollClubCommonList, sizeLists);
+//				String distinctAssemblyNumber = billetBasicInfoList.stream()
+//						.map(BilletBasicInfo::getAssemblyNumber)
+//						.filter(assemblyNumber -> assemblyNumber!= null)
+//						.distinct()
+//						.collect(Collectors.joining(","));
+//				storageBillInfo.setAssemblyNumber(distinctAssemblyNumber);
+//				storageBillInfo.setId(rollClubOneOrHeightStorageBillId);
+//				if ("roll_height".equals(billetHotsendDetailsVo.getBelongTable())){
+//					storageBillInfo.setBtype("0");
+//				}
+//				storageBillService.save(storageBillInfo);
+//				// 生成钢坯储运单记录
+//				StorageCarLog storageCarLog = createStorageCarLog(storageBillInfo, rollClubCommonList, heatNoList, sizeLists);
+//				storageCarLogService.save(storageCarLog);
+//				result.put("success", "6".equals(billetHotsendDetailsVo.getBilletHotsend().getCcmNo()) ? "保存高线成功！" : "保存棒一成功！");
+//			}
 			return result;
 		}
 		// 更新装运单 车次总序号、本车车次

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

@@ -45,8 +45,6 @@ import org.jeecg.modules.billet.stackingAndLoadingVehicles.service.IStackingDown
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.service.IStackingUpLogService;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.vo.ClipLayerVo;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.vo.LoadingParams;
-import org.jeecg.modules.billet.storageBill.entity.ShiftEnum;
-import org.jeecg.modules.billet.storageBill.entity.ShiftGroupEnum;
 import org.jeecg.modules.billet.storageBill.entity.StorageBill;
 import org.jeecg.modules.billet.storageBill.service.IStorageBillService;
 import org.jeecg.modules.billet.storageCarLog.entity.StorageCarLog;
@@ -651,23 +649,24 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             }
         }
         if ("roll_height".equals(loadingParams.getDestinationTable())) {
-            heatNoList = rollClubCommonList.stream().map(RollClubCommon::getHeatNo).distinct().collect(Collectors.toList());
-            List<Integer> sizeHeightList = rollClubCommonList.stream().map(RollClubCommon::getLength).distinct().collect(Collectors.toList());
-            List<String> sizeLists = sizeHeightList.stream().map(String::valueOf).collect(Collectors.toList());
-            // 生成钢坯装运单记录
-            StorageBill storageBillInfo = createStorageBill(loadingParams, rollClubCommonList, sizeLists);
-            storageBillInfo.setId(rollHeightStorageBillId);
-            String distinctAssemblyNumber = billetBasicInfoList.stream()
-                    .map(BilletBasicInfo::getAssemblyNumber)
-                    .filter(assemblyNumber -> assemblyNumber != null)
-                    .distinct()
-                    .collect(Collectors.joining(","));
-            storageBillInfo.setAssemblyNumber(distinctAssemblyNumber);
-            storageBillService.save(storageBillInfo);
-
-            // 生成钢坯储运单记录
-            StorageCarLog storageCarLog = createStorageCarLog(storageBillInfo, rollClubCommonList, heatNoList, sizeLists);
-            storageCarLogService.save(storageCarLog);
+            // 堆垛去高线不产生 装运单和储运记录
+//            heatNoList = rollClubCommonList.stream().map(RollClubCommon::getHeatNo).distinct().collect(Collectors.toList());
+//            List<Integer> sizeHeightList = rollClubCommonList.stream().map(RollClubCommon::getLength).distinct().collect(Collectors.toList());
+//            List<String> sizeLists = sizeHeightList.stream().map(String::valueOf).collect(Collectors.toList());
+//            // 生成钢坯装运单记录
+//            StorageBill storageBillInfo = createStorageBill(loadingParams, rollClubCommonList, sizeLists);
+//            storageBillInfo.setId(rollHeightStorageBillId);
+//            String distinctAssemblyNumber = billetBasicInfoList.stream()
+//                    .map(BilletBasicInfo::getAssemblyNumber)
+//                    .filter(assemblyNumber -> assemblyNumber != null)
+//                    .distinct()
+//                    .collect(Collectors.joining(","));
+//            storageBillInfo.setAssemblyNumber(distinctAssemblyNumber);
+//            storageBillService.save(storageBillInfo);
+//
+//            // 生成钢坯储运单记录
+//            StorageCarLog storageCarLog = createStorageCarLog(storageBillInfo, rollClubCommonList, heatNoList, sizeLists);
+//            storageCarLogService.save(storageCarLog);
             result.put("success", "堆垛去高线发车操作成功！");
             return result;
 
@@ -1045,67 +1044,4 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
             billetHotsendChangeShiftService.updateById(billetHotsendChangeShift);
         }
     }
-
-
-    /**
-     * 处理高线 装运单信息
-     *
-     * @param loadingParams
-     * @param rollClubCommonList
-     * @param sizeList
-     * @return
-     */
-    private StorageBill createStorageBill(LoadingParams loadingParams, List<RollClubCommon> rollClubCommonList, List<String> sizeList) {
-        StorageBill storageBillInfo = new StorageBill();
-        storageBillInfo.setBtype("1");
-        storageBillInfo.setTypeConfigId(loadingParams.getDestinationId());
-        storageBillInfo.setDestination("高线");
-        storageBillInfo.setShiftGroup(loadingParams.getBilletHotsend().getShiftGroup());
-        storageBillInfo.setSteel(loadingParams.getBilletHotsend().getSteel());
-        storageBillInfo.setSpec(loadingParams.getBilletHotsend().getSpec());
-        storageBillInfo.setShift(loadingParams.getBilletHotsend().getShift());
-        storageBillInfo.setAmountTotal(rollClubCommonList.size());
-        LambdaQueryWrapper<StorageBill> queryWrapper1 = new LambdaQueryWrapper<>();
-        queryWrapper1.eq(StorageBill::getCcmNo, loadingParams.getBilletHotsend().getCcmNo())
-                .eq(StorageBill::getLicensePlate, "堆垛辊道")
-                .eq(StorageBill::getShiftGroup, loadingParams.getBilletHotsend().getShiftGroup())
-                .eq(StorageBill::getShift, loadingParams.getBilletHotsend().getShift())
-                .between(StorageBill::getCreateTime, DateUtils.getStartOfDay(), DateUtils.getEndOfDay());
-        List<StorageBill> storageBillList = storageBillService.list(queryWrapper1);
-        LambdaQueryWrapper<StorageBill> queryWrapper2 = new LambdaQueryWrapper<>();
-        queryWrapper2.eq(StorageBill::getCcmNo, loadingParams.getBilletHotsend().getCcmNo())
-                .between(StorageBill::getCreateTime, DateUtils.getStartOfDay(), DateUtils.getEndOfDay());
-        List<StorageBill> storageBillList2 = storageBillService.list(queryWrapper2);
-        storageBillInfo.setCarNum(oConvertUtils.listIsNotEmpty(storageBillList) ? storageBillList.size() + 1 : 1);
-        storageBillInfo.setCarAllNum(oConvertUtils.listIsNotEmpty(storageBillList2) ? storageBillList.size() + 1 : 1);
-        storageBillInfo.setLicensePlate("堆垛辊道");
-        storageBillInfo.setCcmNo(loadingParams.getBilletHotsend().getCcmNo());
-        storageBillInfo.setSize(String.join(",", sizeList));
-        storageBillInfo.setDateTime(new Date());
-        storageBillInfo.setCreateTime(new Date());
-        String uniqueCode = DateUtils.date2Str(new Date(), DateUtils.yyyymmddhhmmss.get()) + "-" + loadingParams.getBilletHotsend().getCcmNo() + "#" + ShiftEnum.fromCode(loadingParams.getBilletHotsend().getShift()).name() + "-" + ShiftGroupEnum.fromCode(loadingParams.getBilletHotsend().getShiftGroup()).name();
-        storageBillInfo.setUniqueCode(uniqueCode);
-        return storageBillInfo;
-    }
-
-    /**
-     * 处理储运记录
-     *
-     * @param storageBill
-     * @param rollClubCommonList
-     * @param heatNoList
-     * @param sizeList
-     * @return
-     */
-    private StorageCarLog createStorageCarLog(StorageBill storageBill, List<RollClubCommon> rollClubCommonList, List<String> heatNoList, List<String> sizeList) {
-        StorageCarLog storageCarLog = new StorageCarLog();
-        BeanUtils.copyProperties(storageBill, storageCarLog);
-        storageCarLog.setCarNm("堆垛辊道");
-        storageCarLog.setDestination("高线");
-        storageCarLog.setHeatNo(String.join(",", heatNoList));
-        storageCarLog.setSize(String.join(",", sizeList));
-        storageCarLog.setAmount(rollClubCommonList.size());
-        storageCarLog.setDataTime(new Date());
-        return storageCarLog;
-    }
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/controller/StorageBillController.java

@@ -24,7 +24,6 @@ import org.jeecg.modules.billet.rollClubThree.entity.RollClubThreeDetails;
 import org.jeecg.modules.billet.rollClubThree.service.IRollClubThreeDetailsService;
 import org.jeecg.modules.billet.rollClubTwo.entity.RollClubTwoDetails;
 import org.jeecg.modules.billet.rollClubTwo.service.IRollClubTwoDetailsService;
-import org.jeecg.modules.billet.rollHeight.entity.DestinationStatisticsDetails;
 import org.jeecg.modules.billet.rollHeight.entity.RollHeightDetails;
 import org.jeecg.modules.billet.rollHeight.service.IRollHeightDetailsService;
 import org.jeecg.modules.billet.rollOutShipp.entity.RollOutShippDetails;
@@ -104,7 +103,6 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<StorageBill> queryWrapper = QueryGenerator.initQueryWrapper(storageBill, req.getParameterMap());
-		queryWrapper.notIn("license_plate", Arrays.asList("堆垛辊道","辊道"));
 		Page<StorageBill> page = new Page<StorageBill>(pageNo, pageSize);
 		IPage<StorageBill> pageList = storageBillService.page(page, queryWrapper);
 		return Result.OK(pageList);
@@ -117,7 +115,6 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 													@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 													HttpServletRequest req) {
 		QueryWrapper<StorageBill> queryWrapper = QueryGenerator.initQueryWrapper(storageBill, req.getParameterMap());
-		queryWrapper.in("license_plate", Arrays.asList("堆垛辊道","辊道"));
 		Page<StorageBill> page = new Page<StorageBill>(pageNo, pageSize);
 		IPage<StorageBill> pageList = storageBillService.page(page, queryWrapper);
 		return Result.OK(pageList);
@@ -130,7 +127,6 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 														   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 														   HttpServletRequest req) {
 		QueryWrapper<StorageBill> queryWrapper = QueryGenerator.initQueryWrapper(storageBill, req.getParameterMap());
-		queryWrapper.in("license_plate", Arrays.asList("堆垛辊道","辊道"));
 		queryWrapper.isNotNull("heat_no");
 		// 添加分组条件
 		queryWrapper.groupBy("heat_no");
@@ -519,7 +515,6 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                                  HttpServletRequest req) {
         QueryWrapper<StorageBill> queryWrapper = QueryGenerator.initQueryWrapper(storageBill, req.getParameterMap());
-        queryWrapper.notIn("license_plate", Arrays.asList("堆垛辊道", "辊道"));
         queryWrapper.isNotNull("heat_no");
         // 添加分组条件
         queryWrapper.groupBy("heat_no");

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/service/impl/StorageBillServiceImpl.java

@@ -399,7 +399,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
         queryWrapper.eq(StorageBill::getCcmNo, "6")
                 .eq(StorageBill::getShift, sixShift)
                 .eq(StorageBill::getShiftGroup, sixShiftGroup)
-                .ne(StorageBill::getLicensePlate, "辊道")
                 .between(StorageBill::getCreateTime, DateUtils.getStartOfDay(), DateUtils.getEndOfDay())
                 .isNull(StorageBill::getOutTime)
                 .orderByDesc(StorageBill::getCreateTime);
@@ -409,7 +408,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                     .eq(StorageBill::getCcmNo, "5")
                     .eq(StorageBill::getShift, fiveShift)
                     .eq(StorageBill::getShiftGroup, fiveShiftGroup)
-                    .ne(StorageBill::getLicensePlate, "辊道")
                     .between(StorageBill::getCreateTime, DateUtils.getStartOfDay(), DateUtils.getEndOfDay())
                     .isNull(StorageBill::getOutTime)
             );
@@ -490,8 +488,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
     @Override
     public List<StorageBill> queryStorageBillByPositionNum() {
         List<StorageBill> storageBillList = baseMapper.selectList(new LambdaQueryWrapper<StorageBill>()
-                .ne(StorageBill::getLicensePlate, "堆垛辊道")
-                .ne(StorageBill::getLicensePlate, "辊道")
                 .isNull(StorageBill::getOutTime)
                 .isNotNull(StorageBill::getArrivalTime)
                 .orderByAsc(StorageBill::getPositionNum));
@@ -1498,12 +1494,11 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             shift = billetHotsendChangeShift.getShift();
         }
 
-        // 根据铸机号、班组、班别、licensePlate不等于”辊道“或者”堆垛辊道“，amountTotal不等于0 ，查询当班装运单信息
+        // 根据铸机号、班组、班别，amountTotal不等于0 ，查询当班装运单信息
         LambdaQueryWrapper<StorageBill> queryWrapper2 = new LambdaQueryWrapper<>();
         queryWrapper2.eq(StorageBill::getCcmNo, ccmNo)
                 .eq(StorageBill::getShift, shift)
                 .eq(StorageBill::getShiftGroup, shiftGroup)
-                .notIn(StorageBill::getLicensePlate, "辊道", "堆垛辊道")
                 .isNull(StorageBill::getOutTime);
         // 检查 billetHotsendChangeShift 是否为空
         if (oConvertUtils.isEmpty(changeShiftId)) {
@@ -1616,12 +1611,11 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
         }
 
 
-        // 根据铸机号、班组、班别、licensePlate不等于”辊道“或者”堆垛辊道“，amountTotal不等于0 ，查询当班装运单信息
+        // 根据铸机号、班组、班别，amountTotal不等于0 ，查询当班装运单信息
         LambdaQueryWrapper<StorageBill> queryWrapper2 = new LambdaQueryWrapper<>();
         queryWrapper2.eq(StorageBill::getCcmNo, ccmNo)
                 .eq(StorageBill::getShift, shift)
                 .eq(StorageBill::getShiftGroup, shiftGroup)
-                .notIn(StorageBill::getLicensePlate, "辊道", "堆垛辊道")
                 .gt(StorageBill::getAmountTotal, 0);
         // 检查 billetHotsendChangeShift 是否为空
         if (oConvertUtils.isEmpty(changeShiftId)) {