From 1a5a8be205641f5f79dd809f6c7e59fc84d76243 Mon Sep 17 00:00:00 2001
From: yunchai <yunying.chai@capgemini.com>
Date: 星期日, 08 十月 2023 09:11:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev'
---
_Main/BL/EDI/Broker_GlobalOTDTable_CustomOrder.qbl | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/_Main/BL/EDI/Broker_GlobalOTDTable_CustomOrder.qbl b/_Main/BL/EDI/Broker_GlobalOTDTable_CustomOrder.qbl
index 62a47a5..c405497 100644
--- a/_Main/BL/EDI/Broker_GlobalOTDTable_CustomOrder.qbl
+++ b/_Main/BL/EDI/Broker_GlobalOTDTable_CustomOrder.qbl
@@ -21,12 +21,16 @@
EDIMLColumn OrderDate { Attribute: OrderDate ValueType: Date }
EDIMLColumn OrderID { Attribute: OrderID ValueType: String }
EDIMLColumn OrderLineID { Attribute: OrderLineID ValueType: String }
+ EDIMLColumn OrderTime { Attribute: OrderTime ValueType: Date }
EDIMLColumn OrderType { Attribute: OrderType ValueType: String }
EDIMLColumn Price { Attribute: Price ValueType: Real }
EDIMLColumn PriorityName { Attribute: PriorityName ValueType: String }
+ EDIMLColumn ProductGrade { Attribute: ProductGrade ValueType: String }
EDIMLColumn ProductID { Attribute: ProductID ValueType: String }
EDIMLColumn Quantity { Attribute: Quantity ValueType: Real }
EDIMLColumn SalesSegmentName { Attribute: SalesSegmentName ValueType: String }
+ EDIMLColumn SegmentPriority { Attribute: SegmentPriority ValueType: String }
+ EDIMLColumn SheetProfitability { Attribute: SheetProfitability ValueType: String }
EDIMLColumn StockingPointID { Attribute: StockingPointID ValueType: String }
EDIMLColumn UnitOfMeasureName { Attribute: UnitOfMeasureName ValueType: String }
}
@@ -93,7 +97,7 @@
EDIODBCLinkColumn ORDERTIME
{
OthersMayUpdateColumn: true
- ValueType: String
+ ValueType: DateTime
}
EDIODBCLinkColumn ORDERTYPE
{
@@ -184,12 +188,33 @@
}
EDIColumnMatch { InputColumn: ORDERID OutputColumn: OrderID }
EDIColumnMatch { InputColumn: ORDERLINEID OutputColumn: OrderLineID }
- EDIColumnMatch { InputColumn: ORDERTIME OutputColumn: OrderType }
+ EDIColumnMatch
+ {
+ InputColumn: ORDERTIME
+ OutputColumn: OrderTime
+ Converter
+ {
+ XMLDefinition:
+ [*
+ <?xml version="1.0" encoding="UTF-16"?>
+ <DateTimeToDate xmlns="http://www.quintiq.com/GEB/DateTimeToDate" Key="@1">
+ <IsStandard>true</IsStandard>
+ <IsISO>false</IsISO>
+ <IsCustom>false</IsCustom>
+ <ConversionType>0</ConversionType>
+ </DateTimeToDate>
+ *]
+ }
+ }
+ EDIColumnMatch { InputColumn: ORDERTYPE OutputColumn: OrderType }
EDIColumnMatch { InputColumn: PRICE OutputColumn: Price }
EDIColumnMatch { InputColumn: PRIORITYNAME OutputColumn: PriorityName }
+ EDIColumnMatch { InputColumn: PRODUCTGRADE OutputColumn: ProductGrade }
EDIColumnMatch { InputColumn: PRODUCTID OutputColumn: ProductID }
EDIColumnMatch { InputColumn: QUANTITY OutputColumn: Quantity }
EDIColumnMatch { InputColumn: SALESEGMENTNAME OutputColumn: SalesSegmentName }
+ EDIColumnMatch { InputColumn: SEGMENTPRIORITY OutputColumn: SegmentPriority }
+ EDIColumnMatch { InputColumn: SHEETPROFITABILITY OutputColumn: SheetProfitability }
EDIColumnMatch { InputColumn: STOCKINGPOINTID OutputColumn: StockingPointID }
EDIColumnMatch { InputColumn: UNITOFMEASURENAME OutputColumn: UnitOfMeasureName }
}
--
Gitblit v1.9.3