|
@@ -70,6 +70,8 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
private IStorageCarLogService storageCarLogService;
|
|
|
@Autowired
|
|
|
private IOperateLogService operateLogService;
|
|
|
+ @Autowired
|
|
|
+ private StackingAndLoadingVehiclesMapper stackingAndLoadingVehiclesMapper;
|
|
|
|
|
|
@Override
|
|
|
public List<List<StackingAndLoadingVehicles>> getListBySatck(String typeConfigId) {
|
|
@@ -464,7 +466,8 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
log.info("{}{}", "钢坯热送基础信息不存在,垛位装车失败!", JSON.toJSONString(loadingParams));
|
|
|
return;
|
|
|
}else {
|
|
|
- billetHotsend.setStackNum(idExistBh.getStackNum() - stackingAndLoadingVehiclesList.size()); // 堆垛总数
|
|
|
+ int result = Integer.compare(idExistBh.getStackNum(), stackingAndLoadingVehiclesList.size());
|
|
|
+ billetHotsend.setStackNum(result > 0 ? idExistBh.getStackNum() - stackingAndLoadingVehiclesList.size() : 0);
|
|
|
LambdaUpdateWrapper<BilletHotsend> updateWrapper = new LambdaUpdateWrapper<>();
|
|
|
updateWrapper.eq(BilletHotsend::getCcmNo, billetHotsend.getCcmNo())
|
|
|
.eq(BilletHotsend::getHeatNo, billetHotsend.getHeatNo())
|
|
@@ -474,22 +477,19 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
}
|
|
|
// 根据铸机号、位置、层数、类型配置ID更新 初始化容器中的垛位信息
|
|
|
stackingAndLoadingVehiclesList.forEach(x ->{
|
|
|
- LambdaUpdateWrapper<StackingAndLoadingVehicles> queryWrapperSA = new LambdaUpdateWrapper<>();
|
|
|
- queryWrapperSA.eq(StackingAndLoadingVehicles::getCcmNo, x.getCcmNo())
|
|
|
- .eq(StackingAndLoadingVehicles::getLayer, x.getLayer())
|
|
|
- .eq(StackingAndLoadingVehicles::getAddress, x.getAddress())
|
|
|
- .eq(StackingAndLoadingVehicles::getTypeConfigId, loadingParams.getBilletHotsendTypeConfigId());;
|
|
|
+ LambdaUpdateWrapper<StackingAndLoadingVehicles> updateWrapper = new LambdaUpdateWrapper();
|
|
|
+ updateWrapper.eq(StackingAndLoadingVehicles::getId, x.getId())
|
|
|
+ .set(StackingAndLoadingVehicles::getBilletNos, null)
|
|
|
+ .set(StackingAndLoadingVehicles::getSpec, null)
|
|
|
+ .set(StackingAndLoadingVehicles::getSteel, null)
|
|
|
+ .set(StackingAndLoadingVehicles::getSize, null)
|
|
|
+ .set(StackingAndLoadingVehicles::getShift, null)
|
|
|
+ .set(StackingAndLoadingVehicles::getHeatNo, null)
|
|
|
+ .set(StackingAndLoadingVehicles::getCreateDate, null)
|
|
|
+ .set(StackingAndLoadingVehicles::getShiftGroup, null);
|
|
|
StackingAndLoadingVehicles stackingAndLoadingVehicles = new StackingAndLoadingVehicles();
|
|
|
BeanUtils.copyProperties(x, stackingAndLoadingVehicles);
|
|
|
- stackingAndLoadingVehicles.setBilletNos(null);
|
|
|
- stackingAndLoadingVehicles.setSpec(null);
|
|
|
- stackingAndLoadingVehicles.setSteel(null);
|
|
|
- stackingAndLoadingVehicles.setSize(null);
|
|
|
- stackingAndLoadingVehicles.setShift(null);
|
|
|
- stackingAndLoadingVehicles.setHeatNo(null);
|
|
|
- stackingAndLoadingVehicles.setShiftGroup(null);
|
|
|
- stackingAndLoadingVehicles.setCreateDate(null);
|
|
|
- baseMapper.update(stackingAndLoadingVehicles, queryWrapperSA);
|
|
|
+ stackingAndLoadingVehiclesMapper.update(stackingAndLoadingVehicles, updateWrapper);
|
|
|
});
|
|
|
|
|
|
// 3 保存 下垛日志 stacking_up_log
|
|
@@ -549,7 +549,8 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
log.info("{}{}", "钢坯热送基础信息不存在,垛位发车失败!", JSON.toJSONString(loadingParams));
|
|
|
return;
|
|
|
} else {
|
|
|
- billetHotsend.setStackNum(idExistBh.getStackNum() - stackingAndLoadingVehiclesList.size()); // 堆垛总数
|
|
|
+ int result = Integer.compare(idExistBh.getStackNum(), stackingAndLoadingVehiclesList.size());
|
|
|
+ billetHotsend.setStackNum(result > 0 ? idExistBh.getStackNum() - stackingAndLoadingVehiclesList.size() : 0);// 垛位总数
|
|
|
LambdaUpdateWrapper<BilletHotsend> updateWrapper = new LambdaUpdateWrapper<>();
|
|
|
updateWrapper.eq(BilletHotsend::getCcmNo, billetHotsend.getCcmNo())
|
|
|
.eq(BilletHotsend::getHeatNo, billetHotsend.getHeatNo())
|
|
@@ -560,22 +561,19 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
|
|
|
// 3 发车后,动态更新容器中的垛位信息 初始化
|
|
|
stackingAndLoadingVehiclesList.forEach(x ->{
|
|
|
- LambdaUpdateWrapper<StackingAndLoadingVehicles> queryWrapperSA = new LambdaUpdateWrapper<>();
|
|
|
- queryWrapperSA.eq(StackingAndLoadingVehicles::getCcmNo, x.getCcmNo())
|
|
|
- .eq(StackingAndLoadingVehicles::getLayer, x.getLayer())
|
|
|
- .eq(StackingAndLoadingVehicles::getAddress, x.getAddress())
|
|
|
- .eq(StackingAndLoadingVehicles::getTypeConfigId, loadingParams.getBilletHotsendTypeConfigId());;
|
|
|
- StackingAndLoadingVehicles stackingAndLoadingVehicles = createInitializedVehicle();
|
|
|
+ LambdaUpdateWrapper<StackingAndLoadingVehicles> updateWrapper = new LambdaUpdateWrapper();
|
|
|
+ updateWrapper.eq(StackingAndLoadingVehicles::getId, x.getId())
|
|
|
+ .set(StackingAndLoadingVehicles::getBilletNos, null)
|
|
|
+ .set(StackingAndLoadingVehicles::getSpec, null)
|
|
|
+ .set(StackingAndLoadingVehicles::getSteel, null)
|
|
|
+ .set(StackingAndLoadingVehicles::getSize, null)
|
|
|
+ .set(StackingAndLoadingVehicles::getShift, null)
|
|
|
+ .set(StackingAndLoadingVehicles::getHeatNo, null)
|
|
|
+ .set(StackingAndLoadingVehicles::getCreateDate, null)
|
|
|
+ .set(StackingAndLoadingVehicles::getShiftGroup, null);
|
|
|
+ StackingAndLoadingVehicles stackingAndLoadingVehicles = new StackingAndLoadingVehicles();
|
|
|
BeanUtils.copyProperties(x, stackingAndLoadingVehicles);
|
|
|
- stackingAndLoadingVehicles.setBilletNos(null);
|
|
|
- stackingAndLoadingVehicles.setSpec(null);
|
|
|
- stackingAndLoadingVehicles.setSteel(null);
|
|
|
- stackingAndLoadingVehicles.setSize(null);
|
|
|
- stackingAndLoadingVehicles.setShift(null);
|
|
|
- stackingAndLoadingVehicles.setHeatNo(null);
|
|
|
- stackingAndLoadingVehicles.setShiftGroup(null);
|
|
|
- stackingAndLoadingVehicles.setCreateDate(null);
|
|
|
- baseMapper.update(stackingAndLoadingVehicles, queryWrapperSA);
|
|
|
+ stackingAndLoadingVehiclesMapper.update(stackingAndLoadingVehicles, updateWrapper);
|
|
|
});
|
|
|
|
|
|
// 4 保存 下垛日志 stacking_down_log
|
|
@@ -585,6 +583,8 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
BeanUtils.copyProperties(x, stackingDownLog);
|
|
|
stackingDownLog.setBilletNo(x.getBilletNos());
|
|
|
stackingDownLog.setStorageBillId(loadingParams.getStorageBill().getId());// 装运单ID
|
|
|
+ stackingDownLog.setStackStorey(x.getLayer());
|
|
|
+ stackingDownLog.setStackNum(x.getAddress());
|
|
|
stackingDownLogList.add(stackingDownLog);
|
|
|
});
|
|
|
stackingDownLogService.saveBatch(stackingDownLogList);
|