From 93b4b535d06d9dd71039827e759bfc211c3ff4ef Mon Sep 17 00:00:00 2001
From: yypsybs <yypsybs@foxmail.com>
Date: 星期二, 19 九月 2023 14:13:45 +0800
Subject: [PATCH] PR

---
 _Main/UI/MacroPlannerWebApp/Component_FormPRHistoryData/Component_ListPRHistoryData#844.def |    2 
 _Main/BL/Type_PRData/Attribute_IsLongLeadItem.qbl                                           |    8 ++
 _Main/BL/Type_PRHistoryData/Attribute_SendTimeString.qbl                                    |    7 ++
 _Main/BL/Type_PRData/Attribute_SendTimeString.qbl                                           |    7 ++
 _Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning#662.qbl                                |   11 +++
 _Main/BL/Type_PRData/Attribute_IsPannelMaterial.qbl                                         |    8 ++
 _Main/BL/Type_PRData/Attribute_IsGenericMaterial.qbl                                        |    8 ++
 _Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning.qbl                                    |    3 
 _Main/BL/Type_PRData/Attribute_SendTIme.qbl                                                 |    2 
 _Main/BL/Type_PRHistoryData/Function_CalcReceiveTimeString.qbl                              |   17 +++++
 _Main/BL/Type_PRHistoryData/Attribute_ProduceRequiredDate#168.qbl                           |    2 
 _Main/BL/Type_PRData/Attribute_LeadTime.qbl                                                 |    8 ++
 _Main/UI/MacroPlannerWebApp/Component_Form633/Component_ListPRData#844.def                  |    2 
 _Main/BL/Type_PRData/Attribute_MaterialMRPType.qbl                                          |    8 ++
 _Main/BL/Type_PRHistoryData/Attribute_ReceiveTimeString.qbl                                 |    7 ++
 _Main/BL/Type_ManufactureLTImputation/StaticMethod_NewStaticMethod.qbl                      |    9 +++
 _Main/BL/Type_PRData/Function_CalcSendTimeString.qbl                                        |   18 ++++++
 _Main/BL/Type_PRData/Method_DoCall.qbl                                                      |    2 
 _Main/BL/Type_PRHistoryData/Function_CalcSendTimeString.qbl                                 |   17 +++++
 19 files changed, 139 insertions(+), 7 deletions(-)

