2号 车位调整

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/billetActual/service/impl/BilletHotsendBaseServiceImpl.java

@@ -289,17 +289,18 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				.filter(num -> num.length() >= 9)
 				.map(num -> String.valueOf(num.charAt(8)))
 				.orElse("");
-
+		
+		log.info("C端自动化热装铸机号:{}", ccmNo);
+		String shiftGroup = shiftGroupHandle(ccmNo);
+		String shift = shiftHandle(ccmNo);
 		// 更具装运单确认铸机号
 		if (oConvertUtils.isNotEmpty(isStorageBill) && oConvertUtils.isEmpty(isStorageBill.getCcmNo())) {
 			// 更新铸机号，到装运单
 			isStorageBill.setCcmNo(ccmNo);
+			isStorageBill.setShiftGroup(shiftGroup);
+			isStorageBill.setShift(shift);
 			storageBillService.updateById(isStorageBill);
 		}
-
-		log.info("C端自动化热装铸机号:{}", ccmNo);
-		String shiftGroup = shiftGroupHandle(ccmNo);
-		String shift = shiftHandle(ccmNo);
 		log.info("C端自动化缓存中的班组、班别:{}", shiftGroup + ":" + shift);
 		if (oConvertUtils.isEmpty(shiftGroup) || oConvertUtils.isEmpty(shift)){
 			log.info("{}{}", "班组班别获取为空，C端自动化热装<保存>失败！", JSON.toJSON(isStorageBill));

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/storageBill/service/impl/StorageBillServiceImpl.java

@@ -96,10 +96,10 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
              * 车位4:   六号机步进冷床和602堆垛中间的车位
              */
             // 车位等于 2铸机号先归为0 变更日期 2025-4-24 默认取6
-            if (positionNum.equals("2")) {
-                shiftGroup = getShiftInfo("6", "class:shift:group:%s");
-                shift = getShiftInfo("6", "class:shift:%s");
-            }
+//            if (positionNum.equals("2")) {
+//                shiftGroup = getShiftInfo("6", "class:shift:group:%s");
+//                shift = getShiftInfo("6", "class:shift:%s");
+//            }
             LambdaQueryWrapper<StorageBill> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(StorageBill::getPositionNum, Integer.valueOf(positionNum))
                     .isNull(StorageBill::getOutTime);
@@ -155,28 +155,28 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                 storageBill.setCcmNo("0");
             }
             // 根据铸机号、班组、班别，创建时间倒序 只返回一条，查询储运配置信息
-            LambdaQueryWrapper<ShiftConfiguration> queryWrapper1 = new LambdaQueryWrapper<ShiftConfiguration>();
-            queryWrapper1.eq(ShiftConfiguration::getCcmNo, ccmNo)
-                    .eq(ShiftConfiguration::getShiftGroup, shiftGroup)
-                    .eq(ShiftConfiguration::getShift, shift)
-                    .orderByDesc(ShiftConfiguration::getCreateTime)
-                    .last("limit 1");
-            ShiftConfiguration shiftConfiguration = shiftConfigurationService.getOne(queryWrapper1);
-            if (shiftConfiguration != null && oConvertUtils.isNotEmpty(shiftConfiguration.getDestination())){
-                LambdaQueryWrapper<BilletHotsendTypeConfig> queryWrapper3 = new LambdaQueryWrapper<>();
-                queryWrapper3.eq(BilletHotsendTypeConfig::getCastMachine, ccmNo)
-                        .eq(BilletHotsendTypeConfig::getId, shiftConfiguration.getDestination());
+//            LambdaQueryWrapper<ShiftConfiguration> queryWrapper1 = new LambdaQueryWrapper<ShiftConfiguration>();
+//            queryWrapper1.eq(ShiftConfiguration::getCcmNo, ccmNo)
+//                    .eq(ShiftConfiguration::getShiftGroup, shiftGroup)
+//                    .eq(ShiftConfiguration::getShift, shift)
+//                    .orderByDesc(ShiftConfiguration::getCreateTime)
+//                    .last("limit 1");
+//            ShiftConfiguration shiftConfiguration = shiftConfigurationService.getOne(queryWrapper1);
+//            if (shiftConfiguration != null && oConvertUtils.isNotEmpty(shiftConfiguration.getDestination())){
+//                LambdaQueryWrapper<BilletHotsendTypeConfig> queryWrapper3 = new LambdaQueryWrapper<>();
+//                queryWrapper3.eq(BilletHotsendTypeConfig::getCastMachine, ccmNo)
+//                        .eq(BilletHotsendTypeConfig::getId, shiftConfiguration.getDestination());
 //                BilletHotsendTypeConfig billetHotsendTypeConfig = billetHotsendTypeConfigService.getOne(queryWrapper3);
 //                storageBill.setDestination(billetHotsendTypeConfig.getTypeName());
 //                storageBill.setTypeConfigId(shiftConfiguration.getDestination());
-                storageBill.setBrandNum(shiftConfiguration.getSteelGrade());//牌号
-                storageBill.setNewOldPlatform(shiftConfiguration.getNewOldPlatform());
-//                storageBill.setSize(shiftConfiguration.getSpec());
-                storageBill.setTypeConfigId("1024");
-            }else {
+//                storageBill.setBrandNum(shiftConfiguration.getSteelGrade());//牌号
+//                storageBill.setNewOldPlatform(shiftConfiguration.getNewOldPlatform());
+////                storageBill.setSize(shiftConfiguration.getSpec());
+//                storageBill.setTypeConfigId("1024");
+//            }else {
                 // C端自动化创建装运单时，默认未知目的地
                 storageBill.setTypeConfigId("1024");
-            }
+//            }
 
             storageBill.setAmountTotal(0);
             storageBill.setPanelAmountTotal(0);