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