From 6743d1fccacdbb6d73408a1a515d7e87c4d364be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Sat, 28 Feb 2026 09:36:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E5=8A=A0=E5=B7=A5=E9=87=91?= =?UTF-8?q?=E5=B1=9E=E5=85=83=E7=B4=A0=E5=A4=84=E7=90=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dto/order/OrdDtlDTO.java | 21 ++++++++++++++++--- .../contractorder/api/OrderApiImpl.java | 3 +++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/OrdDtlDTO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/OrdDtlDTO.java index ea9e4b29..a6898384 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/OrdDtlDTO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/OrdDtlDTO.java @@ -91,21 +91,36 @@ public class OrdDtlDTO { /** * 金属元素缩写(PrchOrdDtlDTO.elemAbbr / SalesOrdDtlDTO.elementAbbreviation 统一命名)Y */ - @Schema(description = "金属元素缩写") + @Schema(description = "收货金属元素缩写") private String elementAbbreviation; /** * 金属元素名称(PrchOrdDtlDTO.elemName / SalesOrdDtlDTO.elementName 统一命名)Y */ - @Schema(description = "金属元素名称") + @Schema(description = "收货金属元素名称") private String elementName; /** * 金属元素编码(PrchOrdDtlDTO.elemCdg / SalesOrdDtlDTO.elementNumber 统一命名)Y */ - @Schema(description = "金属元素编码") + @Schema(description = "收货金属元素编码") private String elementCode; + /** + * 发货金属元素缩写 + */ + @Schema(description = "发货金属元素缩写") + private String sendElementAbbreviation; + /** + * 发货金属元素名称 + */ + @Schema(description = "发货金属元素名称") + private String sendElementName; + /** + * 发货金属元素编码 + */ + @Schema(description = "发货金属元素编码") + private String sendElementCode; /** * 是否启用(字典:ERP_CTRT_YN);处理明细中多个相同物料,只能允许一种物料启用(PrchOrdDtlDTO.isEnb / SalesOrdDtlDTO.isEnable 统一命名)Y */ diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java index b141d368..66ea2cf0 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java @@ -488,6 +488,9 @@ public class OrderApiImpl implements OrderApi { ordDtlDTO.setElementAbbreviation(e.getElementAbbreviation()); ordDtlDTO.setElementName(e.getElementName()); ordDtlDTO.setElementCode(e.getElementNumber()); + ordDtlDTO.setSendElementAbbreviation(e.getSendElementAbbreviation()); + ordDtlDTO.setSendElementName(e.getSendElementName()); + ordDtlDTO.setSendElementCode(e.getSendElementNumber()); ordDtlDTO.setIsEnable(e.getIsEnable()); ordDtlDTO.setTaxNum(e.getTaxNumber()); // ordDtlDTO.setLstQty(e.getForecastQuantity());