diff --git a/_Main/BL/Type_ManufactureLTImputation/StaticMethod_NewStaticMethod.qbl b/_Main/BL/Type_ManufactureLTImputation/StaticMethod_NewStaticMethod.qbl
new file mode 100644
index 0000000..5884b30
--- /dev/null
+++ b/_Main/BL/Type_ManufactureLTImputation/StaticMethod_NewStaticMethod.qbl
@@ -0,0 +1,9 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod NewStaticMethod
+{
+  TextBody:
+  [*
+    // yypsybs Sep-19-2023 (created)
+  *]
+}
diff --git a/_Main/BL/Type_PRData/Attribute_IsGenericMaterial.qbl b/_Main/BL/Type_PRData/Attribute_IsGenericMaterial.qbl
new file mode 100644
index 0000000..587b1bb
--- /dev/null
+++ b/_Main/BL/Type_PRData/Attribute_IsGenericMaterial.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsGenericMaterial
+{
+  #keys: '3[414384.0.847354638][414384.0.847354637][414384.0.847354639]'
+  Description: '鏄惁涓撶敤鏂�'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_PRData/Attribute_IsLongLeadItem.qbl b/_Main/BL/Type_PRData/Attribute_IsLongLeadItem.qbl
new file mode 100644
index 0000000..648713d
--- /dev/null
+++ b/_Main/BL/Type_PRData/Attribute_IsLongLeadItem.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsLongLeadItem
+{
+  #keys: '3[414384.0.847354628][414384.0.847354627][414384.0.847354629]'
+  Description: '鏄惁闀垮懆鏈�'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_PRData/Attribute_IsPannelMaterial.qbl b/_Main/BL/Type_PRData/Attribute_IsPannelMaterial.qbl
new file mode 100644
index 0000000..07d9041
--- /dev/null
+++ b/_Main/BL/Type_PRData/Attribute_IsPannelMaterial.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute IsPannelMaterial
+{
+  #keys: '3[414384.0.847354618][414384.0.847354617][414384.0.847354619]'
+  Description: '闈㈡澘鐗╂枡鏍囪瘑'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_PRData/Attribute_LeadTime.qbl b/_Main/BL/Type_PRData/Attribute_LeadTime.qbl
new file mode 100644
index 0000000..738fe9e
--- /dev/null
+++ b/_Main/BL/Type_PRData/Attribute_LeadTime.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute LeadTime
+{
+  #keys: '3[414384.0.847354658][414384.0.847354657][414384.0.847354659]'
+  Description: '鎻愬墠鏈�'
+  ValueType: Real
+}
diff --git a/_Main/BL/Type_PRData/Attribute_MaterialMRPType.qbl b/_Main/BL/Type_PRData/Attribute_MaterialMRPType.qbl
new file mode 100644
index 0000000..f7ce480
--- /dev/null
+++ b/_Main/BL/Type_PRData/Attribute_MaterialMRPType.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute MaterialMRPType
+{
+  #keys: '3[414384.0.847354648][414384.0.847354647][414384.0.847354649]'
+  Description: '鐗╂枡璁″垝绛栫暐'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_PRData/Attribute_SendTIme.qbl b/_Main/BL/Type_PRData/Attribute_SendTIme.qbl
index 5a26118..767d0b3 100644
--- a/_Main/BL/Type_PRData/Attribute_SendTIme.qbl
+++ b/_Main/BL/Type_PRData/Attribute_SendTIme.qbl
@@ -1,6 +1,6 @@
 Quintiq file version 2.0
 #parent: #root
-Attribute SendTIme
+Attribute SendTime
 {
   #keys: '3[414384.0.789498516][414384.0.789498515][414384.0.789498517]'
   Description: '鍙戦�佹椂闂�'
diff --git a/_Main/BL/Type_PRData/Attribute_SendTimeString.qbl b/_Main/BL/Type_PRData/Attribute_SendTimeString.qbl
new file mode 100644
index 0000000..248a63f
--- /dev/null
+++ b/_Main/BL/Type_PRData/Attribute_SendTimeString.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SendTimeString
+{
+  #keys: '3[414384.0.847354596][414384.0.847354595][414384.0.847354597]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_PRData/Function_CalcSendTimeString.qbl b/_Main/BL/Type_PRData/Function_CalcSendTimeString.qbl
new file mode 100644
index 0000000..4705c8f
--- /dev/null
+++ b/_Main/BL/Type_PRData/Function_CalcSendTimeString.qbl
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcSendTimeString
+{
+  TextBody:
+  [*
+    // yypsybs Sep-19-2023 (created)
+    value := "";
+    if( this.SendStatus() <> "" ) {
+      cnv := DateTimeToString::StandardConverter();
+      cnv.SetCustomConversion();
+      cnv.CustomFormatString( "yyyy/MM/dd H:mm:ss" );
+      
+      value := guard( cnv.Convert( this.SendTime() ), "" );
+    }
+    this.SendTimeString( value );
+  *]
+}
diff --git a/_Main/BL/Type_PRData/Method_DoCall.qbl b/_Main/BL/Type_PRData/Method_DoCall.qbl
index 9c99344..7a3a433 100644
--- a/_Main/BL/Type_PRData/Method_DoCall.qbl
+++ b/_Main/BL/Type_PRData/Method_DoCall.qbl
@@ -53,7 +53,7 @@
     result.ReleaseBy( callBy );
     result.SendTime( DateTime::Now() );
     this.SendStatus( "宸插彂閫�" );
-    this.SendTIme( DateTime::Now() );
+    this.SendTime( DateTime::Now() );
     this.SendBy( callBy );
     
     return result;
diff --git "a/_Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning\043662.qbl" "b/_Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning\043662.qbl"
index a8478db..f2d08bd 100644
--- "a/_Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning\043662.qbl"
+++ "b/_Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning\043662.qbl"
@@ -1,6 +1,7 @@
 Quintiq file version 2.0
 #parent: #root
 StaticMethod FromSupplyPlanning (
+  GlobalOTDTable otdTable,
   MacroPlan macroPlan,
   MacroPlan mappingRoot,
   ProductInStockingPointInPeriod pispip
@@ -17,6 +18,7 @@
     stockingPoint := pisp.StockingPoint_MP();
     period := pispip.Period_MP();
     mappingProduct := MappingProduct::GetByProductId( mappingRoot, product.ID() );
+    matAttrSetting := MatAttrSettingAndPlanStrategy::GetExistByMatCode( otdTable, product.ID() );
     // 鎺ュ彛/涓棿琛ㄦ殏鏃�
     mappingProviderCapacity := "鏆傛棤";
     erpData := "鏆傛棤";
@@ -37,6 +39,12 @@
     result.PRSuggestionDate( ifexpr( (result.ProduceRequiredDate() - Duration::Days( 7 )).Date() >= Date::Today(),
                                      Date::Today(), (result.ProduceRequiredDate() - Duration::Days( 7 )).Date() ) );
     
+    // 鏍规嵁 鐗╂枡灞炴�ф爣绛捐瀹�&鐗╂枡璁″垝绛栫暐
+    result.IsPannelMaterial();
+    result.IsGenericMaterial( matAttrSetting.FlagGeneric() );
+    result.IsLongLeadItem( matAttrSetting.FlagLongTerm() );
+    result.MaterialMRPType( ifexpr( matAttrSetting.PlanningStrategyCustom() <> "", matAttrSetting.PlanningStrategyCustom(), matAttrSetting.PlanningStrategyAuto() ) );
+    
     // 鏍规嵁product涓棿琛�
     result.BusinessType( mappingProduct.BusinessType() );
     result.OrganCode( mappingProduct.OrgCode() );
@@ -45,6 +53,7 @@
     // 鏍规嵁渚涘簲鍟嗚兘鍔涗腑闂磋〃
     result.ProviderCode( mappingProviderCapacity );
     result.ProductName( mappingProviderCapacity );
+    result.LeadTime( 0.0 );
     
     // 鏍规嵁erp鎺ュ彛 鍥哄畾鍊�
     result.RequisitionType( "PURCHASE" );
@@ -68,7 +77,7 @@
     // 鍙戦�佷俊鎭�
     result.SendStatus( "" );
     result.SendBy( "" );
-    result.SendTIme( DateTime::MinDateTime() );
+    result.SendTime( DateTime::MinDateTime() );
     
     return result;
   *]
diff --git a/_Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning.qbl b/_Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning.qbl
index 356fd18..5b37c1c 100644
--- a/_Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning.qbl
+++ b/_Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning.qbl
@@ -1,6 +1,7 @@
 Quintiq file version 2.0
 #parent: #root
 StaticMethod FromSupplyPlanning (
+  GlobalOTDTable otdTable,
   MacroPlan macroPlan,
   MacroPlan mappingRoot,
   String mrpCalverNo
@@ -20,7 +21,7 @@
     if( isnull( oldRecords ) or oldRecords.Size() = 0 ) {
       pispips := ProductInStockingPointInPeriod::GetByMRPCalverNo( macroPlan, mrpCalverNo );
       traverse( pispips, Elements, item ) {
-        PRData::FromSupplyPlanning( macroPlan, mappingRoot, item );
+        PRData::FromSupplyPlanning( otdTable, macroPlan, mappingRoot, item );
       }
     }
   *]
diff --git "a/_Main/BL/Type_PRHistoryData/Attribute_ProduceRequiredDate\043168.qbl" "b/_Main/BL/Type_PRHistoryData/Attribute_ProduceRequiredDate\043168.qbl"
index 606d8a6..56336a7 100644
--- "a/_Main/BL/Type_PRHistoryData/Attribute_ProduceRequiredDate\043168.qbl"
+++ "b/_Main/BL/Type_PRHistoryData/Attribute_ProduceRequiredDate\043168.qbl"
@@ -3,6 +3,6 @@
 Attribute ProduceRequiredDate
 {
   #keys: '3[414384.0.795671764][414384.0.795671763][414384.0.795671765]'
-  Description: '闇�姹傛棩鏈�'
+  Description: '闇�姹傛棩鏈�/浜よ揣鏃ユ湡'
   ValueType: Date
 }
diff --git a/_Main/BL/Type_PRHistoryData/Attribute_ReceiveTimeString.qbl b/_Main/BL/Type_PRHistoryData/Attribute_ReceiveTimeString.qbl
new file mode 100644
index 0000000..173a3be
--- /dev/null
+++ b/_Main/BL/Type_PRHistoryData/Attribute_ReceiveTimeString.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ReceiveTimeString
+{
+  #keys: '3[414384.0.847354678][414384.0.847354677][414384.0.847354679]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_PRHistoryData/Attribute_SendTimeString.qbl b/_Main/BL/Type_PRHistoryData/Attribute_SendTimeString.qbl
new file mode 100644
index 0000000..c6bdcae
--- /dev/null
+++ b/_Main/BL/Type_PRHistoryData/Attribute_SendTimeString.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute SendTimeString
+{
+  #keys: '3[414384.0.847354672][414384.0.847354671][414384.0.847354673]'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_PRHistoryData/Function_CalcReceiveTimeString.qbl b/_Main/BL/Type_PRHistoryData/Function_CalcReceiveTimeString.qbl
new file mode 100644
index 0000000..ede28e5
--- /dev/null
+++ b/_Main/BL/Type_PRHistoryData/Function_CalcReceiveTimeString.qbl
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcReceiveTimeString
+{
+  TextBody:
+  [*
+    // yypsybs Sep-19-2023 (created)
+    
+    cnv := DateTimeToString::StandardConverter();
+    cnv.SetCustomConversion();
+    cnv.CustomFormatString( "yyyy/MM/dd H:mm:ss" );
+    
+    value := guard( cnv.Convert( this.ReceiveTime() ), "" );
+                    
+    this.ReceiveTimeString( value );
+  *]
+}
diff --git a/_Main/BL/Type_PRHistoryData/Function_CalcSendTimeString.qbl b/_Main/BL/Type_PRHistoryData/Function_CalcSendTimeString.qbl
new file mode 100644
index 0000000..803f885
--- /dev/null
+++ b/_Main/BL/Type_PRHistoryData/Function_CalcSendTimeString.qbl
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcSendTimeString
+{
+  TextBody:
+  [*
+    // yypsybs Sep-19-2023 (created)
+    
+    cnv := DateTimeToString::StandardConverter();
+    cnv.SetCustomConversion();
+    cnv.CustomFormatString( "yyyy/MM/dd H:mm:ss" );
+    
+    value := guard( cnv.Convert( this.SendTime() ), "" );
+                    
+    this.SendTimeString( value );
+  *]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form633/Component_ListPRData\043844.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form633/Component_ListPRData\043844.def"
index dc4c04e..532ab58 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form633/Component_ListPRData\043844.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_Form633/Component_ListPRData\043844.def"
@@ -27,7 +27,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MRPCalverNo","title":"MRPCalverNo","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MRPCalverNo"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductID","title":"ProductID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StockingPointID","title":"StockingPointID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StockingPointID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProduceRequiredDate","title":"ProduceRequiredDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProduceRequiredDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Quantity","title":"Quantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Quantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SendStatus","title":"SendStatus","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SendStatus"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SendBy","title":"SendBy","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SendBy"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SendTIme","title":"SendTIme","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SendTIme"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductID","title":"ProductID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductName","title":"ProductName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsPannelMaterial","title":"IsPannelMaterial","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsPannelMaterial"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProduceRequiredDate","title":"ProduceRequiredDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProduceRequiredDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"PRSuggestionDate","title":"PRSuggestionDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"PRSuggestionDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Quantity","title":"Quantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Quantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MRPCalverNo","title":"MRPCalverNo","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MRPCalverNo"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"BusinessType","title":"BusinessType","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"BusinessType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrganCode","title":"OrganCode","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrganCode"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsLongLeadItem","title":"IsLongLeadItem","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsLongLeadItem"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsGenericMaterial","title":"IsGenericMaterial","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsGenericMaterial"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MaterialMRPType","title":"MaterialMRPType","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MaterialMRPType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"LeadTime","title":"LeadTime","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"LeadTime"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProviderCode","title":"ProviderCode","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProviderCode"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProviderName","title":"ProviderName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProviderName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StockingPointID","title":"StockingPointID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StockingPointID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"UnitOfMeasure","title":"UnitOfMeasure","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"UnitOfMeasure"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SendStatus","title":"SendStatus","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SendStatus"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SendTimeString","title":"SendTimeString","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"SendTimeString"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SendBy","title":"SendBy","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SendBy"}}]'
         ContextMenu: 'listContextMenuPRData'
         SortCriteria: 'BusinessType;MRPCalverNo'
         Taborder: 1
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormPRHistoryData/Component_ListPRHistoryData\043844.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormPRHistoryData/Component_ListPRHistoryData\043844.def"
index 1298999..3c6f90b 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormPRHistoryData/Component_ListPRHistoryData\043844.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormPRHistoryData/Component_ListPRHistoryData\043844.def"
@@ -27,7 +27,7 @@
       ]
       Properties:
       [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"BusinessType","title":"BusinessType","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"BusinessType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MRPCalverNo","title":"MRPCalverNo","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MRPCalverNo"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrganCode","title":"OrganCode","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrganCode"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductID","title":"ProductID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StockingPointID","title":"StockingPointID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StockingPointID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Quantity","title":"Quantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Quantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SendStatus","title":"SendStatus","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SendStatus"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ReleaseBy","title":"ReleaseBy","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ReleaseBy"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SendDate","title":"SendDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SendDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ReceiveStatus","title":"ReceiveStatus","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ReceiveStatus"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ReceiveTime","title":"ReceiveTime","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ReceiveTime"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ReceiveError","title":"ReceiveError","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ReceiveError"}}]'
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductID","title":"ProductID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductName","title":"ProductName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProduceRequiredDate","title":"ProduceRequiredDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProduceRequiredDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Quantity","title":"Quantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Quantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MRPCalverNo","title":"MRPCalverNo","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MRPCalverNo"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"BusinessType","title":"BusinessType","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"BusinessType"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrganCode","title":"OrganCode","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrganCode"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProviderCode","title":"ProviderCode","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProviderCode"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProviderName","title":"ProviderName","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProviderName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StockingPointID","title":"StockingPointID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StockingPointID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"UnitOfMeasure","title":"UnitOfMeasure","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"UnitOfMeasure"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SendStatus","title":"SendStatus","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SendStatus"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SendTimeString","title":"SendTimeString","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SendTimeString"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ReleaseBy","title":"ReleaseBy","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ReleaseBy"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ReceiveTimeString","title":"ReceiveTimeString","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ReceiveTimeString"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ReceiveStatus","title":"ReceiveStatus","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ReceiveStatus"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ReceiveError","title":"ReceiveError","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ReceiveError"}}]'
         ContextMenu: 'listContextMenuPRHistoryData'
         SortCriteria: 'BusinessType;MRPCalverNo'
         Taborder: 1

--
Gitblit v1.9.3