From 14d5a21b872f75330a14a603355a38e38750173a Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 29 Jul 2026 18:51:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=AE=A2=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8B=89=E5=8F=96=EF=BC=9A=E9=80=82=E9=85=8D=E9=85=8D?=
 =?UTF-8?q?=E4=BB=B6=E5=9E=8B=E5=8F=B7=E8=B7=9F=E8=AE=A1=E9=87=8F=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orderImport/producing/ProducingOrderConverter.java      | 6 ++++--
 .../orderImport/producing/dto/ProducingOrderResponse.java   | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/producing/ProducingOrderConverter.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/producing/ProducingOrderConverter.java
index 320b7a24f..e6692c9ea 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/producing/ProducingOrderConverter.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/producing/ProducingOrderConverter.java
@@ -958,7 +958,8 @@ public class ProducingOrderConverter {
             target.setName(part.getName());
             target.setType(SEAL_PART_GROUP.equals(part.getGroup())
                     ? SEAL_PART_GROUP : part.getGroup());
-            target.setModel(empty(material.getModel()));
+            // 配件型号。
+            target.setModel(empty(part.getModel()));
             boolean sealPart = SEAL_PART_GROUP.equals(part.getGroup());
             target.setSpec(empty(material.getSpec()));
             // 对方 width/length/height 对应原导入结构的宽/长/厚。
@@ -969,7 +970,8 @@ public class ProducingOrderConverter {
             target.setColor(partColor(material));
             target.setBrand(empty(material.getBrand()));
             target.setFactory(empty(material.getFactory()));
-            target.setUnit("0");
+            // 配件计量单位。
+            target.setUnit(empty(part.getUnit()));
             target.setNum(part.getQuantity() == null ? 1D : part.getQuantity());
             int partType = defaultPartType(part.getType());
             target.setIsComposite(partType == 1 || partType == 2);
diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/producing/dto/ProducingOrderResponse.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/producing/dto/ProducingOrderResponse.java
index 1dcfdd4dc..a0103797b 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/producing/dto/ProducingOrderResponse.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/producing/dto/ProducingOrderResponse.java
@@ -164,6 +164,11 @@ public class ProducingOrderResponse {
         private String materialId;
         private Integer type;
         private String group;
+        /**
+         * 配件型号和计量单位。
+         */
+        private String model;
+        private String unit;
         private Double quantity;
         /**
          * 对方配件定义的长、宽、高；转换层适配到原拆单结构的宽、长、厚字段。