浇筑炉次定尺修改

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

@@ -22,7 +22,9 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletBasicInfo;
+import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletRulerConfig;
 import org.jeecg.modules.actualControl.billetActual.billetActual.service.IBilletBasicInfoService;
+import org.jeecg.modules.actualControl.billetActual.billetActual.service.IBilletRulerConfigService;
 import org.jeecg.modules.actualControl.heatsActuals.entity.HeatsActuals;
 import org.jeecg.modules.actualControl.heatsActuals.service.IHeatsActualsService;
 import org.jeecg.modules.billet.billetAutoTmp.entity.BilletAutoTmp;
@@ -35,6 +37,7 @@ import org.jeecg.modules.billet.billetHotsendChangeShift.service.IBilletHotsendC
 import org.jeecg.modules.billet.billetHotsendConfig.entity.BilletHotsendTypeConfig;
 import org.jeecg.modules.billet.billetHotsendConfig.service.IBilletHotsendTypeConfigService;
 import org.jeecg.modules.billet.operateLog.service.IOperateLogService;
+import org.jeecg.modules.billet.rollClubOne.entity.RollClubOne;
 import org.jeecg.modules.billet.rollClubOne.entity.RollClubOneDetails;
 import org.jeecg.modules.billet.rollClubOne.service.IRollClubOneDetailsService;
 import org.jeecg.modules.billet.rollClubThree.entity.RollClubThree;
@@ -143,6 +146,9 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 
 	@Autowired
 	private IStackingAndLoadingVehiclesService stackingAndLoadingVehiclesService;
+
+	@Autowired
+	private IBilletRulerConfigService billetRulerConfigService;
 	/**
 	 * 分页列表查询
 	 *
@@ -2149,6 +2155,58 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 		return Result.OK(heatsActualsInfoList);
 	}
 
+
+	@ApiOperation(value="浇筑炉次-定尺更新", notes="浇筑炉次-定尺更新")
+	@RequestMapping(value = "/editBilletBasicInfoLength", method = {RequestMethod.PUT})
+	@Transactional(rollbackFor = Exception.class)
+	public Result<String> editBilletBasicInfoLength(@RequestBody BasicInfoLengthUpdate basicInfoLengthUpdate) {
+		if (oConvertUtils.isEmpty(basicInfoLengthUpdate.getCcmNo()) || oConvertUtils.isEmpty(basicInfoLengthUpdate.getHeatNo()) || oConvertUtils.isEmpty(basicInfoLengthUpdate.getStrandNo()) || oConvertUtils.isEmpty(basicInfoLengthUpdate.getLength())){
+			return Result.error("参数错误");
+		}
+		// 根据ccmNo、heatNo、strandNo查询钢坯实绩集合
+		LambdaQueryWrapper<BilletBasicInfo> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(BilletBasicInfo::getCcmNo, basicInfoLengthUpdate.getCcmNo())
+					.eq(BilletBasicInfo::getHeatNo, basicInfoLengthUpdate.getHeatNo())
+				.eq(BilletBasicInfo::getStrandNo, basicInfoLengthUpdate.getStrandNo())
+				.eq(BilletBasicInfo::getLength, basicInfoLengthUpdate.getOriginalLength());
+		List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(queryWrapper);
+		if (oConvertUtils.listIsEmpty(billetBasicInfoList)){
+			return Result.error("未找到对应数据");
+		}
+		// 根据最新的定尺核算钢坯重量
+		LambdaQueryWrapper<BilletRulerConfig> queryWrapperbilletRulerConfig = new LambdaQueryWrapper<BilletRulerConfig>()
+				.eq(BilletRulerConfig::getLength, basicInfoLengthUpdate.getLength());
+		BilletRulerConfig billetRulerConfig = billetRulerConfigService.getOne(queryWrapperbilletRulerConfig);
+		Double weight = 0.0;
+		if (oConvertUtils.isNotEmpty(billetRulerConfig)) {
+			weight = billetRulerConfig.getWeight();
+		}
+		for (BilletBasicInfo billetBasicInfo : billetBasicInfoList) {
+			billetBasicInfo.setLength(basicInfoLengthUpdate.getLength());
+			billetBasicInfo.setBilletWeight(weight);
+			billetBasicInfo.setWeight(weight);
+		}
+		billetBasicInfoService.saveOrUpdateBatch(billetBasicInfoList);
+
+		// 过滤出billetBasicInfoList中belongTable等于roll_club_one的钢坯实绩
+		List<BilletBasicInfo> billetBasicInfoListRollClubOne = billetBasicInfoList.stream()
+				.filter(info -> info.getBelongTable() != null && info.getBelongTable().equals("roll_club_one"))
+				.collect(Collectors.toList());
+		if (oConvertUtils.listIsNotEmpty(billetBasicInfoListRollClubOne)) {
+			billetBasicInfoListRollClubOne.forEach(x -> {
+				LambdaQueryWrapper<RollClubOneDetails> queryWrapperRollClubOneDetails = new LambdaQueryWrapper<>();
+				queryWrapperRollClubOneDetails.eq(RollClubOneDetails::getCcmNo, basicInfoLengthUpdate.getCcmNo());
+				queryWrapperRollClubOneDetails.eq(RollClubOneDetails::getBilletNo, x.getBilletNo());
+				RollClubOneDetails rollClubOneDetails = rollClubOneDetailsService.getOne(queryWrapperRollClubOneDetails);
+				if (oConvertUtils.isNotEmpty(rollClubOneDetails)){
+					rollClubOneDetails.setSize(String.valueOf(x.getLength()));
+					rollClubOneDetails.setBlankOutput(x.getBilletWeight());
+					rollClubOneDetailsService.updateById(rollClubOneDetails);
+				}
+			});
+		}
+		return Result.OK("定尺修改成功！");
+	}
 	/**
 	 * 筛选指定流号的数据
 	 * @param billetList 钢坯信息列表

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

@@ -0,0 +1,12 @@
+package org.jeecg.modules.billet.storageBill.entity;
+
+import lombok.Data;
+
+@Data
+public class BasicInfoLengthUpdate {
+    private String ccmNo;
+    private String heatNo;
+    private Integer originalLength;
+    private Integer length;
+    private Integer strandNo;
+}