|
@@ -1501,7 +1501,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
}
|
|
}
|
|
List<BilletLiftingBill> billetLiftingBillList = billetLiftingBillService.list(queryWrapper2);
|
|
List<BilletLiftingBill> billetLiftingBillList = billetLiftingBillService.list(queryWrapper2);
|
|
if (oConvertUtils.listIsEmpty(billetLiftingBillList)){
|
|
if (oConvertUtils.listIsEmpty(billetLiftingBillList)){
|
|
- log.info("{}{}", "查询当班行车吊运信息为空!", ccmNo + "失败时间:" + new Date());
|
|
|
|
return onDutyLiftingBillInfo;
|
|
return onDutyLiftingBillInfo;
|
|
}
|
|
}
|
|
List<String> vehicleNumberList = billetLiftingBillList.stream().map(BilletLiftingBill::getVehicleNumber).collect(Collectors.toList());
|
|
List<String> vehicleNumberList = billetLiftingBillList.stream().map(BilletLiftingBill::getVehicleNumber).collect(Collectors.toList());
|
|
@@ -1624,7 +1623,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
}
|
|
}
|
|
List<StorageBill> storageBillList = baseMapper.selectList(queryWrapper2);
|
|
List<StorageBill> storageBillList = baseMapper.selectList(queryWrapper2);
|
|
if (oConvertUtils.listIsEmpty(storageBillList)){
|
|
if (oConvertUtils.listIsEmpty(storageBillList)){
|
|
- log.info("{}{}", "查询当班装运单信息为空!", ccmNo);
|
|
|
|
return onDutyStorageBill;
|
|
return onDutyStorageBill;
|
|
}
|
|
}
|
|
List<OnDutyStorageBillInfo> onDutyStorageBillInfos = new ArrayList<>();
|
|
List<OnDutyStorageBillInfo> onDutyStorageBillInfos = new ArrayList<>();
|
|
@@ -1740,7 +1738,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
}
|
|
}
|
|
List<StorageBill> storageBillList = baseMapper.selectList(queryWrapper2);
|
|
List<StorageBill> storageBillList = baseMapper.selectList(queryWrapper2);
|
|
if (oConvertUtils.listIsEmpty(storageBillList)){
|
|
if (oConvertUtils.listIsEmpty(storageBillList)){
|
|
- log.info("{}{}", "查询当班装运单信息为空!", ccmNo);
|
|
|
|
return onDutyStorageBillStatistics;
|
|
return onDutyStorageBillStatistics;
|
|
}
|
|
}
|
|
int allCarNum = storageBillList.size();
|
|
int allCarNum = storageBillList.size();
|
|
@@ -2481,7 +2478,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
.last("limit 1");
|
|
.last("limit 1");
|
|
billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
|
|
billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
|
|
if (billetHotsendChangeShift == null){
|
|
if (billetHotsendChangeShift == null){
|
|
- log.info("查询当班装运单信息失败,交班记录为空!{} 失败时间:{}", ccmNo, new Date());
|
|
|
|
return storageBillStatistics;
|
|
return storageBillStatistics;
|
|
}
|
|
}
|
|
}else {
|
|
}else {
|
|
@@ -2490,14 +2486,11 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
queryWrapper.eq(BilletHotsendChangeShift::getId, changeShiftId).eq(BilletHotsendChangeShift::getCcmNo, ccmNo);
|
|
queryWrapper.eq(BilletHotsendChangeShift::getId, changeShiftId).eq(BilletHotsendChangeShift::getCcmNo, ccmNo);
|
|
billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
|
|
billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
|
|
if (billetHotsendChangeShift == null){
|
|
if (billetHotsendChangeShift == null){
|
|
- log.info("查询当班历史装运单信息失败,交班记录为空!{} 失败时间:{}", ccmNo, new Date());
|
|
|
|
return storageBillStatistics;
|
|
return storageBillStatistics;
|
|
}
|
|
}
|
|
shiftGroup = billetHotsendChangeShift.getShiftGroup();
|
|
shiftGroup = billetHotsendChangeShift.getShiftGroup();
|
|
shift = billetHotsendChangeShift.getShift();
|
|
shift = billetHotsendChangeShift.getShift();
|
|
}
|
|
}
|
|
- log.info("{}{}", "当班班组班别:", shiftGroup+"#"+shift);
|
|
|
|
- log.info("{}{}", "当班信息:", JSON.toJSON(billetHotsendChangeShift));
|
|
|
|
|
|
|
|
storageBillStatistics.setShift(ShiftEnum.fromCode(shift).name());
|
|
storageBillStatistics.setShift(ShiftEnum.fromCode(shift).name());
|
|
storageBillStatistics.setShiftGroup(ShiftGroupEnum.fromCode(shiftGroup).name());
|
|
storageBillStatistics.setShiftGroup(ShiftGroupEnum.fromCode(shiftGroup).name());
|
|
@@ -2517,7 +2510,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
}
|
|
}
|
|
List<StorageBill> storageBillList = baseMapper.selectList(queryWrapper2);
|
|
List<StorageBill> storageBillList = baseMapper.selectList(queryWrapper2);
|
|
if (oConvertUtils.listIsEmpty(storageBillList)){
|
|
if (oConvertUtils.listIsEmpty(storageBillList)){
|
|
- log.info("{}{}", "查询当班装运单信息为空!", ccmNo);
|
|
|
|
storageBillStatistics.setStorageSum(0);
|
|
storageBillStatistics.setStorageSum(0);
|
|
storageBillStatistics.setStorageTotalWeight(0.0);
|
|
storageBillStatistics.setStorageTotalWeight(0.0);
|
|
storageBillStatistics.setRollClubTwoSum(0);
|
|
storageBillStatistics.setRollClubTwoSum(0);
|
|
@@ -2539,7 +2531,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
List<RollClubThreeDetails> rollClubThreeDetailsListAll = new ArrayList<>();
|
|
List<RollClubThreeDetails> rollClubThreeDetailsListAll = new ArrayList<>();
|
|
List<RollOutShippDetails> rollOutShippDetailsListAll = new ArrayList<>();
|
|
List<RollOutShippDetails> rollOutShippDetailsListAll = new ArrayList<>();
|
|
|
|
|
|
- log.info("{}{}", "当班所有装运单信息:", JSON.toJSON(storageBillList));
|
|
|
|
for (StorageBill storageBill : storageBillList) {
|
|
for (StorageBill storageBill : storageBillList) {
|
|
if ("棒二".equals(storageBill.getDestination())) {
|
|
if ("棒二".equals(storageBill.getDestination())) {
|
|
LambdaQueryWrapper<RollClubTwoDetails> queryWrapper3 = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<RollClubTwoDetails> queryWrapper3 = new LambdaQueryWrapper<>();
|
|
@@ -2698,7 +2689,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
.last("limit 1");
|
|
.last("limit 1");
|
|
billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
|
|
billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
|
|
if (billetHotsendChangeShift == null){
|
|
if (billetHotsendChangeShift == null){
|
|
- log.info("{}{}", "查询当班定尺明细,明细记录为空!", ccmNo + "失败时间:" + new Date());
|
|
|
|
return list;
|
|
return list;
|
|
}
|
|
}
|
|
}else {
|
|
}else {
|
|
@@ -6974,7 +6964,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
.last("limit 1");
|
|
.last("limit 1");
|
|
billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
|
|
billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
|
|
if (billetHotsendChangeShift == null){
|
|
if (billetHotsendChangeShift == null){
|
|
- log.info("{}{}", "查询当班装运单信息失败,交班记录为空!", ccmNo + "失败时间:" + new Date());
|
|
|
|
return onDutyColdChargeVo;
|
|
return onDutyColdChargeVo;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -7083,7 +7072,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
.last("limit 1");
|
|
.last("limit 1");
|
|
billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
|
|
billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
|
|
if (billetHotsendChangeShift == null){
|
|
if (billetHotsendChangeShift == null){
|
|
- log.info("{}{}", "查询当班装运单信息失败,交班记录为空!", ccmNo + "失败时间:" + new Date());
|
|
|
|
return onDutySteelVo;
|
|
return onDutySteelVo;
|
|
}
|
|
}
|
|
}else {
|
|
}else {
|
|
@@ -7092,7 +7080,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
queryWrapper.eq(BilletHotsendChangeShift::getId, changeShiftId).eq(BilletHotsendChangeShift::getCcmNo, ccmNo);
|
|
queryWrapper.eq(BilletHotsendChangeShift::getId, changeShiftId).eq(BilletHotsendChangeShift::getCcmNo, ccmNo);
|
|
billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
|
|
billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
|
|
if (billetHotsendChangeShift == null){
|
|
if (billetHotsendChangeShift == null){
|
|
- log.info("{}{}", "查询历史当班装运单信息失败,交班记录为空!", ccmNo + "失败时间:" + new Date());
|
|
|
|
return onDutySteelVo;
|
|
return onDutySteelVo;
|
|
}
|
|
}
|
|
shiftGroup = billetHotsendChangeShift.getShiftGroup();
|
|
shiftGroup = billetHotsendChangeShift.getShiftGroup();
|