From ff94e4575e019378c4fd06775f597c9033517c24 Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期四, 15 八月 2024 18:28:05 +0800
Subject: [PATCH] BUG修复

---
 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMaterialRack/Component_pnlContent.def                             |   23 +++--
 _Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pPreviousEditionCurve_cPreviousEditionCurve_OnUserChanged.def |    2 
 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostTransport/Response_pnlContent_ddslDestination_OnCreated.def       |   18 ++++
 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostTransport/Component_pnlContent.def                                |   44 +++++-----
 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Component_pnlContent.def                                          |    1 
 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMachining/Component_pnlContent.def                                |   23 +++--
 _Main/UI/MacroPlannerWebApp/Views/LogisticsCostParameterSetting.vw                                                                   |   21 +---
 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Component_pnlContent.def                                   |   23 +++--
 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Response_pnlContent_ddslName_OnCreated.def                        |   18 ++++
 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostTransport/Response_pnlContent_ddslOrigin_OnCreated.def            |   18 ++++
 10 files changed, 120 insertions(+), 71 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Component_pnlContent.def
index a5cade2..69737c7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Component_pnlContent.def
@@ -5,17 +5,6 @@
   BaseType: 'WebPanel'
   Children:
   [
-    Component efFactory id:efFactory_245
-    {
-      #keys: '[413988.0.1457133347]'
-      BaseType: 'WebEditField'
-      Properties:
-      [
-        DataBinding: 'DataHolderDialogData.Data.Factory'
-        Label: '宸ュ巶'
-        Taborder: 0
-      ]
-    }
     Component efGeneration
     {
       #keys: '[413988.0.1457133350]'
@@ -93,6 +82,18 @@
         Taborder: 7
       ]
     }
+    Component ddslFactory
+    {
+      #keys: '[415754.0.98386037]'
+      BaseType: 'WebDropDownStringList'
+      Properties:
+      [
+        DataBinding: 'DataHolderDialogData.Data.Factory'
+        Label: '宸ュ巶'
+        Strings: '澶ц繛宸ュ巶;闀挎槬宸ュ巶'
+        Taborder: 0
+      ]
+    }
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMachining/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMachining/Component_pnlContent.def
index 65628ad..b6ae3cb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMachining/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMachining/Component_pnlContent.def
@@ -5,17 +5,6 @@
   BaseType: 'WebPanel'
   Children:
   [
-    Component efFactory
-    {
-      #keys: '[413988.0.1457092631]'
-      BaseType: 'WebEditField'
-      Properties:
-      [
-        DataBinding: 'DataHolderDialogData.Data.Factory'
-        Label: '宸ュ巶'
-        Taborder: 0
-      ]
-    }
     Component efProduct
     {
       #keys: '[413988.0.1457092665]'
@@ -115,6 +104,18 @@
         Taborder: 9
       ]
     }
+    Component ddslFactory id:ddslFactory_653
+    {
+      #keys: '[415754.0.98423632]'
+      BaseType: 'WebDropDownStringList'
+      Properties:
+      [
+        DataBinding: 'DataHolderDialogData.Data.Factory'
+        Label: '宸ュ巶'
+        Strings: '澶ц繛宸ュ巶;闀挎槬宸ュ巶'
+        Taborder: 0
+      ]
+    }
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMaterialRack/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMaterialRack/Component_pnlContent.def
index 3ff05c2..7df23a3 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMaterialRack/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostMaterialRack/Component_pnlContent.def
@@ -5,17 +5,6 @@
   BaseType: 'WebPanel'
   Children:
   [
-    Component efFactory
-    {
-      #keys: '[413988.0.1456914946]'
-      BaseType: 'WebEditField'
-      Properties:
-      [
-        DataBinding: 'DataHolderDialogData.Data.Factory'
-        Label: '宸ュ巶'
-        Taborder: 0
-      ]
-    }
     Component npWarehousingPrice
     {
       #keys: '[413988.0.1455874538]'
@@ -60,6 +49,18 @@
         Taborder: 4
       ]
     }
+    Component ddslFactory
+    {
+      #keys: '[415754.0.97113155]'
+      BaseType: 'WebDropDownStringList'
+      Properties:
+      [
+        DataBinding: 'DataHolderDialogData.Data.Factory'
+        Label: '宸ュ巶'
+        Strings: '澶ц繛宸ュ巶;闀挎槬宸ュ巶'
+        Taborder: 0
+      ]
+    }
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostTransport/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostTransport/Component_pnlContent.def
index 49bac54..79402d5 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostTransport/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostTransport/Component_pnlContent.def
@@ -16,28 +16,6 @@
         Taborder: 0
       ]
     }
-    Component efOrigin
-    {
-      #keys: '[413988.0.1458251274]'
-      BaseType: 'WebEditField'
-      Properties:
-      [
-        DataBinding: 'DataHolderDialogData.Data.Origin'
-        Label: '璧峰鍦�'
-        Taborder: 1
-      ]
-    }
-    Component efDestination
-    {
-      #keys: '[413988.0.1458549250]'
-      BaseType: 'WebEditField'
-      Properties:
-      [
-        DataBinding: 'DataHolderDialogData.Data.Destination'
-        Label: '鐩殑鍦�'
-        Taborder: 2
-      ]
-    }
     Component npLoadingCapacity
     {
       #keys: '[413988.0.1456916992]'
@@ -60,6 +38,28 @@
         Taborder: 4
       ]
     }
