棒1高线新增装运单和明细

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/controller/BilletHotsendBaseController.java

@@ -100,9 +100,9 @@ public class BilletHotsendBaseController extends JeecgController<BilletHotsend,
     public Result<?> add(@RequestBody BilletHotsendDetailsVo billetHotsendDetailsVo) {
         JSONObject jsonObject = billetHotsendBaseService.saveBilletHotsendDetails(billetHotsendDetailsVo);
         if (jsonObject.containsKey("fail")){
-            return Result.OK("该炉次信息已存在！");
+            return Result.OK((String) jsonObject.get("fail"));
         }
-        return Result.OK("棒线新增成功!");
+        return Result.OK((String) jsonObject.get("success"));
     }
 
     @AutoLog(value = "新增钢坯热送基础信息")

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

@@ -44,6 +44,8 @@ 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.storageBill.entity.ShiftEnum;
+import org.jeecg.modules.billet.storageBill.entity.ShiftGroupEnum;
 import org.jeecg.modules.billet.storageBill.entity.StorageBill;
 import org.jeecg.modules.billet.storageBill.entity.StorageBillModel;
 import org.jeecg.modules.billet.storageBill.service.IStorageBillModelService;
@@ -347,7 +349,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				.eq(BilletHotsend::getShiftGroup, cacheShintGroup);
 		BilletHotsend check = baseMapper.selectOne(queryWrapper);
 		if (oConvertUtils.isNotEmpty(check) && oConvertUtils.listIsEmpty(rollClubCommonList)){
-			result.put("fail", "该炉次信息已存在！");
+			result.put("fail", "钢坯热送信息已存在，未选择钢坯信息，保存失败！");
 			return result;
 		}
 		billetHotsend.setShiftGroup(cacheShintGroup);
@@ -412,6 +414,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		}
 		List<String> billetNos = new ArrayList<>();
 		StorageBill storageBill = billetHotsendDetailsVo.getStorageBill();
+
+		String rollClubOneOrHeightStorageBillId = String.valueOf(IdWorker.getId());
 		// 保存 钢坯热送单炉支数传递单明细
 		if ("roll_club_one".equals(billetHotsendDetailsVo.getBelongTable())){
 			// 保存棒一信息
@@ -445,6 +449,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollClubOneDetails.setId(String.valueOf(IdWorker.getId()));
 				rollClubOneDetails.setShift(billetHotsend.getShift());
 				rollClubOneDetails.setShiftGroup(billetHotsend.getShiftGroup());
+				rollClubOneDetails.setStorageBillId(rollClubOneOrHeightStorageBillId);
+				rollClubOneDetails.setLicensePlate("辊道");
 				rollClubOneDetails.setSize(String.valueOf(x.getLength()));
 				rollClubOneDetails.setSteel(x.getGrade());
 				rollClubOneDetails.setCreateTime(new Date());
@@ -582,6 +588,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 				rollHeightDetails.setId(String.valueOf(IdWorker.getId()));
 				rollHeightDetails.setShift(billetHotsend.getShift());
 				rollHeightDetails.setShiftGroup(billetHotsend.getShiftGroup());
+				rollHeightDetails.setStorageBillId(rollClubOneOrHeightStorageBillId);
+				rollHeightDetails.setLicensePlate("辊道");
 				rollHeightDetails.setSize(String.valueOf(x.getLength()));
 				rollHeightDetails.setSteel(x.getGrade());
 				rollHeightDetails.setCreateTime(new Date());
@@ -663,7 +671,19 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		});
 		billetBasicInfoService.saveOrUpdateBatch(billetBasicInfoList);
 		if (oConvertUtils.isEmpty(billetHotsendDetailsVo.getStorageBill()) || billetHotsendDetailsVo.getStorageBill() == null){
-			result.put("success", "新增高线成功！");
+			if ("roll_height".equals(billetHotsendDetailsVo.getBelongTable()) || "roll_club_one".equals(billetHotsendDetailsVo.getBelongTable())){
+				List<String> heatNoList = rollClubCommonList.stream().map(RollClubCommon::getHeatNo).distinct().collect(Collectors.toList());
+				List<Integer> sizeList = rollClubCommonList.stream().map(RollClubCommon::getLength).distinct().collect(Collectors.toList());
+				List<String> sizeLists = sizeList.stream().map(String::valueOf).collect(Collectors.toList());
+				// 生成钢坯装运单记录
+				StorageBill storageBillInfo = createStorageBill(billetHotsendDetailsVo, rollClubCommonList, sizeLists);
+				storageBillInfo.setId(rollClubOneOrHeightStorageBillId);
+				storageBillService.save(storageBillInfo);
+				// 生成钢坯储运单记录
+				StorageCarLog storageCarLog = createStorageCarLog(billetHotsendDetailsVo, storageBillInfo, rollClubCommonList, heatNoList, sizeLists);
+				storageCarLogService.save(storageCarLog);
+				result.put("success", "6".equals(billetHotsendDetailsVo.getBilletHotsend().getCcmNo())? "保存高线成功！" : "保存棒一成功！");
+			}
 			return result;
 		}
 		// 更新装运单 车次总序号、本车车次
@@ -678,10 +698,53 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		storageBill.setTypeConfigId(billetHotsendDetailsVo.getBilletHotsendTypeConfigId()); // 钢坯配置类型ID
 		storageBill.setDestination(billetHotsendDetailsVo.getBelongTypeName());// 目的地
 		storageBillService.updateById(storageBill);
-		result.put("success", "新增钢坯热送成功！");
+		result.put("success", "棒线保存成功！");
 		return result;
 	}
 
+	private StorageBill createStorageBill(BilletHotsendDetailsVo billetHotsendDetailsVo, List<RollClubCommon> rollClubCommonList, List<String> sizeList) {
+		StorageBill storageBillInfo = new StorageBill();
+		storageBillInfo.setTypeConfigId(billetHotsendDetailsVo.getBilletHotsendTypeConfigId());
+		storageBillInfo.setDestination(billetHotsendDetailsVo.getBelongTypeName());
+		storageBillInfo.setShiftGroup(billetHotsendDetailsVo.getBilletHotsend().getShiftGroup());
+		storageBillInfo.setSteel(billetHotsendDetailsVo.getBilletHotsend().getSteel());
+		storageBillInfo.setSpec(billetHotsendDetailsVo.getBilletHotsend().getSpec());
+		storageBillInfo.setShift(billetHotsendDetailsVo.getBilletHotsend().getShift());
+		storageBillInfo.setAmountTotal(rollClubCommonList.size());
+		LambdaQueryWrapper<StorageBill> queryWrapper1 = new LambdaQueryWrapper<>();
+		queryWrapper1.eq(StorageBill::getCcmNo, billetHotsendDetailsVo.getBilletHotsend().getCcmNo())
+				.eq(StorageBill::getLicensePlate, "辊道")
+				.eq(StorageBill::getShiftGroup, billetHotsendDetailsVo.getBilletHotsend().getShiftGroup())
+				.eq(StorageBill::getShift, billetHotsendDetailsVo.getBilletHotsend().getShift())
+				.between(StorageBill::getCreateTime, DateUtils.getStartOfDay(), DateUtils.getEndOfDay());
+		List<StorageBill> storageBillList = storageBillService.list(queryWrapper1);
+		LambdaQueryWrapper<StorageBill> queryWrapper2 = new LambdaQueryWrapper<>();
+		queryWrapper2.eq(StorageBill::getCcmNo, billetHotsendDetailsVo.getBilletHotsend().getCcmNo())
+				.between(StorageBill::getCreateTime, DateUtils.getStartOfDay(), DateUtils.getEndOfDay());
+		List<StorageBill> storageBillList2 = storageBillService.list(queryWrapper2);
+		storageBillInfo.setCarNum(oConvertUtils.listIsNotEmpty(storageBillList) ? storageBillList.size() + 1 : 1);
+		storageBillInfo.setCarAllNum(oConvertUtils.listIsNotEmpty(storageBillList2) ? storageBillList.size() + 1 : 1);
+		storageBillInfo.setLicensePlate("辊道");
+		storageBillInfo.setCcmNo(billetHotsendDetailsVo.getBilletHotsend().getCcmNo());
+		storageBillInfo.setSize(String.join(",", sizeList));
+		storageBillInfo.setDateTime(new Date());
+		storageBillInfo.setCreateTime(new Date());
+		String uniqueCode = DateUtils.date2Str(new Date(), DateUtils.yyyymmddhhmmss.get()) + "-" + billetHotsendDetailsVo.getBilletHotsend().getCcmNo() + "#" + ShiftEnum.fromCode(billetHotsendDetailsVo.getBilletHotsend().getShift()).name() + "-" + ShiftGroupEnum.fromCode(billetHotsendDetailsVo.getBilletHotsend().getShiftGroup()).name() ;
+		storageBillInfo.setUniqueCode(uniqueCode);
+		return storageBillInfo;
+	}
+
+	private StorageCarLog createStorageCarLog(BilletHotsendDetailsVo billetHotsendDetailsVo, StorageBill storageBill, List<RollClubCommon> rollClubCommonList, List<String> heatNoList, List<String> sizeList) {
+		StorageCarLog storageCarLog = new StorageCarLog();
+		BeanUtils.copyProperties(storageBill, storageCarLog);
+		storageCarLog.setCarNm("辊道");
+		storageCarLog.setHeatNo(String.join(",", heatNoList));
+		storageCarLog.setSize(String.join(",", sizeList));
+		storageCarLog.setAmount(rollClubCommonList.size());
+		storageCarLog.setDataTime(new Date());
+		return storageCarLog;
+	}
+
 	@Override
 	@Transactional
 	public void saveBilletHotsendDetailsCar(BilletHotsendDetailsVo billetHotsendDetailsVo) {

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendChangeShift/controller/BilletHotsendChangeShiftController.java

@@ -13,8 +13,8 @@ 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.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.actualControl.heatsActuals.entity.HeatsActuals;
 import org.jeecg.modules.actualControl.heatsActuals.service.IHeatsActualsService;
 import org.jeecg.modules.billet.billetHotsendChangeShift.entity.BilletHotsendChangeShift;
 import org.jeecg.modules.billet.billetHotsendChangeShift.service.IBilletHotsendChangeShiftService;
@@ -87,25 +87,22 @@ public class BilletHotsendChangeShiftController extends JeecgController<BilletHo
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody BilletHotsendChangeShift billetHotsendChangeShiftVo) {
 
-		String keyShiftGroup = String.format("class:shift:group:%s", billetHotsendChangeShiftVo.getCcmNo());
-		String keyShift = String.format("class:shift:%s", billetHotsendChangeShiftVo.getCcmNo());
-
-		String currentShintGroup = redisTemplate.opsForValue().get(keyShiftGroup).toString();
-		String currentShint = redisTemplate.opsForValue().get(keyShift).toString();
-
-		List<HeatsActuals> heatsActualsList = heatsActualsService.list(new LambdaQueryWrapper<HeatsActuals>()
-				.eq(HeatsActuals::getCasterCode, billetHotsendChangeShiftVo.getCcmNo())
-				.eq(HeatsActuals::getShift, currentShint)
-				.eq(HeatsActuals::getShiftGroup, currentShintGroup)
-				.orderByDesc(HeatsActuals::getCreateTime));
-		if (oConvertUtils.listIsNotEmpty(heatsActualsList)){
-			HeatsActuals heatsActuals = heatsActualsList.stream().findFirst().orElse(null);
-			if (oConvertUtils.isEmpty(heatsActuals.getStopPourTime())){
-				return Result.error("该炉次未停浇，不能交班！");
+
+		LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapperCS = new LambdaQueryWrapper<>();
+		queryWrapperCS.eq(BilletHotsendChangeShift::getCcmNo, billetHotsendChangeShiftVo.getCcmNo())
+				.between(BilletHotsendChangeShift::getCreateTime, DateUtils.getStartOfDay(), DateUtils.getEndOfDay());
+		List<BilletHotsendChangeShift> billetHotsendChangeShiftList = billetHotsendChangeShiftService.list(queryWrapperCS);
+
+		String nextShift = String.join(",", billetHotsendChangeShiftVo.getShift(), billetHotsendChangeShiftVo.getShiftGroup());
+		if (oConvertUtils.listIsNotEmpty(billetHotsendChangeShiftList)) {
+			boolean exists = billetHotsendChangeShiftList.stream().map(x -> String.join(",", x.getShift(), x.getShiftGroup())).anyMatch(s -> s.equals(nextShift));
+			if (exists){
+				return Result.error("当天不能重复交班");
 			}
 		}
-
 		//更新班组班别缓存
+		String keyShiftGroup = String.format("class:shift:group:%s", billetHotsendChangeShiftVo.getShiftGroup());
+		String keyShift = String.format("class:shift:%s", billetHotsendChangeShiftVo.getShift());
 		redisTemplate.opsForValue().set(keyShiftGroup, billetHotsendChangeShiftVo.getShiftGroup());
 		redisTemplate.opsForValue().set(keyShift, billetHotsendChangeShiftVo.getShift());
 		// 生成新的交班记录 初始化并保存入库
@@ -125,7 +122,7 @@ public class BilletHotsendChangeShiftController extends JeecgController<BilletHo
 		billetHotsendChangeShift1.setCreateTime(new Date());
 		billetHotsendChangeShiftService.save(billetHotsendChangeShift1);
 
-		operateLogService.add(billetHotsendChangeShiftVo,null, BilletHotsendChangeShift.class);
+		operateLogService.add(billetHotsendChangeShift1,null, BilletHotsendChangeShift.class);
 
 		return Result.OK("交班成功！");
 	}
@@ -196,13 +193,13 @@ public class BilletHotsendChangeShiftController extends JeecgController<BilletHo
 	/**
 	 * 通过id查询
 	 *
-	 * @param id
+	 * @param ccmNo
 	 * @return
 	 */
 	//@AutoLog(value = "钢坯交班记录-通过铸机号查询")
 	@ApiOperation(value="钢坯交班记录-通过铸机号查询", notes="钢坯交班记录-通过铸机号查询")
 	@GetMapping(value = "/queryByCcmNo")
-	public Result<BilletHotsendChangeShift> queryByCcmNo(@RequestParam(name="ccmNo",required=true) String ccmNo) {
+	public Result<BilletHotsendChangeShift> queryByCcmNo(@RequestParam(name="ccmNo") String ccmNo) {
 		LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo).orderByDesc(BilletHotsendChangeShift::getCreateTime);
 		BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.list(queryWrapper).stream().findFirst().orElse(null);
@@ -233,7 +230,4 @@ public class BilletHotsendChangeShiftController extends JeecgController<BilletHo
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, BilletHotsendChangeShift.class);
     }
-
-
-
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/entity/RollClubOneDetails.java

@@ -97,4 +97,13 @@ public class RollClubOneDetails implements Serializable {
     @ApiModelProperty(value = "定尺")
     @Dict(dicCode = "lg_dcgg")
     private String size;
+
+    /**装运单ID*/
+    @Excel(name = "装运单ID", width = 15)
+    @ApiModelProperty(value = "装运单ID")
+    private String storageBillId;
+
+    @Excel(name = "车牌号", width = 15)
+    @ApiModelProperty(value = "车牌号")
+    private String licensePlate;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollHeight/entity/RollHeightDetails.java

@@ -97,4 +97,13 @@ public class RollHeightDetails implements Serializable {
     @ApiModelProperty(value = "定尺")
     @Dict(dicCode = "lg_dcgg")
     private String size;
+
+    /**装运单ID*/
+    @Excel(name = "装运单ID", width = 15)
+    @ApiModelProperty(value = "装运单ID")
+    private String storageBillId;
+
+    @Excel(name = "车牌号", width = 15)
+    @ApiModelProperty(value = "车牌号")
+    private String licensePlate;
 }

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

@@ -19,6 +19,8 @@ import org.jeecg.modules.billet.billetHotsendChangeShift.entity.BilletHotsendCha
 import org.jeecg.modules.billet.billetHotsendChangeShift.service.IBilletHotsendChangeShiftService;
 import org.jeecg.modules.billet.operateLog.service.IOperateLogService;
 import org.jeecg.modules.billet.storageBill.entity.BilletHotsendDetails;
+import org.jeecg.modules.billet.storageBill.entity.ShiftEnum;
+import org.jeecg.modules.billet.storageBill.entity.ShiftGroupEnum;
 import org.jeecg.modules.billet.storageBill.entity.StorageBill;
 import org.jeecg.modules.billet.storageBill.service.IStorageBillService;
 import org.jeecg.modules.billet.storageBill.service.ITripsManageService;
@@ -131,12 +133,12 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 					 .eq(StorageBill::getLicensePlate, storageBill.getLicensePlate())
 					 .eq(StorageBill::getShiftGroup, text1)
 					 .eq(StorageBill::getShift, text2).between(StorageBill::getCreateTime, DateUtils.getStartOfDay(), DateUtils.getEndOfDay());
+			 List<StorageBill> storageBillList = storageBillService.list(queryWrapper1);
 
 			 LambdaQueryWrapper<StorageBill> queryWrapper2 = new LambdaQueryWrapper<>();
 			 queryWrapper2.eq(StorageBill::getCcmNo, storageBill.getCcmNo())
 					 .eq(StorageBill::getShiftGroup, text1)
 					 .eq(StorageBill::getShift, text2).between(StorageBill::getCreateTime, DateUtils.getStartOfDay(), DateUtils.getEndOfDay());
-			 List<StorageBill> storageBillList = storageBillService.list(queryWrapper1);
 			 storageBill.setCarNum(storageBillList.size() + 1);
 			 storageBill.setCarAllNum(storageBillService.list(queryWrapper2).size() + 1);
 
@@ -154,6 +156,8 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 			 storageBill.setAmountTotal(0);
 			 storageBill.setShiftGroup(text1);
 			 storageBill.setShift(text2);
+			 String uniqueCode = DateUtils.date2Str(new Date(), DateUtils.yyyymmddhhmmss.get()) + "-" + storageBill.getCcmNo() + "#" +ShiftEnum.fromCode(text1).name()+ "-" + ShiftGroupEnum.fromCode(text1).name();
+			 storageBill.setUniqueCode(uniqueCode);
 			 storageBillService.save(storageBill);
 			 operateLogService.add(storageBill,null,StorageBill.class);
 			 return Result.OK("钢坯装运单添加成功！");
@@ -163,7 +167,7 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 			 return Result.error("系统错误，请稍后再试！");
 		 }
 	 }
