diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index c2c2044d..30a192f7 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -223,7 +223,7 @@ public class NormalPGIController extends BaseController { .eq(WmsQrCodeMaster::getBarcodeCode, code.getCodeId()) .one(); VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("无效码【" + code.getCodeId() + "】"); - if (qrCodeMaster.getPackagingType().equals(1)) { + if (qrCodeMaster.getPackagingType() == 1) { code.setCodeNum(BigDecimal.ZERO); List childCode = qrCodeMasterService.lambdaQuery() .eq(WmsQrCodeMaster::getParentBarcodeId, qrCodeMaster.getId()) @@ -557,7 +557,6 @@ public class NormalPGIController extends BaseController { /** * 收货直接入库的(未启用储位管理) - * * @return */ private void setPoReceiveByIn(SrmMaterialReceiptQO item, @@ -1260,7 +1259,8 @@ public class NormalPGIController extends BaseController { WmsPoReceiptItem item = receiptItems.stream() .filter(rit -> rit.getId().equals(qrCodeMaster.getReceiptItemId())) .findFirst() - .get(); + .orElse(null); + VUtil.trueThrowBusinessError(Objects.isNull(item)).throwMessage("未找到二维码对应的订单"); item.setInQty(item.getInQty().add(code.getNum())); item.setCrossQty(item.getCrossQty().add(code.getNum())); }); @@ -1285,7 +1285,7 @@ public class NormalPGIController extends BaseController { .filter(qit -> qit.getReceiptItemId().equals(item.getId())) .toList() .stream() - .map(qit->new InCostCenterBackSubmitItemQRQO() + .map(qit -> new InCostCenterBackSubmitItemQRQO() .setBinNo(item.getStorageLocation()) .setQrCode(qit.getBarcodeCode()) ) @@ -1397,7 +1397,7 @@ public class NormalPGIController extends BaseController { /** * 根据送货单单号和大码的ID获取到具体的物料信息 - * @param request id= 大码的ID + * @param request id= 大码的ID * @return */ @Deprecated