|
@@ -2419,7 +2419,8 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
for (StorageBill storageBill : storageBillList) {
|
|
|
if ("棒二".equals(storageBill.getDestination())) {
|
|
|
LambdaQueryWrapper<RollClubTwoDetails> queryWrapper3 = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper3.eq(RollClubTwoDetails::getCcmNo, ccmNo).eq(RollClubTwoDetails::getStorageBillId, storageBill.getId());
|
|
|
+ queryWrapper3.eq(RollClubTwoDetails::getCcmNo, ccmNo).eq(RollClubTwoDetails::getStorageBillId, storageBill.getId())
|
|
|
+ .eq(RollClubTwoDetails::getShift, shift).eq(RollClubTwoDetails::getShiftGroup, shiftGroup);
|
|
|
List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(queryWrapper3);
|
|
|
if (oConvertUtils.listIsNotEmpty(rollClubTwoDetailsList)) {
|
|
|
rollClubTwoDetailsListAll.addAll(rollClubTwoDetailsList);
|
|
@@ -2428,7 +2429,8 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
|
|
|
if ("棒三".equals(storageBill.getDestination())) {
|
|
|
LambdaQueryWrapper<RollClubThreeDetails> queryWrapper3 = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper3.eq(RollClubThreeDetails::getCcmNo, ccmNo).eq(RollClubThreeDetails::getStorageBillId, storageBill.getId());
|
|
|
+ queryWrapper3.eq(RollClubThreeDetails::getCcmNo, ccmNo).eq(RollClubThreeDetails::getStorageBillId, storageBill.getId())
|
|
|
+ .eq(RollClubThreeDetails::getShift, shift).eq(RollClubThreeDetails::getShiftGroup, shiftGroup);
|
|
|
List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(queryWrapper3);
|
|
|
if (oConvertUtils.listIsNotEmpty(rollClubThreeDetailsList)) {
|
|
|
rollClubThreeDetailsListAll.addAll(rollClubThreeDetailsList);
|
|
@@ -2437,7 +2439,8 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
|
|
|
if ("上若".equals(storageBill.getDestination())) {
|
|
|
LambdaQueryWrapper<RollOutShippDetails> queryWrapper3 = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper3.eq(RollOutShippDetails::getCcmNo, ccmNo).eq(RollOutShippDetails::getStorageBillId, storageBill.getId());
|
|
|
+ queryWrapper3.eq(RollOutShippDetails::getCcmNo, ccmNo).eq(RollOutShippDetails::getStorageBillId, storageBill.getId())
|
|
|
+ .eq(RollOutShippDetails::getShift, shift).eq(RollOutShippDetails::getShiftGroup, shiftGroup);
|
|
|
List<RollOutShippDetails> rollOutShippDetailsList = rollOutShippDetailsService.list(queryWrapper3);
|
|
|
if (oConvertUtils.listIsNotEmpty(rollOutShippDetailsList)) {
|
|
|
rollOutShippDetailsListAll.addAll(rollOutShippDetailsList);
|