From e9df9c3841ebc28d535eef88b8edf933cb4cd187 Mon Sep 17 00:00:00 2001 From: zhou-hongcheng <1064771933@qq.com> Date: Tue, 17 Mar 2026 21:57:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E6=B2=A1=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E4=B9=9F=E5=8F=AF=E4=BB=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StockShelfOrderDomainService.java | 69 +++++++++---------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java index ad676f8ae..11e18b3fd 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java @@ -645,9 +645,6 @@ public class StockShelfOrderDomainService { .map(BatchDetailPO::getFieldName) .collect(Collectors.toList()); } - if (fieldNames.size() == 0) { - throw new ServiceException("批次信息不存在"); - } Long shipperId = stockReceiptOrderDO.getShipperId(); MaterialInventory param = getParam(shelfMaterialDetail, fieldNames, shipperId); List materialInventoryPOS = materialInventoryMapper.selectListByWhere(param); @@ -932,38 +929,40 @@ public class StockShelfOrderDomainService { param.setStorageLocationId(shelfMaterialDetail.getStorageLocationId()); param.setOrganizationId(shelfMaterialDetail.getOrganizationId()); param.setBatchNumber(shelfMaterialDetail.getBatchNumber()); - for (String fieldName : fieldNames) { - switch (fieldName) { - case "ext_attr_4": - param.setExtAttr4(shelfMaterialDetail.getExtAttr4()); - break; - case "ext_attr_3": - param.setExtAttr3(shelfMaterialDetail.getExtAttr3()); - break; - case "ext_attr_2": - param.setExtAttr2(shelfMaterialDetail.getExtAttr2()); - break; - case "ext_attr_1": - param.setExtAttr1(shelfMaterialDetail.getExtAttr1()); - break; - case "box_pallet_no": - param.setBoxPalletNo(shelfMaterialDetail.getBoxPalletNo()); - break; - case "sheet_ref_no": - param.setSheetRefNo(shelfMaterialDetail.getSheetRefNo()); - break; - case "batch_ref_no": - param.setBatchRefNo(shelfMaterialDetail.getBatchRefNo()); - break; - case "inventory_date": - param.setInventoryDate(shelfMaterialDetail.getInventoryDate()); - break; - case "expiry_date": - param.setExpiryDate(shelfMaterialDetail.getExpiryDate()); - break; - case "production_date": - param.setProductionDate(shelfMaterialDetail.getProductionDate()); - break; + if (fieldNames.size() > 0) { + for (String fieldName : fieldNames) { + switch (fieldName) { + case "ext_attr_4": + param.setExtAttr4(shelfMaterialDetail.getExtAttr4()); + break; + case "ext_attr_3": + param.setExtAttr3(shelfMaterialDetail.getExtAttr3()); + break; + case "ext_attr_2": + param.setExtAttr2(shelfMaterialDetail.getExtAttr2()); + break; + case "ext_attr_1": + param.setExtAttr1(shelfMaterialDetail.getExtAttr1()); + break; + case "box_pallet_no": + param.setBoxPalletNo(shelfMaterialDetail.getBoxPalletNo()); + break; + case "sheet_ref_no": + param.setSheetRefNo(shelfMaterialDetail.getSheetRefNo()); + break; + case "batch_ref_no": + param.setBatchRefNo(shelfMaterialDetail.getBatchRefNo()); + break; + case "inventory_date": + param.setInventoryDate(shelfMaterialDetail.getInventoryDate()); + break; + case "expiry_date": + param.setExpiryDate(shelfMaterialDetail.getExpiryDate()); + break; + case "production_date": + param.setProductionDate(shelfMaterialDetail.getProductionDate()); + break; + } } } return param;