|
@@ -1,5 +1,6 @@
|
|
|
package org.jeecg.modules.billet.stackingAndLoadingVehicles.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.core.toolkit.IdWorker;
|
|
@@ -476,8 +477,13 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
.eq(BilletHotsend::getShiftGroup, cacheShintGroup);
|
|
|
BilletHotsend idExistBh = billetHotsendBaseService.getOne(queryWrapper);
|
|
|
if (oConvertUtils.isNotEmpty(idExistBh)){
|
|
|
+ if (idExistBh.getStackNum() < stackingAndLoadingVehiclesList.size() * 4){
|
|
|
+ billetHotsend.setStackNum(stackingAndLoadingVehiclesList.size() * 4); // 堆垛总支数
|
|
|
+ log.info("{}{}", ">>>>>>>>>堆垛总支数计算出现异常:", JSON.toJSON(loadingParams));
|
|
|
+ }else {
|
|
|
+ billetHotsend.setStackNum(idExistBh.getStackNum() - stackingAndLoadingVehiclesList.size() * 4); // 堆垛总支数
|
|
|
+ }
|
|
|
// 钢坯热送基础信息存在,但是钢坯信息不存在 直接返回
|
|
|
- billetHotsend.setStackNum(idExistBh.getStackNum() - stackingAndLoadingVehiclesList.size() * 4); // 堆垛总支数
|
|
|
LambdaUpdateWrapper<BilletHotsend> updateWrapper = new LambdaUpdateWrapper<>();
|
|
|
updateWrapper.eq(BilletHotsend::getCcmNo, billetHotsend.getCcmNo())
|
|
|
.eq(BilletHotsend::getHeatNo, billetHotsend.getHeatNo())
|
|
@@ -582,8 +588,13 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
.eq(BilletHotsend::getShiftGroup, cacheShintGroup);
|
|
|
BilletHotsend idExistBh = billetHotsendBaseService.getOne(queryWrapper);
|
|
|
if (oConvertUtils.isNotEmpty(idExistBh)){
|
|
|
+ if (idExistBh.getStackNum() < stackingAndLoadingVehiclesList.size() * 4){
|
|
|
+ billetHotsend.setStackNum(stackingAndLoadingVehiclesList.size() * 4); // 堆垛总支数
|
|
|
+ log.info("{}{}", ">>>>>>>>>堆垛总支数计算出现异常:", JSON.toJSON(loadingParams));
|
|
|
+ }else {
|
|
|
+ billetHotsend.setStackNum(idExistBh.getStackNum() - stackingAndLoadingVehiclesList.size() * 4); // 堆垛总支数
|
|
|
+ }
|
|
|
// 钢坯热送基础信息存在,但是钢坯信息不存在 直接返回
|
|
|
- billetHotsend.setStackNum(idExistBh.getStackNum() - stackingAndLoadingVehiclesList.size() * 4); // 堆垛总支数
|
|
|
LambdaUpdateWrapper<BilletHotsend> updateWrapper = new LambdaUpdateWrapper<>();
|
|
|
updateWrapper.eq(BilletHotsend::getCcmNo, billetHotsend.getCcmNo())
|
|
|
.eq(BilletHotsend::getHeatNo, billetHotsend.getHeatNo())
|