From 512c3f97f9b0bc4077ed1b7b2717b7d8c6aa5d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 4 Jun 2026 18:02:49 +0800 Subject: [PATCH] =?UTF-8?q?refactor(shipment):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BC=A0=E8=BE=93=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将BomMaterialDTO替换为MaterialMainDTO以获取物料信息 - 修改CompleteSetOfEquipmentLabelPrintingController中的物料描述逻辑 - 统一物料信息服务调用的数据类型定义 --- .../CompleteSetOfEquipmentLabelPrintingController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/CompleteSetOfEquipmentLabelPrintingController.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/CompleteSetOfEquipmentLabelPrintingController.java index f88d23f6..3188c9df 100644 --- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/CompleteSetOfEquipmentLabelPrintingController.java +++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/CompleteSetOfEquipmentLabelPrintingController.java @@ -16,6 +16,7 @@ import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.dto.BomMaterialDTO; import com.nflg.wms.common.pojo.dto.CompleteSetOfEquipmentLabelPrintingDeliveryItemExcelExportDTO; import com.nflg.wms.common.pojo.dto.CompleteSetOfEquipmentLabelPrintingMaterialExcelExportDTO; +import com.nflg.wms.common.pojo.dto.MaterialMainDTO; import com.nflg.wms.common.pojo.qo.*; import com.nflg.wms.common.pojo.vo.CompleteSetOfEquipmentLabelPrintingDeliveryItemVO; import com.nflg.wms.common.pojo.vo.CompleteSetOfEquipmentLabelPrintingMaterialVO; @@ -368,7 +369,7 @@ public class CompleteSetOfEquipmentLabelPrintingController extends BaseControlle String materialDescribe = ""; if (sb.length() == 0) { - BomMaterialDTO materialInfo = bomMaterialService.getMaterialInfo(materialNo); + MaterialMainDTO materialInfo = bomMaterialService.getMaterialInfo(materialNo); if (materialInfo == null) { sb.append("物料号不存在;"); } else { @@ -705,7 +706,7 @@ public class CompleteSetOfEquipmentLabelPrintingController extends BaseControlle String materialDescribe = ""; if (sb.length() == 0) { - BomMaterialDTO materialInfo = bomMaterialService.getMaterialInfo(materialNo); + MaterialMainDTO materialInfo = bomMaterialService.getMaterialInfo(materialNo); if (materialInfo == null) { sb.append("物料号不存在;"); } else {