From 87e5ae247f56498302e29c17f624137da393fe56 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Mon, 3 Aug 2026 17:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=8B=89=E5=8F=96=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?externalMaterialMapping?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orderImport/ProducingOrderImportTransactionalService.java | 2 +-
 .../src/main/resources/application-dev.yaml                   | 4 ++--
 .../src/main/resources/application-local.yaml                 | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/ProducingOrderImportTransactionalService.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/ProducingOrderImportTransactionalService.java
index d5ef93a5b..c0b413b0f 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/ProducingOrderImportTransactionalService.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/ProducingOrderImportTransactionalService.java
@@ -160,7 +160,7 @@ public class ProducingOrderImportTransactionalService {
                 .extra(buildOrderExtraRequest(order, sourceOrderId))
                 .blocks(serialNoRequest.getBlocks())
                 .parts(serialNoRequest.getParts())
-//                .externalMaterialMapping(serialNoRequest.getExternalMaterialMapping())
+                .externalMaterialMapping(serialNoRequest.getExternalMaterialMapping())
                 .build();
     }
 
diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/application-dev.yaml b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/application-dev.yaml
index a037584dd..4bb96f2a9 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/application-dev.yaml
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/application-dev.yaml
@@ -165,8 +165,8 @@ chenfeng:
     publicKey: cfimes
   plan:
     producing-order:
-      order-url: http://proc.mes.cf/api-branch=opt_split_order/api/v1/producing/order/{id}
-      order-extra-url: http://proc.mes.cf/api-branch=opt_split_order/api/v1/producing/order/{id}/extra
+      order-url: https://chenfeng.tech:38113/api-branch=opt_split_order/api/v1/producing/order/{id}
+      order-extra-url: https://chenfeng.tech:38113/api-branch=opt_split_order/api/v1/producing/order/{id}/extra
       connect-timeout: 5s
       read-timeout: 60s
       sync-read-timeout: 10s
diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/application-local.yaml b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/application-local.yaml
index c6a4a00a3..eaa4195f8 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/application-local.yaml
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/resources/application-local.yaml
@@ -193,8 +193,8 @@ chenfeng:
     publicKey: cfimes
   plan:
     producing-order:
-      order-url: http://proc.mes.cf/api-branch=opt_split_order/api/v1/producing/order/{id}
-      order-extra-url: http://proc.mes.cf/api-branch=opt_split_order/api/v1/producing/order/{id}/extra
+      order-url: https://chenfeng.tech:38113/api-branch=opt_split_order/api/v1/producing/order/{id}
+      order-extra-url: https://chenfeng.tech:38113/api-branch=opt_split_order/api/v1/producing/order/{id}/extra
       connect-timeout: 5s
       read-timeout: 60s
       sync-read-timeout: 10s