+    Component ddslOrigin
+    {
+      #keys: '[415754.0.97111795]'
+      BaseType: 'WebDropDownStringList'
+      Properties:
+      [
+        DataBinding: 'DataHolderDialogData.Data.Origin'
+        Label: '璧峰鍦�'
+        Taborder: 1
+      ]
+    }
+    Component ddslDestination
+    {
+      #keys: '[415754.0.97143070]'
+      BaseType: 'WebDropDownStringList'
+      Properties:
+      [
+        DataBinding: 'DataHolderDialogData.Data.Destination'
+        Label: '鐩殑鍦�'
+        Taborder: 2
+      ]
+    }
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostTransport/Response_pnlContent_ddslDestination_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostTransport/Response_pnlContent_ddslDestination_OnCreated.def
new file mode 100644
index 0000000..1537904
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostTransport/Response_pnlContent_ddslDestination_OnCreated.def
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: pnlContent/ddslDestination
+Response OnCreated () id:Response_pnlContent_ddslDestination_OnCreated
+{
+  #keys: '[415754.0.97143069]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  QuillAction
+  {
+    Body:
+    [*
+      spmpids := selectuniquevalues( MacroPlan, StockingPoint_MP, tempSPMP, true, tempSPMP.ID() );
+      
+      this.Strings( spmpids.Concatenate( ";" ) );
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostTransport/Response_pnlContent_ddslOrigin_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostTransport/Response_pnlContent_ddslOrigin_OnCreated.def
new file mode 100644
index 0000000..ae09d4e
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostTransport/Response_pnlContent_ddslOrigin_OnCreated.def
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: pnlContent/ddslOrigin
+Response OnCreated () id:Response_pnlContent_ddslOrigin_OnCreated
+{
+  #keys: '[415754.0.97111881]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  QuillAction
+  {
+    Body:
+    [*
+      spmpids := selectuniquevalues( MacroPlan, StockingPoint_MP, tempSPMP, true, tempSPMP.ID() );
+      
+      this.Strings( spmpids.Concatenate( ";" ) );
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Component_pnlContent.def
index a1be8e2..270f029 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Component_pnlContent.def
@@ -38,7 +38,6 @@
         DataBinding: 'DataHolderDialogData.Data.Name'
         Label: 'Name'
         Sorting: 'none'
-        Strings: '鏃╃彮;涓彮;澶滅彮'
         Taborder: 2
       ]
     }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Response_pnlContent_ddslName_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Response_pnlContent_ddslName_OnCreated.def
new file mode 100644
index 0000000..74052a9
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Response_pnlContent_ddslName_OnCreated.def
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: pnlContent/ddslName
+Response OnCreated () id:Response_pnlContent_ddslName_OnCreated
+{
+  #keys: '[415754.0.97151310]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  QuillAction
+  {
+    Body:
+    [*
+      spns := selectuniquevalues( MacroPlan, ShiftPattern, tempSP, true, tempSP.Name() );
+      
+      this.Strings( spns.Concatenate( ";" ) );
+    *]
+    GroupServerCalls: false
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pPreviousEditionCurve_cPreviousEditionCurve_OnUserChanged.def b/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pPreviousEditionCurve_cPreviousEditionCurve_OnUserChanged.def
index 86af038..7fe5e41 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pPreviousEditionCurve_cPreviousEditionCurve_OnUserChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogRequirementUpload/Response_pPreviousEditionCurve_cPreviousEditionCurve_OnUserChanged.def
@@ -26,6 +26,8 @@
         dhBinaryDataCurve.Data( BinaryData::FromBase64EncodedString( dhLocalBinaryDataCurve.Data().AsBase64EncodedString() ) );
         dhOriginalFileNameCurve.Data( dhLocalOriginalFileNameCurve.Data() );
       }
+      
+      cCurveEnable.Checked( true );
     *]
     GroupServerCalls: false
   }
diff --git a/_Main/UI/MacroPlannerWebApp/Views/LogisticsCostParameterSetting.vw b/_Main/UI/MacroPlannerWebApp/Views/LogisticsCostParameterSetting.vw
index e12a02c..3835185 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/LogisticsCostParameterSetting.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/LogisticsCostParameterSetting.vw
@@ -43,21 +43,12 @@
               subtotals: ''
               width: 82
             }
-            column_Product
-            {
-              columnId: 'Product'
-              dataPath: 'Product'
-              dataType: 'string'
-              index: 2
-              subtotals: ''
-              width: 63
-            }
             column_Factory
             {
               columnId: 'Factory'
               dataPath: 'Factory'
               dataType: 'string'
-              index: 3
+              index: 2
               subtotals: ''
               width: 60
             }
@@ -66,7 +57,7 @@
               columnId: 'PackagingCapacity'
               dataPath: 'PackagingCapacity'
               dataType: 'number'
-              index: 4
+              index: 3
               subtotals: ''
               width: 86
             }
@@ -75,7 +66,7 @@
               columnId: 'WarehousingPrice'
               dataPath: 'WarehousingPrice'
               dataType: 'number'
-              index: 5
+              index: 4
               subtotals: ''
               width: 126
             }
@@ -84,7 +75,7 @@
               columnId: 'OutboundPrice'
               dataPath: 'OutboundPrice'
               dataType: 'number'
-              index: 6
+              index: 5
               subtotals: ''
               width: 126
             }
@@ -93,7 +84,7 @@
               columnId: 'StoragePrice'
               dataPath: 'StoragePrice'
               dataType: 'number'
-              index: 7
+              index: 6
               subtotals: ''
               width: 124
             }
@@ -102,7 +93,7 @@
               columnId: 'OtherPrice'
               dataPath: 'OtherPrice'
               dataType: 'number'
-              index: 8
+              index: 7
               subtotals: ''
               width: 127
             }

--
Gitblit v1.9.3