From e47b1d621bcc649cfbe55e6a1c82b49547b0c332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 9 May 2026 14:48:18 +0800 Subject: [PATCH] =?UTF-8?q?refactor(shipment):=20=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E4=BB=A5?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将BomMaterialDTO替换为MaterialMainDTO，统一物料信息的数据结构 - 修改ShipmentMaterialControllerService中物料信息获取及匹配逻辑 - 更新ShipmentMaterialZipImportProcessor中物料编号处理和信息获取代码 - 增加了MaterialMainDTO相关的引入，移除对旧类型的依赖 --- .../admin/service/QmsPdiTaskRecordControllerService.java | 1 + .../processor/ShipmentMaterialZipImportProcessor.java | 3 ++- .../shipment/service/ShipmentMaterialControllerService.java | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java index 6222cb17..b92f9eba 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPdiTaskRecordControllerService.java @@ -12,6 +12,7 @@ import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordDetailVO; import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordDefectPageVO; import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordPageVO; import com.nflg.wms.common.pojo.vo.QmsPdiTaskRecordSummaryVO; +import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.repository.entity.QmsPdiDetectionRules; import com.nflg.wms.repository.entity.QmsPdiDetectionRulesDeliveryItem; import com.nflg.wms.repository.entity.QmsPdiDetectionRulesStatusItem; diff --git a/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/ShipmentMaterialZipImportProcessor.java b/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/ShipmentMaterialZipImportProcessor.java index 448ecd2a..ab46f962 100644 --- a/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/ShipmentMaterialZipImportProcessor.java +++ b/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/ShipmentMaterialZipImportProcessor.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import com.nflg.wms.common.pojo.dto.BomMaterialDTO; +import com.nflg.wms.common.pojo.dto.MaterialMainDTO; import com.nflg.wms.repository.entity.WmsShipmentMaterial; import com.nflg.wms.repository.service.IWmsShipmentMaterialService; import com.nflg.wms.starter.service.BomMaterialService; @@ -66,7 +67,7 @@ public class ShipmentMaterialZipImportProcessor implements BasicProcessor { } String materialNo = name.substring(0, name.lastIndexOf(".")); omsLogger.info("物料编号:{}", materialNo); - BomMaterialDTO bomMaterialDTO = bomMaterialService.getMaterialInfo(materialNo); + MaterialMainDTO bomMaterialDTO = bomMaterialService.getMaterialInfo(materialNo); if (Objects.isNull(bomMaterialDTO)) { omsLogger.error("主数据中未查找到该物料:{}", materialNo); } else { diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/service/ShipmentMaterialControllerService.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/service/ShipmentMaterialControllerService.java index 492fa858..a45a7ce9 100644 --- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/service/ShipmentMaterialControllerService.java +++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/service/ShipmentMaterialControllerService.java @@ -191,7 +191,7 @@ public class ShipmentMaterialControllerService { : new ArrayList<>(); // 从BOM系统获取物料信息 - List bomMaterials = bomMaterialService.getList( + List bomMaterials = bomMaterialService.getList( data.stream().map(ShipmentMaterialExcelImportDTO::getNo).collect(Collectors.toSet()) ); @@ -203,7 +203,7 @@ public class ShipmentMaterialControllerService { if (StrUtil.isBlank(dto.getNo())) { sb.append("物料编号不能为空;"); } else { - BomMaterialDTO bomMaterial = bomMaterials.stream() + MaterialMainDTO bomMaterial = bomMaterials.stream() .filter(m -> StrUtil.equals(dto.getNo(), m.getMaterialNo())) .findFirst() .orElse(null); @@ -300,7 +300,7 @@ public class ShipmentMaterialControllerService { VUtil.trueThrowBusinessError(StrUtil.isBlank(name)).throwMessage("文件名不能为空"); String materialNo = name.substring(0, name.lastIndexOf(".")); - BomMaterialDTO bomMaterialDTO = bomMaterialService.getMaterialInfo(materialNo); + MaterialMainDTO bomMaterialDTO = bomMaterialService.getMaterialInfo(materialNo); if (Objects.isNull(bomMaterialDTO)) { pics.add(name);