车位2 特殊处理

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

@@ -250,9 +250,11 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 	public void autoAddRodLine(JSONObject jsonObject) {
 		log.info("{}{}", "C端自动化轧钢外运<保存>参数:", jsonObject);
 
+
 		BilletHotsendDetailsVo billetHotsendDetailsVo = new BilletHotsendDetailsVo();
 
 		String ccmNo = jsonObject.getString("ccmNo");
+
 		String billetNos = jsonObject.getString("billetNos");
 //		String billetHotsendTypeConfigId = jsonObject.getString("billetHotsendTypeConfigId");
 		String licensePlate = jsonObject.getString("licensePlate");
@@ -269,6 +271,20 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			return;
 		}
 
+		// 首先查询钢坯装运单
+		LambdaQueryWrapper<StorageBill> queryWrapper2 = new LambdaQueryWrapper<>();
+		queryWrapper2.eq(StorageBill::getPositionNum, Integer.valueOf(positionNum))
+				.isNull(StorageBill::getOutTime);
+		// 2号车位不验证铸机号
+		if (!positionNum.equals("2")) {
+			queryWrapper2.eq(StorageBill::getCcmNo, ccmNo);
+		}
+		StorageBill isStorageBill = storageBillService.getOne(queryWrapper2);
+		// 更具装运单确认铸机号
+		if (oConvertUtils.isNotEmpty(isStorageBill) && oConvertUtils.isNotEmpty(isStorageBill.getCcmNo())) {
+			ccmNo = isStorageBill.getCcmNo();
+		}
+
 		String shiftGroup = shiftGroupHandle(ccmNo);
 		String shift = shiftHandle(ccmNo);
 
@@ -334,14 +350,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			billetLiftingBillUpdate.setAssemblyNumber(getAssemblyNumber(billetBasicInfoLists));
 			billetLiftingBillService.updateById(billetLiftingBillUpdate);
 		}
-
-		LambdaQueryWrapper<StorageBill> queryWrapper2 = new LambdaQueryWrapper<>();
-		queryWrapper2.eq(StorageBill::getCcmNo, ccmNo)
-				.eq(StorageBill::getPositionNum, Integer.valueOf(positionNum))
-//				.eq(StorageBill::getShiftGroup, shiftGroup)
-//				.eq(StorageBill::getShift, shift)
-				.isNull(StorageBill::getOutTime);
-		StorageBill isStorageBill = storageBillService.getOne(queryWrapper2);
+		// 钢坯装运单
 		if (oConvertUtils.isEmpty(isStorageBill)) {
 			log.info("未查询钢坯装运单信息，车位号为：{}，C端自动化轧钢外运<保存>失败！", positionNum);
 			BilletAutoException billetAutoException = new BilletAutoException();

zgzt-sys-java/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -172,7 +172,7 @@ spring:
           slow-sql-millis: 5000
       datasource:
         master:
-          url: jdbc:mysql://192.168.1.53/lg_0416?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://123.57.213.14:33066/lg_0416?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
 #          url: jdbc:mysql://127.0.0.1/lg?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: 1qaz2wsx@..