-	
+
 	/**
 	 *   添加
 	 *

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/entity/BilletHotsendDetails.java

@@ -1,8 +1,10 @@
 package org.jeecg.modules.billet.storageBill.entity;
 
 import lombok.Data;
+import org.jeecg.modules.billet.rollClubOne.entity.RollClubOneDetails;
 import org.jeecg.modules.billet.rollClubThree.entity.RollClubThreeDetails;
 import org.jeecg.modules.billet.rollClubTwo.entity.RollClubTwoDetails;
+import org.jeecg.modules.billet.rollHeight.entity.RollHeightDetails;
 import org.jeecg.modules.billet.rollOutShipp.entity.RollOutShippDetails;
 
 import java.util.List;
@@ -10,11 +12,15 @@ import java.util.List;
 @Data
 public class BilletHotsendDetails {
 
+    private List<RollClubOneDetails> rollClubOneDetailsList;
+
     private List<RollClubTwoDetails> rollClubTwoDetailsList;
 
     private List<RollClubThreeDetails> rollClubThreeDetailsList;
 
     private List<RollOutShippDetails> rollOutShippDetailsList;
+
+    private List<RollHeightDetails> rollHeightDetails;
 //
 //    private List<StackingDownLog> stackingDownLogList;
 //

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/entity/ShiftEnum.java

@@ -0,0 +1,33 @@
+package org.jeecg.modules.billet.storageBill.entity;
+
+/**
+ * 班别
+ */
+public enum ShiftEnum {
+
+    白班("0"),
+    中班("2"),
+    夜班("1");
+
+    private final String code;
+
+    // 构造函数，用于初始化每个枚举常量对应的数值
+    ShiftEnum(String code) {
+        this.code = code;
+    }
+
+    // 获取数值的方法
+    public String getCode() {
+        return this.code;
+    }
+
+    // 根据传入的数值查找对应的枚举常量的静态方法
+    public static ShiftEnum fromCode(String code) {
+        for (ShiftEnum name : ShiftEnum.values()) {
+            if (name.getCode().equals(code)) {
+                return name;
+            }
+        }
+        throw new IllegalArgumentException("无效的代码值: " + code);
+    }
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/entity/ShiftGroupEnum.java

@@ -0,0 +1,33 @@
+package org.jeecg.modules.billet.storageBill.entity;
+
+/**
+ * 班组
+ */
+public enum ShiftGroupEnum {
+    甲("0"),
+    乙("1"),
+    丙("2"),
+    丁("3");
+
+    private final String code;
+
+    // 构造函数，用于初始化每个枚举常量对应的数值
+    ShiftGroupEnum(String code) {
+        this.code = code;
+    }
+
+    // 获取数值的方法
+    public String getCode() {
+        return this.code;
+    }
+
+    // 根据传入的数值查找对应的枚举常量的静态方法
+    public static ShiftGroupEnum fromCode(String code) {
+        for (ShiftGroupEnum name : ShiftGroupEnum.values()) {
+            if (name.getCode().equals(code)) {
+                return name;
+            }
+        }
+        throw new IllegalArgumentException("无效的代码值: " + code);
+    }
+}

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/entity/StorageBill.java

@@ -141,5 +141,8 @@ public class StorageBill implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remarks;
 
-
+    /**备注*/
+    @Excel(name = "综合唯一编码", width = 15)
+    @ApiModelProperty(value = "综合唯一编码")
+    private String uniqueCode;
 }

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

