|
@@ -423,7 +423,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollClubOne.setId(rollClubOne1.getId());
|
|
|
rollClubOneService.updateById(rollClubOne);
|
|
|
}
|
|
|
- // 保存棒二明细信息
|
|
|
+ // 保存棒一明细信息
|
|
|
List<RollClubOneDetails> rollClubOneDetailsList = new ArrayList<>();
|
|
|
rollClubCommonList.forEach(x ->{
|
|
|
RollClubOneDetails rollClubOneDetails = new RollClubOneDetails();
|
|
@@ -431,6 +431,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollClubOneDetails.setId(String.valueOf(IdWorker.getId()));
|
|
|
rollClubOneDetails.setShift(billetHotsend.getShift());
|
|
|
rollClubOneDetails.setShiftGroup(billetHotsend.getShiftGroup());
|
|
|
+ rollClubOneDetails.setSize(String.valueOf(x.getLength()));
|
|
|
+ rollClubOneDetails.setSteel(x.getGrade());
|
|
|
rollClubOneDetails.setCreateTime(new Date());
|
|
|
billetNos.add(x.getBilletNo());
|
|
|
rollClubOneDetailsList.add(rollClubOneDetails);
|
|
@@ -469,6 +471,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollClubTwoDetails.setShiftGroup(billetHotsend.getShiftGroup());
|
|
|
rollClubTwoDetails.setStorageBillId(storageBill.getId());
|
|
|
rollClubTwoDetails.setLicensePlate(storageBill.getLicensePlate());
|
|
|
+ rollClubTwoDetails.setSize(String.valueOf(x.getLength()));
|
|
|
+ rollClubTwoDetails.setSteel(x.getGrade());
|
|
|
rollClubTwoDetails.setCreateTime(new Date());
|
|
|
billetNos.add(x.getBilletNo());
|
|
|
rollClubTwoDetailsList.add(rollClubTwoDetails);
|
|
@@ -509,6 +513,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollClubThreeDetails.setShiftGroup(billetHotsend.getShiftGroup());
|
|
|
rollClubThreeDetails.setStorageBillId(storageBill.getId());
|
|
|
rollClubThreeDetails.setLicensePlate(storageBill.getLicensePlate());
|
|
|
+ rollClubThreeDetails.setSize(String.valueOf(x.getLength()));
|
|
|
+ rollClubThreeDetails.setSteel(x.getGrade());
|
|
|
rollClubThreeDetails.setCreateTime(new Date());
|
|
|
billetNos.add(x.getBilletNo());
|
|
|
rollClubThreeDetailsList.add(rollClubThreeDetails);
|
|
@@ -547,6 +553,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollHeightDetails.setId(String.valueOf(IdWorker.getId()));
|
|
|
rollHeightDetails.setShift(billetHotsend.getShift());
|
|
|
rollHeightDetails.setShiftGroup(billetHotsend.getShiftGroup());
|
|
|
+ rollHeightDetails.setSize(String.valueOf(x.getLength()));
|
|
|
+ rollHeightDetails.setSteel(x.getGrade());
|
|
|
billetNos.add(x.getBilletNo());
|
|
|
rollHeightDetails.setCreateTime(new Date());
|
|
|
rollHeightDetailsList.add(rollHeightDetails);
|
|
@@ -588,6 +596,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollOutShippDetails.setShiftGroup(billetHotsend.getShiftGroup());
|
|
|
rollOutShippDetails.setStorageBillId(storageBill.getId());
|
|
|
rollOutShippDetails.setLicensePlate(storageBill.getLicensePlate());
|
|
|
+ rollOutShippDetails.setSize(String.valueOf(x.getLength()));
|
|
|
+ rollOutShippDetails.setSteel(x.getGrade());
|
|
|
rollOutShippDetails.setCreateTime(new Date());
|
|
|
billetNos.add(x.getBilletNo());
|
|
|
rollOutShippDetailsList.add(rollOutShippDetails);
|
|
@@ -617,6 +627,15 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
});
|
|
|
billetBasicInfoService.saveOrUpdateBatch(billetBasicInfoList);
|
|
|
|
|
|
+ // 更新装运单 车次总序号、本车车次
|
|
|
+ LambdaQueryWrapper<StorageBill> queryWrapperSB = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapperSB.eq(StorageBill::getId, billetHotsendDetailsVo.getStorageBill().getId());
|
|
|
+ StorageBill storageBillInfo = storageBillService.getOne(queryWrapperSB);
|
|
|
+ // 更新装运单 车次总序号、本车车次
|
|
|
+ storageBill.setTypeConfigId(billetHotsendDetailsVo.getBilletHotsendTypeConfigId()); // 钢坯配置类型ID
|
|
|
+ storageBill.setDestination(billetHotsendDetailsVo.getBelongTypeName());// 目的地
|
|
|
+ storageBill.setAmountTotal(storageBillInfo.getAmountTotal() + rollClubCommonList.size());
|
|
|
+ storageBillService.updateById(storageBill);
|
|
|
result.put("success", "新增钢坯热送成功!");
|
|
|
return result;
|
|
|
}
|
|
@@ -782,6 +801,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollClubOneDetails.setId(String.valueOf(IdWorker.getId()));
|
|
|
rollClubOneDetails.setShift(billetHotsend.getShift());
|
|
|
rollClubOneDetails.setShiftGroup(billetHotsend.getShiftGroup());
|
|
|
+ rollClubOneDetails.setSize(String.valueOf(x.getLength()));
|
|
|
+ rollClubOneDetails.setSteel(x.getGrade());
|
|
|
rollClubOneDetails.setCreateTime(new Date());
|
|
|
billetNos.add(x.getBilletNo());
|
|
|
rollClubOneDetailsList.add(rollClubOneDetails);
|
|
@@ -820,6 +841,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollClubTwoDetails.setShiftGroup(billetHotsend.getShiftGroup());
|
|
|
rollClubTwoDetails.setStorageBillId(storageBill.getId());
|
|
|
rollClubTwoDetails.setLicensePlate(storageBill.getLicensePlate());
|
|
|
+ rollClubTwoDetails.setSize(String.valueOf(x.getLength()));
|
|
|
+ rollClubTwoDetails.setSteel(x.getGrade());
|
|
|
rollClubTwoDetails.setCreateTime(new Date());
|
|
|
billetNos.add(x.getBilletNo());
|
|
|
rollClubTwoDetailsList.add(rollClubTwoDetails);
|
|
@@ -860,6 +883,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollClubThreeDetails.setStorageBillId(storageBill.getId());
|
|
|
rollClubThreeDetails.setLicensePlate(storageBill.getLicensePlate());
|
|
|
rollClubThreeDetails.setCreateTime(new Date());
|
|
|
+ rollClubThreeDetails.setSize(String.valueOf(x.getLength()));
|
|
|
+ rollClubThreeDetails.setSteel(x.getGrade());
|
|
|
billetNos.add(x.getBilletNo());
|
|
|
rollClubThreeDetailsList.add(rollClubThreeDetails);
|
|
|
});
|
|
@@ -897,6 +922,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollHeightDetails.setShift(billetHotsend.getShift());
|
|
|
rollHeightDetails.setShiftGroup(billetHotsend.getShiftGroup());
|
|
|
rollHeightDetails.setCreateTime(new Date());
|
|
|
+ rollHeightDetails.setSize(String.valueOf(x.getLength()));
|
|
|
+ rollHeightDetails.setSteel(x.getGrade());
|
|
|
billetNos.add(x.getBilletNo());
|
|
|
rollHeightDetailsList.add(rollHeightDetails);
|
|
|
});
|
|
@@ -937,6 +964,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollOutShippDetails.setStorageBillId(storageBill.getId());
|
|
|
rollOutShippDetails.setLicensePlate(storageBill.getLicensePlate());
|
|
|
rollOutShippDetails.setCreateTime(new Date());
|
|
|
+ rollOutShippDetails.setSize(String.valueOf(x.getLength()));
|
|
|
+ rollOutShippDetails.setSteel(x.getGrade());
|
|
|
billetNos.add(x.getBilletNo());
|
|
|
rollOutShippDetailsList.add(rollOutShippDetails);
|
|
|
});
|
|
@@ -967,15 +996,12 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
|
|
|
// 更新装运单 车次总序号、本车车次
|
|
|
LambdaQueryWrapper<StorageBill> queryWrapperSB = new LambdaQueryWrapper<>();
|
|
|
- queryWrapperSB.eq(StorageBill::getCcmNo, storageBill.getCcmNo())
|
|
|
- .eq(StorageBill::getShift, storageBill.getShift())
|
|
|
- .eq(StorageBill::getShiftGroup, storageBill.getShiftGroup())
|
|
|
- .eq(StorageBill::getLicensePlate, storageBill.getLicensePlate());
|
|
|
- List<StorageBill> storageBillList = storageBillService.list(queryWrapperSB);
|
|
|
- storageBill.setCarNum(oConvertUtils.listIsEmpty(storageBillList) ? 0 : storageBillList.size() + 1);// 本车车次
|
|
|
+ queryWrapperSB.eq(StorageBill::getId, billetHotsendDetailsVo.getStorageBill().getId());
|
|
|
+ StorageBill storageBillInfo = storageBillService.getOne(queryWrapperSB);
|
|
|
+
|
|
|
storageBill.setTypeConfigId(billetHotsendDetailsVo.getBilletHotsendTypeConfigId()); // 钢坯配置类型ID
|
|
|
- storageBill.setDestination(billetHotsendDetailsVo.getStorageBill().getDestination());// 目的地
|
|
|
- storageBill.setAmountTotal(rollClubCommonList.size());
|
|
|
+ storageBill.setDestination(billetHotsendDetailsVo.getBelongTypeName());// 目的地
|
|
|
+ storageBill.setAmountTotal(storageBillInfo.getAmountTotal() + rollClubCommonList.size());
|
|
|
storageBill.setOutTime(new Date());
|
|
|
storageBillService.updateById(storageBill);
|
|
|
// 生成储运单
|