|
@@ -23,12 +23,18 @@ 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.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.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;
|
|
@@ -39,7 +45,6 @@ import org.jeecg.modules.billet.stackingAndLoadingVehicles.service.IStackingUpLo
|
|
|
import org.jeecg.modules.billet.stackingAndLoadingVehicles.vo.LoadingParams;
|
|
|
import org.jeecg.modules.billet.stackingAndLoadingVehicles.vo.SavVo;
|
|
|
import org.jeecg.modules.billet.storageBill.entity.StorageBill;
|
|
|
-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;
|
|
@@ -97,7 +102,12 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
private IBilletHotsendAbandonsService billetHotsendAbandonsService;
|
|
|
@Autowired
|
|
|
public RedisTemplate redisTemplate;
|
|
|
-
|
|
|
+ @Autowired
|
|
|
+ private IRollClubTwoService rollClubTwoService;
|
|
|
+ @Autowired
|
|
|
+ private IRollClubThreeService rollClubThreeService;
|
|
|
+ @Autowired
|
|
|
+ private IRollOutShippService rollOutShippService;
|
|
|
@Override
|
|
|
public List<List<StackingAndLoadingVehicles>> getListBySatck(String typeConfigId) {
|
|
|
LambdaQueryWrapper<StackingAndLoadingVehicles> wrapper = new LambdaQueryWrapper<>();
|
|
@@ -604,9 +614,13 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
LambdaQueryWrapper<BilletBasicInfo> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
queryWrapper.in(BilletBasicInfo::getBilletNo, Arrays.asList(parts));
|
|
|
List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(queryWrapper);
|
|
|
+ if (oConvertUtils.listIsEmpty(billetBasicInfoList)){
|
|
|
+ return;
|
|
|
+ }
|
|
|
BilletBasicInfo billetBasicInfo = billetBasicInfoList.stream().findFirst().orElse(null);
|
|
|
List<String> heatNos = billetBasicInfoList.stream().map(BilletBasicInfo::getHeatNo).distinct().collect(Collectors.toList());
|
|
|
- double amountTotal = billetBasicInfoList.stream().mapToDouble(BilletBasicInfo::getBilletWeight).sum();
|
|
|
+ double billetWeightTotal = billetBasicInfoList.stream().mapToDouble(BilletBasicInfo::getBilletWeight).sum();
|
|
|
+
|
|
|
stackingDownLog.setHeatNo(String.join(",", heatNos));
|
|
|
stackingDownLog.setBilletNo(x.getBilletNos());
|
|
|
stackingDownLog.setStorageBillId(storageBill.getId());
|
|
@@ -618,6 +632,40 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
// stackingUpLog.setFromStackingId(stackingAndLoadingVehicles.getId());
|
|
|
stackingDownLogList.add(stackingDownLog);
|
|
|
if ("roll_club_two".equals(loadingParams.getDestinationTable())){
|
|
|
+ billetBasicInfoList.forEach(y ->{
|
|
|
+ LambdaQueryWrapper<RollClubTwo> queryWrapper1 = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper1.eq(RollClubTwo::getCcmNo, y.getCcmNo().toString())
|
|
|
+ .eq(RollClubTwo::getHeatNo, y.getHeatNo())
|
|
|
+ .eq(RollClubTwo::getShift, y.getShift())
|
|
|
+ .eq(RollClubTwo::getShiftGroup, y.getShiftGroup())
|
|
|
+ .eq(RollClubTwo::getStorageBillId, storageBill.getId());
|
|
|
+ RollClubTwo rollClubTwo1 = rollClubTwoService.getOne(queryWrapper1);
|
|
|
+ RollClubTwo rollClubTwo = new RollClubTwo();
|
|
|
+ if (oConvertUtils.isEmpty(rollClubTwo1)){
|
|
|
+ // 堆垛保存时 目的地为为棒二 保存棒二信息
|
|
|
+ rollClubTwo.setId(String.valueOf(IdWorker.getId()));
|
|
|
+ rollClubTwo.setCcmNo(y.getCcmNo().toString());
|
|
|
+ rollClubTwo.setHeatNo(y.getHeatNo());
|
|
|
+ rollClubTwo.setSize(y.getLength().toString());
|
|
|
+ rollClubTwo.setAmountTotal(1);
|
|
|
+ rollClubTwo.setSteel(y.getGrade());
|
|
|
+ rollClubTwo.setSpec(y.getSpec());
|
|
|
+ rollClubTwo.setShiftGroup(y.getShiftGroup());
|
|
|
+ rollClubTwo.setShift(y.getShift());
|
|
|
+ rollClubTwo.setBlankOutput(oConvertUtils.isEmpty(y.getBilletWeight()) ? 0l : y.getBilletWeight());
|
|
|
+ rollClubTwo.setStorageBillId(storageBill.getId());
|
|
|
+ rollClubTwo.setCreateDate(new Date());
|
|
|
+ rollClubTwo.setCreateTime(new Date());
|
|
|
+ rollClubTwoService.save(rollClubTwo);
|
|
|
+ }else {
|
|
|
+ // 堆垛发车时
|
|
|
+ rollClubTwo.setId(rollClubTwo1.getId());
|
|
|
+ rollClubTwo.setAmountTotal(rollClubTwo1.getAmountTotal() + 1);// 总支数
|
|
|
+ rollClubTwo.setBlankOutput(rollClubTwo1.getBlankOutput() + y.getBilletWeight());
|
|
|
+ rollClubTwo.setUpdateTime(new Date());
|
|
|
+ rollClubTwoService.updateById(rollClubTwo);
|
|
|
+ }
|
|
|
+ });
|
|
|
RollClubTwoDetails rollClubTwoDetails = new RollClubTwoDetails();
|
|
|
BeanUtils.copyProperties(x, rollClubTwoDetails);
|
|
|
rollClubTwoDetails.setHeatNo(String.join(",", heatNos));
|
|
@@ -625,21 +673,56 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
rollClubTwoDetails.setStorageBillId(storageBill.getId());
|
|
|
rollClubTwoDetails.setStackStorey(x.getLayer());
|
|
|
rollClubTwoDetails.setStackNum(x.getAddress());
|
|
|
- rollClubTwoDetails.setShiftGroup(billetBasicInfo.getShiftGroup());
|
|
|
- rollClubTwoDetails.setShift(billetBasicInfo.getShift());
|
|
|
+ rollClubTwoDetails.setShiftGroup(x.getShiftGroup());
|
|
|
+ rollClubTwoDetails.setShift(x.getShift());
|
|
|
rollClubTwoDetails.setLicensePlate(storageBill.getLicensePlate());
|
|
|
rollClubTwoDetails.setCreateTime(new Date());
|
|
|
rollClubTwoDetails.setUpdateTime(new Date());
|
|
|
rollClubTwoDetails.setId(String.valueOf(IdWorker.getId()));
|
|
|
- rollClubTwoDetails.setBlankOutput(amountTotal);//出坯量
|
|
|
+ rollClubTwoDetails.setBlankOutput(billetWeightTotal);//出坯量
|
|
|
addRollClubTwoDetailsList.add(rollClubTwoDetails);
|
|
|
}else if ("roll_club_three".equals(loadingParams.getDestinationTable())){
|
|
|
+ billetBasicInfoList.forEach(y ->{
|
|
|
+ LambdaQueryWrapper<RollClubThree> queryWrapper1 = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper1.eq(RollClubThree::getCcmNo, y.getCcmNo().toString())
|
|
|
+ .eq(RollClubThree::getHeatNo, y.getHeatNo())
|
|
|
+ .eq(RollClubThree::getShift, y.getShift())
|
|
|
+ .eq(RollClubThree::getShiftGroup, y.getShiftGroup())
|
|
|
+ .eq(RollClubThree::getStorageBillId, storageBill.getId());
|
|
|
+ RollClubThree rollClubThree1 = rollClubThreeService.getOne(queryWrapper1);
|
|
|
+ RollClubThree rollClubThree = new RollClubThree();
|
|
|
+ if (oConvertUtils.isEmpty(rollClubThree1)){
|
|
|
+ // 堆垛保存发车时 目的地为为棒三 保存棒三信息
|
|
|
+ rollClubThree.setId(String.valueOf(IdWorker.getId()));
|
|
|
+ rollClubThree.setCcmNo(y.getCcmNo().toString());
|
|
|
+ rollClubThree.setHeatNo(y.getHeatNo());
|
|
|
+ rollClubThree.setSize(y.getLength().toString());
|
|
|
+ rollClubThree.setAmountTotal(1);
|
|
|
+ rollClubThree.setSteel(y.getGrade());
|
|
|
+ rollClubThree.setSpec(y.getSpec());
|
|
|
+ rollClubThree.setShiftGroup(y.getShiftGroup());
|
|
|
+ rollClubThree.setShift(y.getShift());
|
|
|
+ rollClubThree.setBlankOutput(oConvertUtils.isEmpty(y.getBilletWeight()) ? 0l : y.getBilletWeight());
|
|
|
+ rollClubThree.setStorageBillId(storageBill.getId());
|
|
|
+ rollClubThree.setCreateDate(new Date());
|
|
|
+ rollClubThree.setCreateTime(new Date());
|
|
|
+ rollClubThreeService.save(rollClubThree);
|
|
|
+ }else {
|
|
|
+ // 堆垛保存发车时 目的地为为棒三 更新棒三信息
|
|
|
+ rollClubThree.setId(rollClubThree1.getId());
|
|
|
+ rollClubThree.setAmountTotal(rollClubThree1.getAmountTotal() + 1);// 总支数
|
|
|
+ rollClubThree.setBlankOutput(rollClubThree1.getBlankOutput() + y.getBilletWeight());
|
|
|
+ rollClubThree.setUpdateTime(new Date());
|
|
|
+ rollClubThreeService.updateById(rollClubThree);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ // 棒三明细
|
|
|
RollClubThreeDetails rollClubThreeDetails = new RollClubThreeDetails();
|
|
|
BeanUtils.copyProperties(x, rollClubThreeDetails);
|
|
|
rollClubThreeDetails.setHeatNo(String.join(",", heatNos));
|
|
|
rollClubThreeDetails.setBilletNo(x.getBilletNos());
|
|
|
- rollClubThreeDetails.setShiftGroup(billetBasicInfo.getShiftGroup());
|
|
|
- rollClubThreeDetails.setShift(billetBasicInfo.getShift());
|
|
|
+ rollClubThreeDetails.setShiftGroup(x.getShiftGroup());
|
|
|
+ rollClubThreeDetails.setShift(x.getShift());
|
|
|
rollClubThreeDetails.setStorageBillId(storageBill.getId());
|
|
|
rollClubThreeDetails.setStackStorey(x.getLayer());
|
|
|
rollClubThreeDetails.setStackNum(x.getAddress());
|
|
@@ -647,15 +730,50 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
rollClubThreeDetails.setCreateTime(new Date());
|
|
|
rollClubThreeDetails.setUpdateTime(new Date());
|
|
|
rollClubThreeDetails.setId(String.valueOf(IdWorker.getId()));
|
|
|
- rollClubThreeDetails.setBlankOutput(amountTotal);//出坯量
|
|
|
+ rollClubThreeDetails.setBlankOutput(billetWeightTotal);//出坯量
|
|
|
addRollClubThreeDetailsList.add(rollClubThreeDetails);
|
|
|
}else if ("roll_out_shipp".equals(loadingParams.getDestinationTable())){
|
|
|
+ billetBasicInfoList.forEach(y ->{
|
|
|
+ LambdaQueryWrapper<RollOutShipp> queryWrapper1 = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper1.eq(RollOutShipp::getCcmNo, y.getCcmNo().toString())
|
|
|
+ .eq(RollOutShipp::getHeatNo, y.getHeatNo())
|
|
|
+ .eq(RollOutShipp::getShift, y.getShift())
|
|
|
+ .eq(RollOutShipp::getShiftGroup, y.getShiftGroup())
|
|
|
+ .eq(RollOutShipp::getStorageBillId, storageBill.getId());
|
|
|
+ RollOutShipp rollOutShipp1 = rollOutShippService.getOne(queryWrapper1);
|
|
|
+ RollOutShipp rollOutShipp = new RollOutShipp();
|
|
|
+ if (oConvertUtils.isEmpty(rollOutShipp1)){
|
|
|
+ // 堆垛保存发车时 目的地为为上若 保存上若信息
|
|
|
+ rollOutShipp.setId(String.valueOf(IdWorker.getId()));
|
|
|
+ rollOutShipp.setCcmNo(y.getCcmNo().toString());
|
|
|
+ rollOutShipp.setHeatNo(y.getHeatNo());
|
|
|
+ rollOutShipp.setSize(y.getLength().toString());
|
|
|
+ rollOutShipp.setAmountTotal(1);
|
|
|
+ rollOutShipp.setSteel(y.getGrade());
|
|
|
+ rollOutShipp.setSpec(y.getSpec());
|
|
|
+ rollOutShipp.setShiftGroup(y.getShiftGroup());
|
|
|
+ rollOutShipp.setShift(y.getShift());
|
|
|
+ rollOutShipp.setBlankOutput(oConvertUtils.isEmpty(y.getBilletWeight()) ? 0l : y.getBilletWeight());
|
|
|
+ rollOutShipp.setStorageBillId(storageBill.getId());
|
|
|
+ rollOutShipp.setCreateDate(new Date());
|
|
|
+ rollOutShipp.setCreateTime(new Date());
|
|
|
+ rollOutShippService.save(rollOutShipp);
|
|
|
+ }else {
|
|
|
+ // 堆垛保存发车时 目的地为为上若 更新上若信息
|
|
|
+ rollOutShipp.setId(rollOutShipp1.getId());
|
|
|
+ rollOutShipp.setAmountTotal(rollOutShipp1.getAmountTotal() + 1);// 总支数
|
|
|
+ rollOutShipp.setBlankOutput(rollOutShipp1.getBlankOutput() + y.getBilletWeight());
|
|
|
+ rollOutShipp.setUpdateTime(new Date());
|
|
|
+ rollOutShippService.updateById(rollOutShipp);
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
RollOutShippDetails rollOutShippDetails = new RollOutShippDetails();
|
|
|
BeanUtils.copyProperties(x, rollOutShippDetails);
|
|
|
rollOutShippDetails.setHeatNo(String.join(",", heatNos));
|
|
|
rollOutShippDetails.setBilletNo(x.getBilletNos());
|
|
|
- rollOutShippDetails.setShiftGroup(billetBasicInfo.getShiftGroup());
|
|
|
- rollOutShippDetails.setShift(billetBasicInfo.getShift());
|
|
|
+ rollOutShippDetails.setShiftGroup(x.getShiftGroup());
|
|
|
+ rollOutShippDetails.setShift(x.getShift());
|
|
|
rollOutShippDetails.setStorageBillId(storageBill.getId());
|
|
|
rollOutShippDetails.setStackStorey(x.getLayer());
|
|
|
rollOutShippDetails.setStackNum(x.getAddress());
|
|
@@ -663,7 +781,7 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
rollOutShippDetails.setId(String.valueOf(IdWorker.getId()));
|
|
|
rollOutShippDetails.setCreateTime(new Date());
|
|
|
rollOutShippDetails.setUpdateTime(new Date());
|
|
|
- rollOutShippDetails.setBlankOutput(amountTotal);//出坯量
|
|
|
+ rollOutShippDetails.setBlankOutput(billetWeightTotal);//出坯量
|
|
|
addRollOutShippDetailsList.add(rollOutShippDetails);
|
|
|
}
|
|
|
});
|