@@ -10,10 +10,14 @@ 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.rollClubOne.entity.RollClubOneDetails;
+import org.jeecg.modules.billet.rollClubOne.service.IRollClubOneDetailsService;
 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.rollHeight.entity.RollHeightDetails;
+import org.jeecg.modules.billet.rollHeight.service.IRollHeightDetailsService;
 import org.jeecg.modules.billet.rollOutShipp.entity.RollOutShippDetails;
 import org.jeecg.modules.billet.rollOutShipp.service.IRollOutShippDetailsService;
 import org.jeecg.modules.billet.stackingAndLoadingVehicles.service.IStackingDownLogService;
@@ -49,6 +53,9 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
     @Autowired
     private IStorageCarLogService storageCarLogService;
 
+    @Autowired
+    private IRollClubOneDetailsService rollClubOneDetailsService;
+
     @Autowired
     private IRollClubTwoDetailsService rollClubTwoDetailsService;
 
@@ -58,6 +65,9 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
     @Autowired
     private IRollOutShippDetailsService rollOutShippDetailsService;
 
+    @Autowired
+    private IRollHeightDetailsService rollHeightDetailsService;
+
     @Autowired
     private IBilletBasicInfoService billetBasicInfoService;
 
@@ -125,13 +135,17 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
         if (oConvertUtils.isEmpty(billetHotsendTypeConfig)){
             return null;
         }
