update07

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.billet.billetHotsend.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,6 +15,8 @@ import org.jeecg.modules.billet.billetHotsend.entity.RulerDefaultConfig;
 import org.jeecg.modules.billet.billetHotsend.mapper.BilletHotsendBaseMapper;
 import org.jeecg.modules.billet.billetHotsend.service.IBilletHotsendBaseService;
 import org.jeecg.modules.billet.billetHotsend.service.IRulerDefaultConfigService;
+import org.jeecg.modules.billet.billetHotsendConfig.entity.BilletHotsendTypeConfig;
+import org.jeecg.modules.billet.billetHotsendConfig.service.IBilletHotsendTypeConfigService;
 import org.jeecg.modules.billet.rollClubOne.entity.RollClubOne;
 import org.jeecg.modules.billet.rollClubOne.entity.RollClubOneDetails;
 import org.jeecg.modules.billet.rollClubOne.service.IRollClubOneDetailsService;
@@ -38,6 +41,7 @@ import org.jeecg.modules.billet.storageBill.entity.StorageBill;
 import org.jeecg.modules.billet.storageBill.entity.StorageBillModel;
 import org.jeecg.modules.billet.storageBill.service.IStorageBillModelService;
 import org.jeecg.modules.billet.storageBill.service.IStorageBillService;
+import org.jeecg.modules.billet.storageCarLog.entity.StorageCarLog;
 import org.jeecg.modules.billet.storageCarLog.service.IStorageCarLogService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +51,7 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 钢坯热送基础信息
@@ -90,6 +95,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 	private IRollOutShippDetailsService rollOutShippDetailsService;
 	@Autowired
 	private IBilletBasicInfoService billetBasicInfoService;
