mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
组件拉取业务数据接口恢复externalMaterialMapping
This commit is contained in:
+1
-1
@@ -160,7 +160,7 @@ public class ProducingOrderImportTransactionalService {
|
|||||||
.extra(buildOrderExtraRequest(order, sourceOrderId))
|
.extra(buildOrderExtraRequest(order, sourceOrderId))
|
||||||
.blocks(serialNoRequest.getBlocks())
|
.blocks(serialNoRequest.getBlocks())
|
||||||
.parts(serialNoRequest.getParts())
|
.parts(serialNoRequest.getParts())
|
||||||
// .externalMaterialMapping(serialNoRequest.getExternalMaterialMapping())
|
.externalMaterialMapping(serialNoRequest.getExternalMaterialMapping())
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -165,8 +165,8 @@ chenfeng:
|
|||||||
publicKey: cfimes
|
publicKey: cfimes
|
||||||
plan:
|
plan:
|
||||||
producing-order:
|
producing-order:
|
||||||
order-url: http://proc.mes.cf/api-branch=opt_split_order/api/v1/producing/order/{id}
|
order-url: https://chenfeng.tech:38113/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-extra-url: https://chenfeng.tech:38113/api-branch=opt_split_order/api/v1/producing/order/{id}/extra
|
||||||
connect-timeout: 5s
|
connect-timeout: 5s
|
||||||
read-timeout: 60s
|
read-timeout: 60s
|
||||||
sync-read-timeout: 10s
|
sync-read-timeout: 10s
|
||||||
|
|||||||
+2
-2
@@ -193,8 +193,8 @@ chenfeng:
|
|||||||
publicKey: cfimes
|
publicKey: cfimes
|
||||||
plan:
|
plan:
|
||||||
producing-order:
|
producing-order:
|
||||||
order-url: http://proc.mes.cf/api-branch=opt_split_order/api/v1/producing/order/{id}
|
order-url: https://chenfeng.tech:38113/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-extra-url: https://chenfeng.tech:38113/api-branch=opt_split_order/api/v1/producing/order/{id}/extra
|
||||||
connect-timeout: 5s
|
connect-timeout: 5s
|
||||||
read-timeout: 60s
|
read-timeout: 60s
|
||||||
sync-read-timeout: 10s
|
sync-read-timeout: 10s
|
||||||
|
|||||||
Reference in New Issue
Block a user