+        List<RollClubOneDetails> rollClubOneDetailsList = rollClubOneDetailsService.list(new LambdaQueryWrapper<RollClubOneDetails>().eq(RollClubOneDetails::getStorageBillId, storageBill.getId()));
+        result.setRollClubOneDetailsList(rollClubOneDetailsList);
         List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(new LambdaQueryWrapper<RollClubTwoDetails>().eq(RollClubTwoDetails::getStorageBillId, storageBill.getId()));
         result.setRollClubTwoDetailsList(rollClubTwoDetailsList);
         List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(new LambdaQueryWrapper<RollClubThreeDetails>().eq(RollClubThreeDetails::getStorageBillId, storageBill.getId()));
         result.setRollClubThreeDetailsList(rollClubThreeDetailsList);
         List<RollOutShippDetails> rollOutShippDetailsList = rollOutShippDetailsService.list(new LambdaQueryWrapper<RollOutShippDetails>().eq(RollOutShippDetails::getStorageBillId, storageBill.getId()));
         result.setRollOutShippDetailsList(rollOutShippDetailsList);
-//        List<StackingDownLogDetails> stackingDownLogDetailsList = new ArrayList<>();
+        List<RollHeightDetails> rollHeightDetails = rollHeightDetailsService.list(new LambdaQueryWrapper<RollHeightDetails>().eq(RollHeightDetails::getStorageBillId, storageBill.getId()));
+        result.setRollHeightDetails(rollHeightDetails);
+        //        List<StackingDownLogDetails> stackingDownLogDetailsList = new ArrayList<>();
 //        List<StackingDownLog> stackingDownLogList = stackingDownLogService.list(new LambdaQueryWrapper<StackingDownLog>().eq(StackingDownLog::getStorageBillId, storageBill.getId()));
 //        if (oConvertUtils.listIsEmpty(stackingDownLogList)){
 //            result.setStackingDownLogList(stackingDownLogList);