+	@Autowired
+	private IBilletHotsendTypeConfigService billetHotsendTypeConfigService;
 
 	@Override
 	public void updateDesc(BilletHotsend billetHotsend) {
@@ -299,13 +306,12 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 	@Override
 	public void saveBilletHotsendDetails(BilletHotsendDetailsVo billetHotsendDetailsVo) {
 		BilletHotsend billetHotsend = new BilletHotsend();
+		StorageBill storageBill = billetHotsendDetailsVo.getStorageBill();
 		// 新保存 钢坯热送基础信息
 		BeanUtils.copyProperties(billetHotsendDetailsVo.getBilletHotsend(), billetHotsend);
 		billetHotsend.setCreateDate(new Date());
-		List<RollClubCommon> rollClubCommonLists = billetHotsendDetailsVo.getRollClubCommonList();
-		if (oConvertUtils.isNotEmpty(rollClubCommonLists)){
-			billetHotsend.setAmountTotal(rollClubCommonLists.size());
-		}
+		List<RollClubCommon> rollClubCommonList = billetHotsendDetailsVo.getRollClubCommonList();
+		billetHotsend.setAmountTotal(rollClubCommonList.size());
 		if (billetHotsend.getIsUpd()){
 			baseMapper.insert(billetHotsend);
 		}else {
@@ -314,22 +320,16 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			baseMapper.update(billetHotsend,  updateWrapper);
 		}
 		if (oConvertUtils.isEmpty(billetHotsendDetailsVo.getBelongTable())){
+			log.info("{}{}", ">>>>>>>>>钢坯热送基础信息-添加或发车失败，belongTable参数为空:", JSON.toJSON(billetHotsendDetailsVo));
 			return;
 		}
 		List<String> billetNos = new ArrayList<>();
-		List<RollClubCommon> rollClubCommonList = billetHotsendDetailsVo.getRollClubCommonList();
 		// 保存 钢坯热送单炉支数传递单明细
 		if ("roll_club_one".equals(billetHotsendDetailsVo.getBelongTable())){
 			// 保存棒一信息
 			RollClubOne rollClubOne = new RollClubOne();
-			rollClubOne.setCcmNo(billetHotsend.getCcmNo());
-			rollClubOne.setHeatNo(billetHotsend.getHeatNo());
-			rollClubOne.setShiftGroup(billetHotsend.getShiftGroup());
-			rollClubOne.setShift(billetHotsend.getShift());
-			rollClubOne.setSteel(billetHotsend.getSteel());
+			BeanUtils.copyProperties(billetHotsend, rollClubOne);
 			rollClubOne.setAmountTotal(rollClubCommonList.size());// 总支数
-			rollClubOne.setSpec(billetHotsend.getSpec());
-			rollClubOne.setCreateTime(new Date());
 			rollClubOne.setSize(rollClubCommonList.stream().findFirst().orElse(null).getSize()); //定尺
 //			rollClubOne.setBlankOutput();// 出坯量
 //			rollClubOne.setDecideWeight();// 定重
@@ -338,17 +338,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			List<RollClubOneDetails> rollClubOneDetailsList = new ArrayList<>();
 			rollClubCommonList.forEach(x ->{
 				RollClubOneDetails rollClubOneDetails = new RollClubOneDetails();
-				rollClubOneDetails.setCcmNo(x.getCcmNo());
-				rollClubOneDetails.setHeatNo(x.getHeatNo());
-				rollClubOneDetails.setBilletNo(x.getBilletNo());
-				rollClubOneDetails.setShift(x.getShift());
-				rollClubOneDetails.setShiftGroup(x.getShiftGroup());
-				rollClubOneDetails.setStartNum(x.getStartNum());
-				rollClubOneDetails.setEndNum(x.getEndNum());
-				rollClubOneDetails.setSize(x.getSize());
-				rollClubOneDetails.setSpec(x.getSpec());
-				rollClubOneDetails.setSteel(x.getSteel());
-				rollClubOneDetails.setCreateTime(new Date());
+				BeanUtils.copyProperties(x, rollClubOneDetails);
+				billetNos.add(x.getBilletNo());
 				rollClubOneDetailsList.add(rollClubOneDetails);
 			});
 			rollClubOneDetailsService.saveBatch(rollClubOneDetailsList);
@@ -357,14 +348,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		if ("roll_club_two".equals(billetHotsendDetailsVo.getBelongTable())){
 			// 保存棒一信息
 			RollClubTwo rollClubTwo = new RollClubTwo();
-			rollClubTwo.setCcmNo(billetHotsend.getCcmNo());
-			rollClubTwo.setHeatNo(billetHotsend.getHeatNo());
-			rollClubTwo.setShiftGroup(billetHotsend.getShiftGroup());
-			rollClubTwo.setShift(billetHotsend.getShift());
-			rollClubTwo.setSteel(billetHotsend.getSteel());
+			BeanUtils.copyProperties(billetHotsend, rollClubTwo);
 			rollClubTwo.setAmountTotal(rollClubCommonList.size());// 总支数
-			rollClubTwo.setSpec(billetHotsend.getSpec());
-			rollClubTwo.setCreateTime(new Date());
 			rollClubTwo.setSize(rollClubCommonList.stream().findFirst().orElse(null).getSize()); //定尺
 //			rollClubTwo.setBlankOutput();// 出坯量
 //			rollClubTwo.setDecideWeight();// 定重
@@ -373,18 +358,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			List<RollClubTwoDetails> rollClubTwoDetailsList = new ArrayList<>();
 			rollClubCommonList.forEach(x ->{
 				RollClubTwoDetails rollClubTwoDetails = new RollClubTwoDetails();
-				rollClubTwoDetails.setCcmNo(x.getCcmNo());
-				rollClubTwoDetails.setHeatNo(x.getHeatNo());
-				rollClubTwoDetails.setShift(x.getShift());
-				rollClubTwoDetails.setShiftGroup(x.getShiftGroup());
-				rollClubTwoDetails.setBilletNo(x.getBilletNo());
-				rollClubTwoDetails.setStartNum(x.getStartNum());
-				rollClubTwoDetails.setEndNum(x.getEndNum());
-				rollClubTwoDetails.setCreateTime(new Date());
-				rollClubTwoDetails.setSize(x.getSize());
-				rollClubTwoDetails.setSpec(x.getSpec());
-				rollClubTwoDetails.setSteel(x.getSteel());
-				rollClubTwoDetails.setStorageBillId(billetHotsendDetailsVo.getStorageBill().getId());
+				BeanUtils.copyProperties(x, rollClubTwoDetails);
+				rollClubTwoDetails.setStorageBillId(storageBill.getId());
 				billetNos.add(x.getBilletNo());
 				rollClubTwoDetailsList.add(rollClubTwoDetails);
 			});
@@ -394,14 +369,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		if ("roll_club_three".equals(billetHotsendDetailsVo.getBelongTable())){
 			// 保存棒三信息
 			RollClubThree rollClubThree = new RollClubThree();
-			rollClubThree.setCcmNo(billetHotsend.getCcmNo());
-			rollClubThree.setHeatNo(billetHotsend.getHeatNo());
-			rollClubThree.setShiftGroup(billetHotsend.getShiftGroup());
-			rollClubThree.setShift(billetHotsend.getShift());
-			rollClubThree.setSteel(billetHotsend.getSteel());
+			BeanUtils.copyProperties(billetHotsend, rollClubThree);
 			rollClubThree.setAmountTotal(rollClubCommonList.size());// 总支数
-			rollClubThree.setSpec(billetHotsend.getSpec());
-			rollClubThree.setCreateTime(new Date());
 			rollClubThree.setSize(rollClubCommonList.stream().findFirst().orElse(null).getSize()); //定尺
 //			rollClubThree.setBlankOutput();// 出坯量
 //			rollClubThree.setDecideWeight();// 定重
@@ -410,17 +379,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			List<RollClubThreeDetails> rollClubThreeDetailsList = new ArrayList<>();
 			rollClubCommonList.forEach(x ->{
 				RollClubThreeDetails rollClubThreeDetails = new RollClubThreeDetails();
-				rollClubThreeDetails.setCcmNo(x.getCcmNo());
-				rollClubThreeDetails.setHeatNo(x.getHeatNo());
-				rollClubThreeDetails.setShift(x.getShift());
-				rollClubThreeDetails.setShiftGroup(x.getShiftGroup());
-				rollClubThreeDetails.setBilletNo(x.getBilletNo());
-				rollClubThreeDetails.setStartNum(x.getStartNum());
-				rollClubThreeDetails.setEndNum(x.getEndNum());
-				rollClubThreeDetails.setCreateTime(new Date());
-				rollClubThreeDetails.setSpec(x.getSpec());
-				rollClubThreeDetails.setSteel(x.getSteel());
-				rollClubThreeDetails.setStorageBillId(billetHotsendDetailsVo.getStorageBill().getId());
+				BeanUtils.copyProperties(x, rollClubThreeDetails);
+				rollClubThreeDetails.setStorageBillId(storageBill.getId());
 				billetNos.add(x.getBilletNo());
 				rollClubThreeDetailsList.add(rollClubThreeDetails);
 			});
@@ -432,35 +392,17 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		 */
 		if ("roll_height".equals(billetHotsendDetailsVo.getBelongTable())){
 			RollHeight rollHeight = new RollHeight();
-			rollHeight.setCcmNo(billetHotsend.getCcmNo());
-			rollHeight.setHeatNo(billetHotsend.getHeatNo());
-			rollHeight.setShiftGroup(billetHotsend.getShiftGroup());
-			rollHeight.setShift(billetHotsend.getShift());
-			rollHeight.setSteel(billetHotsend.getSteel());
+			BeanUtils.copyProperties(billetHotsend, rollHeight);
 			rollHeight.setAmountTotal(rollClubCommonList.size());// 总支数
-			rollHeight.setSpec(billetHotsend.getSpec());
-			rollHeight.setCreateTime(new Date());
 			rollHeight.setSize(rollClubCommonList.stream().findFirst().orElse(null).getSize()); //定尺
 //			rollClubThree.setBlankOutput();// 出坯量
 //			rollClubThree.setDecideWeight();// 定重
 			rollHeightService.save(rollHeight);
 			// 保存高线明细信息
 			List<RollHeightDetails> rollHeightDetailsList = new ArrayList<>();
-
 			rollClubCommonList.forEach(x ->{
 				RollHeightDetails rollHeightDetails = new RollHeightDetails();
-				rollHeightDetails.setCcmNo(x.getCcmNo());
-				rollHeightDetails.setHeatNo(x.getHeatNo());
-				rollHeightDetails.setShift(x.getShift());
-				rollHeightDetails.setShiftGroup(x.getShiftGroup());
-				rollHeightDetails.setBilletNo(x.getBilletNo());
-				rollHeightDetails.setStartNum(x.getStartNum());
-				rollHeightDetails.setEndNum(x.getEndNum());
-				rollHeightDetails.setCreateTime(new Date());
-				rollHeightDetails.setSpec(x.getSpec());
-				rollHeightDetails.setSteel(x.getSteel());
-				rollHeightDetails.setSpec(x.getSpec());
-				rollHeightDetails.setSteel(x.getSteel());
+				BeanUtils.copyProperties(x, rollHeightDetails);
 				billetNos.add(x.getBilletNo());
 				rollHeightDetailsList.add(rollHeightDetails);
 			});
@@ -472,34 +414,18 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		 */
 		if ("roll_out_shipp".equals(billetHotsendDetailsVo.getBelongTable())){
 			RollOutShipp rollOutShipp = new RollOutShipp();
-			rollOutShipp.setCcmNo(billetHotsend.getCcmNo());
-			rollOutShipp.setHeatNo(billetHotsend.getHeatNo());
-			rollOutShipp.setShiftGroup(billetHotsend.getShiftGroup());
-			rollOutShipp.setShift(billetHotsend.getShift());
-			rollOutShipp.setSteel(billetHotsend.getSteel());
+			BeanUtils.copyProperties(billetHotsend, rollOutShipp);
 			rollOutShipp.setAmountTotal(rollClubCommonList.size());// 总支数
 			rollOutShipp.setSize(rollClubCommonList.stream().findFirst().orElse(null).getSize()); //定尺
 //			rollOutShipp.setBlankOutput();// 出坯量
 //			rollOutShipp.setDecideWeight();// 定重
-			rollOutShipp.setSpec(billetHotsend.getSpec());
-			rollOutShipp.setCreateTime(new Date());
 			rollOutShippService.save(rollOutShipp);
-			// 保存高线明细信息
+			// 保存上若明细信息
 			List<RollOutShippDetails> rollOutShippDetailsList = new ArrayList<>();
 			rollClubCommonList.forEach(x ->{
 				RollOutShippDetails rollOutShippDetails = new RollOutShippDetails();
-				rollOutShippDetails.setCcmNo(x.getCcmNo());
-				rollOutShippDetails.setHeatNo(x.getHeatNo());
-				rollOutShippDetails.setShift(x.getShift());
-				rollOutShippDetails.setShiftGroup(x.getShiftGroup());
-				rollOutShippDetails.setBilletNo(x.getBilletNo());
-				rollOutShippDetails.setStartNum(x.getStartNum());
-				rollOutShippDetails.setEndNum(x.getEndNum());
-				rollOutShippDetails.setCreateTime(new Date());
-				rollOutShippDetails.setSteel(x.getSteel());
-				rollOutShippDetails.setSpec(x.getSpec());
-				rollOutShippDetails.setSteel(x.getSteel());
-				rollOutShippDetails.setStorageBillId(billetHotsendDetailsVo.getStorageBill().getId());
+				BeanUtils.copyProperties(x, rollOutShippDetails);
+				rollOutShippDetails.setStorageBillId(storageBill.getId());
 				billetNos.add(x.getBilletNo());
 				rollOutShippDetailsList.add(rollOutShippDetails);
 			});
@@ -527,14 +453,66 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		});
 		billetBasicInfoService.saveOrUpdateBatch(billetBasicInfoList);
 		// 更新装运单 车次总序号、本车车次
-		if (billetHotsendDetailsVo.getStorageBill() != null){
-			StorageBill storageBill = billetHotsendDetailsVo.getStorageBill();
+		if (!billetHotsend.getIsUpd() && oConvertUtils.isNotEmpty(storageBill)){
 			storageBill.setCarAllNum(oConvertUtils.isEmpty(storageBill.getCarAllNum()) ? "1" : String.valueOf(Integer.valueOf(storageBill.getCarAllNum())+1));// 车次总序号
 			storageBill.setCarNum(storageBill.getCarNum() + 1);// 本车车次
-			storageBill.setUpdateTime(new Date());
 			storageBillService.updateById(storageBill);
+			// 生成储运单
+			StorageCarLog storageCarLog = new StorageCarLog();
+			BeanUtils.copyProperties(storageBill, storageCarLog);
+			List<String> sizeList = new ArrayList<>();
+			List<String> heatNoList = new ArrayList<>();
+			long count = 0l;
+			//根据铸机号、钢坯转运单ID查询定尺信息
+			if ("roll_club_two".equals(billetHotsendDetailsVo.getBelongTable())){
+				LambdaQueryWrapper<RollClubTwoDetails> queryWrapperRC = new LambdaQueryWrapper();
+				queryWrapperRC.eq(RollClubTwoDetails::getCcmNo, storageBill.getCcmNo()).eq(RollClubTwoDetails::getStorageBillId, storageBill.getId());
+				List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(queryWrapperRC);
+				sizeList = rollClubTwoDetailsList.stream().map(RollClubTwoDetails::getSize).distinct()
+						.collect(Collectors.toList());
+				heatNoList = rollClubTwoDetailsList.stream().map(RollClubTwoDetails::getHeatNo).distinct()
+						.collect(Collectors.toList());
+				if (oConvertUtils.listIsNotEmpty(rollClubTwoDetailsList)){
+					count = rollClubTwoDetailsList.stream().count();
+				}
+			}
+			if ("roll_club_three".equals(billetHotsendDetailsVo.getBelongTable())){
+				LambdaQueryWrapper<RollClubThreeDetails> queryWrapperCT = new LambdaQueryWrapper();
+				queryWrapperCT.eq(RollClubThreeDetails::getCcmNo, storageBill.getCcmNo()).eq(RollClubThreeDetails::getStorageBillId, storageBill.getId());
+				List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(queryWrapperCT);
+				sizeList = rollClubThreeDetailsList.stream().map(RollClubThreeDetails::getSize).distinct()
+						.collect(Collectors.toList());
+				heatNoList = rollClubThreeDetailsList.stream().map(RollClubThreeDetails::getHeatNo).distinct()
+						.collect(Collectors.toList());
+				if (oConvertUtils.listIsNotEmpty(rollClubThreeDetailsList)){
+					count = rollClubThreeDetailsList.stream().count();
+				}
+			}
+			if ("roll_out_shipp".equals(billetHotsendDetailsVo.getBelongTable())){
+				LambdaQueryWrapper<RollOutShippDetails> queryWrapperROS = new LambdaQueryWrapper();
+				queryWrapperROS.eq(RollOutShippDetails::getCcmNo, storageBill.getCcmNo()).eq(RollOutShippDetails::getStorageBillId, storageBill.getId());
+				List<RollOutShippDetails> rollOutShippDetailsList = rollOutShippDetailsService.list(queryWrapperROS);
+				sizeList = rollOutShippDetailsList.stream().map(RollOutShippDetails::getSize).distinct()
+						.collect(Collectors.toList());
+				heatNoList = rollOutShippDetailsList.stream().map(RollOutShippDetails::getHeatNo).distinct()
+						.collect(Collectors.toList());
+				if (oConvertUtils.listIsNotEmpty(rollOutShippDetailsList)){
+					count = rollOutShippDetailsList.stream().count();
+				}
+			}
+			// 根据billetHotsendTypeConfigId 查询基础垛位信息
+			BilletHotsendTypeConfig billetHotsendTypeConfig = billetHotsendTypeConfigService.getById(billetHotsendDetailsVo.getBilletHotsendTypeConfigId());
+			storageCarLog.setDestination(billetHotsendTypeConfig.getTypeName());// 目的地
+			storageCarLog.setCarNm(storageCarLog.getCarNm());// 车号
+//			storageCarLog.setFixedWeight();// 定重
+			storageCarLog.setOutCarNum(storageCarLog.getOutCarNum()); // 出车号
+			storageCarLog.setTypeConfigId(billetHotsendDetailsVo.getBilletHotsendTypeConfigId()); // 钢坯配置类型ID
+			storageCarLog.setHeatNo(String.join(",", heatNoList));
+			storageCarLog.setSize(String.join(",", sizeList));// 定尺
+			storageCarLog.setAmount(String.valueOf(count));// 支数
+			storageCarLog.setDataTime(new Date());
+			storageCarLogService.save(storageCarLog);
 		}
-
 	}
 
 	@Override

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

@@ -1,8 +1,11 @@
 package org.jeecg.modules.billet.stackingAndLoadingVehicles.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletBasicInfo;
+import org.jeecg.modules.actualControl.billetActual.billetActual.service.IBilletBasicInfoService;
 import org.jeecg.modules.billet.billetHotsend.entity.BilletHotsend;
 import org.jeecg.modules.billet.billetHotsend.entity.RulerDefaultConfig;
 import org.jeecg.modules.billet.billetHotsend.mapper.RulerDefaultConfigMapper;
@@ -11,14 +14,26 @@ import org.jeecg.modules.billet.billetHotsend.service.IRulerDefaultConfigService
 import org.jeecg.modules.billet.billetHotsendConfig.entity.BilletHotsendTypeConfig;
 import org.jeecg.modules.billet.billetHotsendConfig.service.IBilletHotsendTypeConfigService;
 import org.jeecg.modules.billet.rollClubOne.service.IRollClubOneService;
+import org.jeecg.modules.billet.rollClubThree.entity.RollClubThree;
+import org.jeecg.modules.billet.rollClubThree.entity.RollClubThreeDetails;
+import org.jeecg.modules.billet.rollClubThree.service.IRollClubThreeDetailsService;
 import org.jeecg.modules.billet.rollClubThree.service.IRollClubThreeService;
+import org.jeecg.modules.billet.rollClubTwo.entity.RollClubTwo;
+import org.jeecg.modules.billet.rollClubTwo.entity.RollClubTwoDetails;
+import org.jeecg.modules.billet.rollClubTwo.service.IRollClubTwoDetailsService;
 import org.jeecg.modules.billet.rollClubTwo.service.IRollClubTwoService;
+import org.jeecg.modules.billet.rollHeight.service.IRollHeightDetailsService;
 import org.jeecg.modules.billet.rollHeight.service.IRollHeightService;
+import org.jeecg.modules.billet.rollOutShipp.entity.RollOutShipp;
+import org.jeecg.modules.billet.rollOutShipp.entity.RollOutShippDetails;
+import org.jeecg.modules.billet.rollOutShipp.service.IRollOutShippDetailsService;
 import org.jeecg.modules.billet.rollOutShipp.service.IRollOutShippService;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.entity.StackingAndLoadingVehicles;
+import org.jeecg.modules.billet.stackingAndLoadingVehicles.entity.StackingDownLog;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.entity.StackingUpLog;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.mapper.StackingAndLoadingVehiclesMapper;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.service.IStackingAndLoadingVehiclesService;
+import org.jeecg.modules.billet.stackingAndLoadingVehicles.service.IStackingDownLogService;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.service.IStackingUpLogService;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.vo.LoadingParams;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.vo.SavVo;
@@ -26,6 +41,8 @@ import org.jeecg.modules.billet.storageBill.entity.StorageBill;
 import org.jeecg.modules.billet.storageBill.entity.StorageBillModel;
 import org.jeecg.modules.billet.storageBill.service.IStorageBillModelService;
 import org.jeecg.modules.billet.storageBill.service.IStorageBillService;
+import org.jeecg.modules.billet.storageCarLog.entity.StorageCarLog;
+import org.jeecg.modules.billet.storageCarLog.service.IStorageCarLogService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +50,7 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 垛位装车
@@ -67,6 +85,20 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
     private IBilletHotsendTypeConfigService billetHotsendTypeConfigService;
     @Autowired
     private IStackingUpLogService stackingUpLogService;
+    @Autowired
+    private IStackingDownLogService stackingDownLogService;
+    @Autowired
+    private IRollClubTwoDetailsService rollClubTwoDetailsService;
+    @Autowired
+    private IRollClubThreeDetailsService rollClubThreeDetailsService;
+    @Autowired
+    private IRollHeightDetailsService rollHeightDetailsService;
+    @Autowired
+    private IRollOutShippDetailsService rollOutShippDetailsService;
+    @Autowired
+    private IBilletBasicInfoService billetBasicInfoService;
+    @Autowired
+    private IStorageCarLogService storageCarLogService;
 
     @Override
     public List<List<StackingAndLoadingVehicles>> getListBySatck(String typeConfigId) {
@@ -445,24 +477,205 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
 
     @Override
     public void loadingHandle(LoadingParams loadingParams) {
-        // 1 根据billetHotsendTypeConfigId 查询基础垛位信息
-
+        List<StackingAndLoadingVehicles> stackingAndLoadingVehiclesListParam = loadingParams.getStackingAndLoadingVehiclesList();
+        StorageBill storageBill = loadingParams.getStorageBill();
         // 2 先移除 堆垛公共容器中的记录 stacking_and_loading_vehicles
-
+        List<String> ids = stackingAndLoadingVehiclesListParam.stream().map(StackingAndLoadingVehicles::getId).collect(Collectors.toList());
+        List<StackingAndLoadingVehicles> stackingAndLoadingVehiclesList = baseMapper.selectBatchIds(ids);
+        if (oConvertUtils.listIsEmpty(stackingAndLoadingVehiclesList)){
+            return;
+        }
+        baseMapper.deleteBatchIds(stackingAndLoadingVehiclesList.stream().map(StackingAndLoadingVehicles::getId).collect(Collectors.toList()));
         // 3 保存 下垛日志    stacking_down_log
-
+        List<StackingDownLog> stackingDownLogList = new ArrayList<>();
+        stackingAndLoadingVehiclesListParam.forEach(x ->{
+            StackingDownLog stackingDownLog = new StackingDownLog();
+            BeanUtils.copyProperties(x, stackingDownLog);
+            stackingDownLog.setBilletNo(x.getBilletNos());
+            if (storageBill != null){
+                stackingDownLog.setStorageBillId(storageBill.getId());// 装运单ID
+            }
+            stackingDownLog.setStackStorey(x.getLayer());// 堆垛层号(1-20)
+            stackingDownLog.setStackNum(x.getAddress());// 堆垛编号(1-9)
+            stackingDownLogList.add(stackingDownLog);
+        });
+        stackingDownLogService.saveBatch(stackingDownLogList);
         // 4 保存或更新 钢坯热送基础信息 billet_hotsend
-
+        BilletHotsend billetHotsend = new BilletHotsend();
+        BeanUtils.copyProperties(loadingParams.getBilletHotsend(), billetHotsend);
+        billetHotsend.setCreateDate(new Date());
+        billetHotsend.setAmountTotal(stackingAndLoadingVehiclesListParam.size());// 总支数
+        if (billetHotsend.getIsUpd()){
+            billetHotsendBaseService.save(billetHotsend);
+        }else {
+            LambdaUpdateWrapper<BilletHotsend> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(BilletHotsend::getCcmNo, billetHotsend.getCcmNo()).eq(BilletHotsend::getHeatNo, billetHotsend.getHeatNo());
+            billetHotsendBaseService.update(billetHotsend,  updateWrapper);
+        }
+        List<String> billetNos = new ArrayList<>();
         // 5 根据所属表 保存对应的棒线和对象信息，明细信息 roll_club_two、roll_club_two_details、roll_club_three、roll_club_three_details、roll_out_shipp、roll_out_shipp_details
+        if ("roll_club_two".equals(loadingParams.getBelongTable())){
+            // 保存棒一信息
+            RollClubTwo rollClubTwo = new RollClubTwo();
+            BeanUtils.copyProperties(billetHotsend, rollClubTwo);
+            rollClubTwo.setAmountTotal(stackingAndLoadingVehiclesListParam.size());// 总支数
+            rollClubTwo.setSize(stackingAndLoadingVehiclesListParam.stream().findFirst().orElse(null).getSize()); //定尺
+//			rollClubTwo.setBlankOutput();// 出坯量
+//			rollClubTwo.setDecideWeight();// 定重
+            rollClubTwoService.save(rollClubTwo);
+            // 保存棒二明细信息
+            List<RollClubTwoDetails> rollClubTwoDetailsList = new ArrayList<>();
+            stackingAndLoadingVehiclesListParam.forEach(x ->{
+                RollClubTwoDetails rollClubTwoDetails = new RollClubTwoDetails();
+                BeanUtils.copyProperties(x, rollClubTwoDetails);
+                rollClubTwoDetails.setBilletNo(x.getBilletNos());// 坯号
+                rollClubTwoDetails.setStackStorey(x.getLayer()); // 堆垛层号(1-20)
+                rollClubTwoDetails.setStackNum(x.getAddress());// 堆垛编号(1-9)
+                rollClubTwoDetails.setStorageBillId(storageBill.getId()); // 装运单ID
+//                rollClubTwoDetails.setStartNum() // 起始根数
+//                rollClubTwoDetails.setEndNumStack(); // 堆垛结束跟
+                billetNos.add(x.getBilletNos());
+                rollClubTwoDetailsList.add(rollClubTwoDetails);
+            });
+            rollClubTwoDetailsService.saveBatch(rollClubTwoDetailsList);
+        }
 
-        // 6 更新装运单 storage_bill 《保存：不操作装运单》
-
-        // 7 发车后，新增钢坯堆垛储运信息 storage_car_log
-
-        // 8 更新钢坯基础信息 billet_basic_info
-
-
-
+        if ("roll_club_three".equals(loadingParams.getBelongTable())){
+            // 保存棒三信息
+            RollClubThree rollClubThree = new RollClubThree();
+            BeanUtils.copyProperties(billetHotsend, rollClubThree);
+            rollClubThree.setAmountTotal(stackingAndLoadingVehiclesListParam.size());// 总支数
+            rollClubThree.setSize(stackingAndLoadingVehiclesListParam.stream().findFirst().orElse(null).getSize()); //定尺
+//			rollClubThree.setBlankOutput();// 出坯量
+//			rollClubThree.setDecideWeight();// 定重
+            rollClubThreeService.save(rollClubThree);
+            // 保存棒三明细信息
+            List<RollClubThreeDetails> rollClubThreeDetailsList = new ArrayList<>();
+            stackingAndLoadingVehiclesListParam.forEach(x ->{
+                RollClubThreeDetails rollClubThreeDetails = new RollClubThreeDetails();
+                BeanUtils.copyProperties(x, rollClubThreeDetails);
+                rollClubThreeDetails.setBilletNo(x.getBilletNos());// 坯号
+                rollClubThreeDetails.setStackStorey(x.getLayer()); // 堆垛层号(1-20)
+                rollClubThreeDetails.setStackNum(x.getAddress());// 堆垛编号(1-9)
+                rollClubThreeDetails.setStorageBillId(storageBill.getId()); // 装运单ID
+//                rollClubThreeDetails.setStartNum() // 起始根数
+//                rollClubThreeDetails.setEndNumStack(); // 堆垛结束跟
+                billetNos.add(x.getBilletNos());
+                rollClubThreeDetailsList.add(rollClubThreeDetails);
+            });
+            rollClubThreeDetailsService.saveBatch(rollClubThreeDetailsList);
+        }
+        /**
+         * 保存上若信息
+         */
+        if ("roll_out_shipp".equals(loadingParams.getBelongTable())){
+            RollOutShipp rollOutShipp = new RollOutShipp();
+            BeanUtils.copyProperties(billetHotsend, rollOutShipp);
+            rollOutShipp.setAmountTotal(stackingAndLoadingVehiclesListParam.size());// 总支数
+            rollOutShipp.setSize(stackingAndLoadingVehiclesListParam.stream().findFirst().orElse(null).getSize()); //定尺
+//			rollOutShipp.setBlankOutput();// 出坯量
+//			rollOutShipp.setDecideWeight();// 定重
+            rollOutShippService.save(rollOutShipp);
+            // 保存高线明细信息
+            List<RollOutShippDetails> rollOutShippDetailsList = new ArrayList<>();
+            stackingAndLoadingVehiclesListParam.forEach(x ->{
+                RollOutShippDetails rollOutShippDetails = new RollOutShippDetails();
+                BeanUtils.copyProperties(x, rollOutShippDetails);
+                rollOutShippDetails.setBilletNo(x.getBilletNos());// 坯号
+                rollOutShippDetails.setStackStorey(x.getLayer()); // 堆垛层号(1-20)
+                rollOutShippDetails.setStackNum(x.getAddress());// 堆垛编号(1-9)
+                rollOutShippDetails.setStorageBillId(storageBill.getId()); // 装运单ID
+                billetNos.add(x.getBilletNos());
+                rollOutShippDetailsList.add(rollOutShippDetails);
+            });
+            rollOutShippDetailsService.saveBatch(rollOutShippDetailsList);
+        }
+        //查询并批量更新钢坯基础信息 belongTable
+        LambdaQueryWrapper<BilletBasicInfo> queryWrapper = new LambdaQueryWrapper<BilletBasicInfo>()
+                .eq(BilletBasicInfo::getCcmNo, Integer.valueOf(billetHotsend.getCcmNo()))
+                .eq(BilletBasicInfo::getHeatNo, billetHotsend.getHeatNo())
+                .in(BilletBasicInfo::getBilletNo, billetNos);
+        List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(queryWrapper);
+        billetBasicInfoList.forEach(x ->{
+            if ("roll_club_one".equals(loadingParams.getBelongTable())){
+                x.setBelongTable("roll_club_one");
+            }else if ("roll_club_two".equals(loadingParams.getBelongTable())){
+                x.setBelongTable("roll_club_two");
+            }else if ("roll_club_three".equals(loadingParams.getBelongTable())){
+                x.setBelongTable("roll_club_three");
+            }else if ("roll_height".equals(loadingParams.getBelongTable())){
+                x.setBelongTable("roll_height");
+            }else if ("roll_out_shipp".equals(loadingParams.getBelongTable())){
+                x.setBelongTable("roll_out_shipp");
+            }
+            x.setUpdateTime(new Date());
+        });
+        billetBasicInfoService.saveOrUpdateBatch(billetBasicInfoList);
+        /**
+         * IsUpd为false代表页面保存
+         */
+        if (!billetHotsend.getIsUpd() && oConvertUtils.isNotEmpty(storageBill)){
+            // 6 更新装运单 storage_bill 《IsUpd为false代表页面保存：不操作装运单和储运车信息》
+            storageBill.setCarAllNum(oConvertUtils.isEmpty(storageBill.getCarAllNum()) ? "1" : String.valueOf(Integer.valueOf(storageBill.getCarAllNum())+1));// 车次总序号
+            storageBill.setCarNum(storageBill.getCarNum() + 1);// 本车车次
+            storageBill.setUpdateTime(new Date());
+            storageBillService.updateById(storageBill);
+            // 7 发车后，新增钢坯堆垛储运信息,生成储运单 storage_car_log
+            StorageCarLog storageCarLog = new StorageCarLog();
+            BeanUtils.copyProperties(storageBill, storageCarLog);
+            List<String> sizeList = new ArrayList<>();
+            List<String> heatNoList = new ArrayList<>();
+            long count = 0l;
+            //根据铸机号、钢坯转运单ID查询定尺信息
+            if ("roll_club_two".equals(loadingParams.getBelongTable())){
+                LambdaQueryWrapper<RollClubTwoDetails> queryWrapperRCT = new LambdaQueryWrapper();
+                queryWrapperRCT.eq(RollClubTwoDetails::getCcmNo, storageBill.getCcmNo()).eq(RollClubTwoDetails::getStorageBillId, storageBill.getId());
+                List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(queryWrapperRCT);
+                sizeList = rollClubTwoDetailsList.stream().map(RollClubTwoDetails::getSize).distinct()
+                        .collect(Collectors.toList());
+                heatNoList = rollClubTwoDetailsList.stream().map(RollClubTwoDetails::getHeatNo).distinct()
+                        .collect(Collectors.toList());
+                if (oConvertUtils.listIsNotEmpty(rollClubTwoDetailsList)){
+                    count = rollClubTwoDetailsList.stream().count();
+                }
+            }
+            if ("roll_club_three".equals(loadingParams.getBelongTable())){
+                LambdaQueryWrapper<RollClubThreeDetails> queryWrapperCTS = new LambdaQueryWrapper();
+                queryWrapperCTS.eq(RollClubThreeDetails::getCcmNo, storageBill.getCcmNo()).eq(RollClubThreeDetails::getStorageBillId, storageBill.getId());
+                List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(queryWrapperCTS);
+                sizeList = rollClubThreeDetailsList.stream().map(RollClubThreeDetails::getSize).distinct()
+                        .collect(Collectors.toList());
+                heatNoList = rollClubThreeDetailsList.stream().map(RollClubThreeDetails::getHeatNo).distinct()
+                        .collect(Collectors.toList());
+                if (oConvertUtils.listIsNotEmpty(rollClubThreeDetailsList)){
+                    count = rollClubThreeDetailsList.stream().count();
+                }
+            }
+            if ("roll_out_shipp".equals(loadingParams.getBelongTable())){
+                LambdaQueryWrapper<RollOutShippDetails> queryWrapperROS = new LambdaQueryWrapper();
+                queryWrapperROS.eq(RollOutShippDetails::getCcmNo, storageBill.getCcmNo()).eq(RollOutShippDetails::getStorageBillId, storageBill.getId());
+                List<RollOutShippDetails> rollOutShippDetailsList = rollOutShippDetailsService.list(queryWrapperROS);
+                sizeList = rollOutShippDetailsList.stream().map(RollOutShippDetails::getSize).distinct()
+                        .collect(Collectors.toList());
+                heatNoList = rollOutShippDetailsList.stream().map(RollOutShippDetails::getHeatNo).distinct()
+                        .collect(Collectors.toList());
+                if (oConvertUtils.listIsNotEmpty(rollOutShippDetailsList)){
+                    count = rollOutShippDetailsList.stream().count();
+                }
+            }
+            // 根据billetHotsendTypeConfigId 查询基础垛位信息
+            BilletHotsendTypeConfig billetHotsendTypeConfig = billetHotsendTypeConfigService.getById(loadingParams.getBilletHotsendTypeConfigId());
+            storageCarLog.setDestination(billetHotsendTypeConfig.getTypeName());// 目的地
+            storageCarLog.setCarNm(storageCarLog.getCarNm());// 车号
+//			storageCarLog.setFixedWeight();// 定重
+            storageCarLog.setOutCarNum(storageCarLog.getOutCarNum()); // 出车号
+            storageCarLog.setTypeConfigId(billetHotsendTypeConfig.getId()); // 钢坯配置类型ID
+            storageCarLog.setHeatNo(String.join(",", heatNoList));
+            storageCarLog.setSize(String.join(",", sizeList));// 定尺
+            storageCarLog.setAmount(String.valueOf(count));// 支数
+            storageCarLog.setDataTime(new Date());
+            storageCarLogService.save(storageCarLog);
+        }
     }
 
     public void addStorageBill(List<StackingAndLoadingVehicles> savs,String castMachine,String carNum,String destination){

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/stackingAndLoadingVehicles/vo/LoadingParams.java

@@ -10,10 +10,15 @@ import java.util.List;
 @Data
 public class LoadingParams {
     /**
-     * 已选择的钢坯基础，
+     * 已选择的 拼接好的钢坯基础信息 4个钢坯号为1组数据
      */
     private List<StackingAndLoadingVehicles> stackingAndLoadingVehiclesList;
 
+    /**
+     * 已选择的 拆分为四个的所有钢坯号集合
+     */
+    private List<String> billetNos;
+
     /**
      * 钢坯热送基础信息
      */

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

@@ -12,7 +12,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.billet.billetHotsend.entity.BilletHotsendDetailsVo;
 import org.jeecg.modules.billet.operateLog.service.IOperateLogService;
 import org.jeecg.modules.billet.storageBill.entity.StorageBill;
@@ -226,9 +225,6 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 		 LambdaQueryWrapper<StorageBill> queryWrapper = new LambdaQueryWrapper<>();
 		 queryWrapper.eq(StorageBill::getCcmNo, ccmNo).isNotNull(StorageBill::getArrivalTime).isNull(StorageBill::getOutTime);
 		 List<StorageBill> storageBillList = storageBillService.list(queryWrapper);
-		 if (oConvertUtils.listIsEmpty(storageBillList)) {
-			 return Result.OK("未找到对应数据");
-		 }
 		 return Result.OK(storageBillList);
 	 }
 

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

@@ -10,23 +10,17 @@ import org.jeecg.modules.billet.billetHotsend.entity.BilletHotsendDetailsVo;
 import org.jeecg.modules.billet.billetHotsend.entity.RollClubCommon;
 import org.jeecg.modules.billet.billetHotsendConfig.entity.BilletHotsendTypeConfig;
 import org.jeecg.modules.billet.billetHotsendConfig.service.IBilletHotsendTypeConfigService;
-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.rollOutShipp.entity.RollOutShippDetails;
 import org.jeecg.modules.billet.rollOutShipp.service.IRollOutShippDetailsService;
 import org.jeecg.modules.billet.storageBill.entity.GetStatsResponse;
 import org.jeecg.modules.billet.storageBill.entity.StorageBill;
 import org.jeecg.modules.billet.storageBill.mapper.StorageBillMapper;
 import org.jeecg.modules.billet.storageBill.service.IStorageBillService;
-import org.jeecg.modules.billet.storageCarLog.entity.StorageCarLog;
 import org.jeecg.modules.billet.storageCarLog.service.IStorageCarLogService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -89,55 +83,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
         storageBill.setUpdateTime(new Date());
         storageBill.setTypeConfigId(billetHotsendTypeConfig.getId());
         storageBillMapper.updateById(storageBill);
-        // 生成储运单
-        StorageCarLog storageCarLog = new StorageCarLog();
-        BeanUtils.copyProperties(storageBill, storageCarLog);
-        List<String> sizeList = new ArrayList<>();
-        List<String> heatNoList = new ArrayList<>();
-        long count = 0l;
-        //根据铸机号、钢坯转运单ID查询定尺信息
-        if ("roll_club_two".equals(billetHotsendDetailsVo.getBelongTable())){
-            LambdaQueryWrapper<RollClubTwoDetails> queryWrapper = new LambdaQueryWrapper();
-            queryWrapper.eq(RollClubTwoDetails::getCcmNo, storageBill.getCcmNo()).eq(RollClubTwoDetails::getStorageBillId, storageBill.getId());
-            List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(queryWrapper);
-            sizeList = rollClubTwoDetailsList.stream().map(RollClubTwoDetails::getSize).distinct()
-                    .collect(Collectors.toList());
-            heatNoList = rollClubTwoDetailsList.stream().map(RollClubTwoDetails::getHeatNo).distinct()
-                    .collect(Collectors.toList());
-            if (oConvertUtils.listIsNotEmpty(rollClubTwoDetailsList)){
-                count = rollClubTwoDetailsList.stream().count();
-            }
-        }
-        if ("roll_club_three".equals(billetHotsendDetailsVo.getBelongTable())){
-            LambdaQueryWrapper<RollClubThreeDetails> queryWrapper = new LambdaQueryWrapper();
-            queryWrapper.eq(RollClubThreeDetails::getCcmNo, storageBill.getCcmNo()).eq(RollClubThreeDetails::getStorageBillId, storageBill.getId());
-            List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(queryWrapper);
-            sizeList = rollClubThreeDetailsList.stream().map(RollClubThreeDetails::getSize).distinct()
-                    .collect(Collectors.toList());
-            heatNoList = rollClubThreeDetailsList.stream().map(RollClubThreeDetails::getHeatNo).distinct()
-                    .collect(Collectors.toList());
-            if (oConvertUtils.listIsNotEmpty(rollClubThreeDetailsList)){
-                count = rollClubThreeDetailsList.stream().count();
-            }
-        }
-        if ("roll_out_shipp".equals(billetHotsendDetailsVo.getBelongTable())){
-            LambdaQueryWrapper<RollOutShippDetails> queryWrapper = new LambdaQueryWrapper();
-            queryWrapper.eq(RollOutShippDetails::getCcmNo, storageBill.getCcmNo()).eq(RollOutShippDetails::getStorageBillId, storageBill.getId());
-            List<RollOutShippDetails> rollOutShippDetailsList = rollOutShippDetailsService.list(queryWrapper);
-            sizeList = rollOutShippDetailsList.stream().map(RollOutShippDetails::getSize).distinct()
-                    .collect(Collectors.toList());
-            heatNoList = rollOutShippDetailsList.stream().map(RollOutShippDetails::getHeatNo).distinct()
-                    .collect(Collectors.toList());
-            if (oConvertUtils.listIsNotEmpty(rollOutShippDetailsList)){
-                count = rollOutShippDetailsList.stream().count();
-            }
-        }
-        storageCarLog.setHeatNo(String.join(",", heatNoList));
-        storageCarLog.setSize(String.join(",", sizeList));// 定尺
-        storageCarLog.setAmount(String.valueOf(count));// 支数
-        storageCarLog.setCreateTime(new Date());
-        storageCarLog.setDataTime(new Date());
-        storageCarLogService.save(storageCarLog);
+
         //查询并批量更新钢坯基础信息 belongTable
         List<RollClubCommon> rollClubCommonLists = billetHotsendDetailsVo.getRollClubCommonList();
         if (oConvertUtils.listIsEmpty(rollClubCommonLists)){