装运明细移除功能调整

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

@@ -583,6 +583,8 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 			}
 
 			String finalHeatNo = billetBasicInfoList.get(0).getHeatNo();
+			String shift = billetBasicInfoList.get(0).getShift();
+			String shiftGroup = billetBasicInfoList.get(0).getShiftGroup();
 			Double sumBlankOutput;
 			int sumAmountTotal = billetBasicInfoList.size();
 			if ("棒二".equals(storageBillVo.getDestination())) {
@@ -597,8 +599,8 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 				LambdaQueryWrapper<RollClubTwo> queryWrapper = new LambdaQueryWrapper<RollClubTwo>()
 						.eq(RollClubTwo::getCcmNo, storageBillVo.getCcmNo())
 						.eq(RollClubTwo::getHeatNo, finalHeatNo)
-						.eq(RollClubTwo::getShiftGroup, storageBillVo.getShiftGroup())
-						.eq(RollClubTwo::getShift, storageBillVo.getShift())
+						.eq(RollClubTwo::getShiftGroup, shiftGroup)
+						.eq(RollClubTwo::getShift, shift)
 						.eq(RollClubTwo::getStorageBillId, storageBillVo.getId())
 						.last("limit 1");
 				RollClubTwo rollClubTwo = rollClubTwoService.getOne(queryWrapper);
@@ -619,8 +621,8 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 				LambdaQueryWrapper<RollClubThree> queryWrapper = new LambdaQueryWrapper<RollClubThree>()
 						.eq(RollClubThree::getCcmNo, storageBillVo.getCcmNo())
 						.eq(RollClubThree::getHeatNo, finalHeatNo)
-						.eq(RollClubThree::getShiftGroup, storageBillVo.getShiftGroup())
-						.eq(RollClubThree::getShift, storageBillVo.getShift())
+						.eq(RollClubThree::getShiftGroup, shiftGroup)
+						.eq(RollClubThree::getShift, shift)
 						.eq(RollClubThree::getStorageBillId, storageBillVo.getId())
 						.last("limit 1");
 				RollClubThree rollClubThree = rollClubThreeService.getOne(queryWrapper);
@@ -641,8 +643,8 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 				LambdaQueryWrapper<RollOutShipp> queryWrapper = new LambdaQueryWrapper<RollOutShipp>()
 						.eq(RollOutShipp::getCcmNo, storageBillVo.getCcmNo())
 						.eq(RollOutShipp::getHeatNo, finalHeatNo)
-						.eq(RollOutShipp::getShiftGroup, storageBillVo.getShiftGroup())
-						.eq(RollOutShipp::getShift, storageBillVo.getShift())
+						.eq(RollOutShipp::getShiftGroup, shiftGroup)
+						.eq(RollOutShipp::getShift, shift)
 						.eq(RollOutShipp::getStorageBillId, storageBillVo.getId())
 						.last("limit 1");
 				RollOutShipp rollOutShipp = rollOutShippService.getOne(queryWrapper);
@@ -680,6 +682,7 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 						.eq(StackingAndLoadingVehicles::getCcmNo, storageBillVo.getCcmNo())
 				);
 				if (oConvertUtils.isNotEmpty(stackingAndLoadingVehiclesPositionInfo) && oConvertUtils.isNotEmpty(stackingAndLoadingVehiclesPositionInfo.getBilletNos())){
+					log.error("{}{}", "该层该位置已存在数据，装运明细移除失败！", JSON.toJSON(stackingAndLoadingVehiclesPositionInfo));
 					TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 					return Result.error("该层该位置已存在数据，装运明细移除失败！");
 				}
@@ -710,9 +713,10 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 			LambdaQueryWrapper<BilletHotsend> queryWrapperBH = new LambdaQueryWrapper<BilletHotsend>()
 					.eq(BilletHotsend::getCcmNo, storageBillVo.getCcmNo())
 					.eq(BilletHotsend::getHeatNo, finalHeatNo)
-					.eq(BilletHotsend::getShiftGroup, storageBillVo.getShiftGroup())
-					.eq(BilletHotsend::getShift, storageBillVo.getShift())
+					.eq(BilletHotsend::getShiftGroup, shiftGroup)
+					.eq(BilletHotsend::getShift, shift)
 					.last("limit 1");
+			log.info("{}{}", "装运单移除钢坯，查询热送传递单参数：", storageBillVo.getCcmNo() + ":" + finalHeatNo + ":" + shiftGroup + ":" + shift);
 			BilletHotsend billetHotsend = billetHotsendBaseService.getOne(queryWrapperBH);
 			if (oConvertUtils.isEmpty(billetHotsend)) {
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();