|
@@ -752,19 +752,11 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
x.setBhtcId(loadingParams.getDestinationId());
|
|
|
});
|
|
|
billetBasicInfoService.saveOrUpdateBatch(billetBasicInfoList);
|
|
|
- // 6 更新装运单 storage_bill 新增储运信息
|
|
|
- storageBill.setTypeConfigId(loadingParams.getDestinationId()); // 钢坯配置类型ID
|
|
|
- storageBill.setDestination(loadingParams.getDestination());// 目的地
|
|
|
- storageBill.setAmountTotal(storageBill.getAmountTotal() + stackingAndLoadingVehiclesList.size() * 4);
|
|
|
- storageBill.setOutTime(new Date());
|
|
|
- storageBillService.updateById(storageBill);
|
|
|
- // 7 发车后,新增钢坯堆垛储运信息,生成储运单 storage_car_log
|
|
|
- StorageCarLog storageCarLog = new StorageCarLog();
|
|
|
- BeanUtils.copyProperties(storageBill, storageCarLog);
|
|
|
+
|
|
|
+ //根据铸机号、钢坯转运单ID查询定尺信息
|
|
|
List<String> sizeList = new ArrayList<>();
|
|
|
List<String> heatNoList = new ArrayList<>();
|
|
|
long count = 0l;
|
|
|
- //根据铸机号、钢坯转运单ID查询定尺信息
|
|
|
if ("roll_club_two".equals(loadingParams.getDestinationTable())){
|
|
|
LambdaQueryWrapper<RollClubTwoDetails> queryWrapperRC = new LambdaQueryWrapper();
|
|
|
queryWrapperRC.eq(RollClubTwoDetails::getCcmNo, storageBill.getCcmNo()).eq(RollClubTwoDetails::getStorageBillId, storageBill.getId());
|
|
@@ -801,10 +793,22 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
count = rollOutShippDetailsList.stream().count();
|
|
|
}
|
|
|
}
|
|
|
- Integer bx =Integer.valueOf((int) count);
|
|
|
+ // 6 更新装运单 storage_bill 新增储运信息
|
|
|
+ storageBill.setSize(String.join(",", sizeList));
|
|
|
+ storageBill.setTypeConfigId(loadingParams.getDestinationId()); // 钢坯配置类型ID
|
|
|
+ storageBill.setDestination(loadingParams.getDestination());// 目的地
|
|
|
+ storageBill.setAmountTotal(storageBill.getAmountTotal() + stackingAndLoadingVehiclesList.size() * 4);
|
|
|
+ storageBill.setOutTime(new Date());
|
|
|
+ storageBillService.updateById(storageBill);
|
|
|
+ // 7 发车后,新增钢坯堆垛储运信息,生成储运单 storage_car_log
|
|
|
+ StorageCarLog storageCarLog = new StorageCarLog();
|
|
|
+ BeanUtils.copyProperties(storageBill, storageCarLog);
|
|
|
+
|
|
|
LambdaQueryWrapper<StackingDownLog> queryWrappersd = new LambdaQueryWrapper();
|
|
|
queryWrappersd.eq(StackingDownLog::getCcmNo, storageBill.getCcmNo()).eq(StackingDownLog::getStorageBillId, storageBill.getId());
|
|
|
List<StackingDownLog> stackingDownLogs = stackingDownLogService.list(queryWrappersd);
|
|
|
+
|
|
|
+ Integer bx =Integer.valueOf((int) count);
|
|
|
Integer dd = stackingDownLogs.size() * 4 + bx;
|
|
|
storageCarLog.setDestination(loadingParams.getDestination());// 目的地
|
|
|
storageCarLog.setCarNm(storageBill.getLicensePlate());// 车牌号
|