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 a2d11812..78912074 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 @@ -705,10 +705,12 @@ public class NormalPGIController extends BaseController { order.getSupplierNum(), item.getItemCode(), item.getPoLineNumber()); VUtil.trueThrowBusinessError(Objects.isNull(materialInfoInOrder)).throwMessage("当前物料信息【" + item.getItemCode() + "】,订单号【" + item.getPoNum() + "】,供应商【" + order.getSupplierName() + "】在SAP中搜索不到有效信息"); + String batchNumber = (materialInfoInOrder.getLbprt().equals("2") + || materialInfoInOrder.getLbprt().equals("4")) ? NoUtil.getBatchNo(order.getSupplierNum()) : ""; qo.setItemName(materialInfoInOrder.getMaktx()); qo.setUomCode(materialInfoInOrder.getMeins()); qo.setReceivedWarehouse(materialInfoInOrder.getWarehouseNo()); - qo.setBatchNumber(NoUtil.getBatchNo(order.getSupplierNum())); + qo.setBatchNumber(batchNumber); qo.setBinNos(materialInfoInOrder.getBinNos()); qo.setTransportNum(materialInfoInOrder.getTransportNum()); qo.setLbprt(materialInfoInOrder.getLbprt()); @@ -878,7 +880,7 @@ public class NormalPGIController extends BaseController { //序列号和批次号验证以及条码信息的组装 Long receiveItemId = IdUtil.getSnowflakeNextId(); List scanCodeQOS = new ArrayList<>(); - List itemCodes = validateNoScanCodes(item, materialInfoInOrder, scanCodeQOS,receiveItemId); + List itemCodes = validateNoScanCodes(item, materialInfoInOrder, scanCodeQOS, receiveItemId); if (CollectionUtil.isNotEmpty(itemCodes)) { codes.addAll(itemCodes); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java index 0dd56e22..3cb9a382 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java @@ -167,7 +167,8 @@ public class NormalPGIControllerService { } - public List validateScanCodes(SrmMaterialReceiptQO item, SAPSyncParamsDTO materialInfoInOrder, Long receiveItemId) { + public List validateScanCodes(SrmMaterialReceiptQO item + , SAPSyncParamsDTO materialInfoInOrder, Long receiveItemId) { String lbprt = materialInfoInOrder.getLbprt(); //判断序列号、批次号是否规范 // 1 - 批次号为空,序列号为空