免检物料空指针错误修改
This commit is contained in:
parent
5f0f7f616f
commit
6e6d36fa07
|
|
@ -514,7 +514,8 @@ public class NormalPGIController extends BaseController {
|
||||||
//同步箱码信息到物料码中
|
//同步箱码信息到物料码中
|
||||||
List<WmsQrCodeMaster> parents = qrCodeMasters
|
List<WmsQrCodeMaster> parents = qrCodeMasters
|
||||||
.stream()
|
.stream()
|
||||||
.filter(qrCode -> qrCode.getPackagingType() == 1)
|
// .filter(qrCode -> qrCode.getPackagingType() == 1)
|
||||||
|
.filter(qrCode -> qrCode.getPackagingType() != null && qrCode.getPackagingType() == 1)
|
||||||
.toList();
|
.toList();
|
||||||
List<WmsQrCodeMaster> children = qrCodeMasterService.lambdaQuery()
|
List<WmsQrCodeMaster> children = qrCodeMasterService.lambdaQuery()
|
||||||
.in(WmsQrCodeMaster::getParentBarcodeId, parents
|
.in(WmsQrCodeMaster::getParentBarcodeId, parents
|
||||||
|
|
@ -523,6 +524,7 @@ public class NormalPGIController extends BaseController {
|
||||||
.toList()
|
.toList()
|
||||||
)
|
)
|
||||||
.list();
|
.list();
|
||||||
|
|
||||||
parents.forEach(p -> {
|
parents.forEach(p -> {
|
||||||
children.stream()
|
children.stream()
|
||||||
.filter(c -> c.getParentBarcodeId().equals(p.getId()))
|
.filter(c -> c.getParentBarcodeId().equals(p.getId()))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue