车位铸机号 调整

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

@@ -262,6 +262,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				log.error("{}{}", "自动化<高线>异常：4条钢坯信息的assemblyNumber不一致：", JSON.toJSON(billetBasicInfoLists));
 				return;
 			}
+			return;
 		}
 
 		// 根据铸机号和炉号，查询棒一明细表，获取RollClubOneDetails中startNum的最大值
@@ -431,8 +432,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		LambdaQueryWrapper<StorageBill> queryWrapper2 = new LambdaQueryWrapper<>();
 		queryWrapper2.eq(StorageBill::getPositionNum, Integer.valueOf(positionNum))
 				.isNull(StorageBill::getOutTime);
-		// 2号车位不验证铸机号
-		if (!positionNum.equals("2")) {
+		// 1 or 3 验证铸机号
+		if (positionNum.equals("1") || positionNum.equals("3")) {
 			queryWrapper2.eq(StorageBill::getCcmNo, ccmNo);
 		}
 		StorageBill isStorageBill = storageBillService.getOne(queryWrapper2);
@@ -456,13 +457,13 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		// 更新装运单铸机号、班别、班组
 		if ("0".equals(isStorageBill.getCcmNo())) {
 			// 更新铸机号，到装运单
-			isStorageBill.setCcmNo(ccmNo);
+//			isStorageBill.setCcmNo(ccmNo);
 			isStorageBill.setShiftGroup(shiftGroup);
 			isStorageBill.setShift(shift);
 			storageBillService.updateById(isStorageBill);
 		}else if (!isStorageBill.getCcmNo().equals(ccmNo)){
 			// 更新铸机号，到装运单
-			isStorageBill.setCcmNo(ccmNo);
+//			isStorageBill.setCcmNo(ccmNo);
 			isStorageBill.setShiftGroup(shiftGroup);
 			isStorageBill.setShift(shift);
 			storageBillService.updateById(isStorageBill);

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/stackingAndLoadingVehicles/service/impl/StackingAndLoadingVehiclesServiceImpl.java

@@ -417,7 +417,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
         // 更新装运单铸机号、班别、班组
         if ("0".equals(isStorageBill.getCcmNo())) {
             // 更新铸机号，到装运单
-            isStorageBill.setCcmNo(ccmNo);
+//            isStorageBill.setCcmNo(ccmNo);
             isStorageBill.setShiftGroup(shiftGroup);
             isStorageBill.setShift(shift);
             storageBillService.updateById(isStorageBill);

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

@@ -103,8 +103,8 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             LambdaQueryWrapper<StorageBill> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(StorageBill::getPositionNum, Integer.valueOf(positionNum))
                     .isNull(StorageBill::getOutTime);
-            // 2号车位不验证铸机号
-            if (!positionNum.equals("2")) {
+            // 1 或者 3  车位确认铸机号
+            if (positionNum.equals("1") || positionNum.equals("3")) {
                 queryWrapper.eq(StorageBill::getCcmNo, ccmNo);
             }
             StorageBill isStorageBill = baseMapper.selectOne(queryWrapper);
@@ -149,7 +149,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
 //            storageBill.setCarAllNum(carAllNum + 1);
             // 保存储运单信息
             // 2号车位铸机号给0
-            if (!positionNum.equals("2")) {
+            if (positionNum.equals("1") || positionNum.equals("3")) {
                 storageBill.setCcmNo(ccmNo);
             }else{
                 storageBill.setCcmNo("0");