From 94861b664bc8ed851c047a013d3be239ea0c46dc Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期二, 03 九月 2024 11:17:30 +0800
Subject: [PATCH] 换型设置导入数量不是整数

---
 /dev/null                                                            |    8 --------
 _Main/BL/Type_ChangeLossSettingExcel/StaticMethod_Import.qbl         |    4 ++--
 _Main/BL/EDI/Broker_MP_ImportChangeLossSettingsBroker.qbl            |    6 +++---
 _var/_Main/Data/MP_ChangeoverLossSetting.xlsx                        |    0 
 _Main/BL/Type_ChangeLossSettingExcel/StaticMethod_ExportTemplate.qbl |    2 +-
 _Main/BL/Type_ChangeLossSettingExcel/Attribute_ChangeLossNumber.qbl  |    8 ++++++++
 _Main/BL/Type_ChangeLossSettingExcel/StaticMethod_CheckImport.qbl    |    4 ++--
 _Main/BL/EDI/Broker_MP_ExportChangeLossSettingsBroker.qbl            |    6 +++---
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/_Main/BL/EDI/Broker_MP_ExportChangeLossSettingsBroker.qbl b/_Main/BL/EDI/Broker_MP_ExportChangeLossSettingsBroker.qbl
index e7936d6..0f8f5ec 100644
--- a/_Main/BL/EDI/Broker_MP_ExportChangeLossSettingsBroker.qbl
+++ b/_Main/BL/EDI/Broker_MP_ExportChangeLossSettingsBroker.qbl
@@ -10,7 +10,7 @@
     EDIMLTable ChangeLossSettingExcel
     {
       TargetType: ChangeLossSettingExcel
-      EDIMLColumn ChangeLossNr { Attribute: ChangeLossNr ValueType: Number }
+      EDIMLColumn ChangeLossNumber { Attribute: ChangeLossNumber ValueType: String }
       EDIMLColumn Product1 { Attribute: Product1 ValueType: String }
       EDIMLColumn Product2 { Attribute: Product2 ValueType: String }
       EDIMLColumn Unit { Attribute: Unit ValueType: String }
@@ -22,7 +22,7 @@
     {
       InputTable: ChangeLossSettingExcel
       OutputTable: ChangeoverLossSetting
-      EDIColumnMatch { InputColumn: ChangeLossNr OutputColumn: ChangeLossNr }
+      EDIColumnMatch { InputColumn: ChangeLossNumber OutputColumn: ChangeLossNumber }
       EDIColumnMatch { InputColumn: Product1 OutputColumn: Product1 }
       EDIColumnMatch { InputColumn: Product2 OutputColumn: Product2 }
       EDIColumnMatch { InputColumn: Unit OutputColumn: Unit }
@@ -35,10 +35,10 @@
     {
       Columns:
       [
-        EDIXLSLinkColumn ChangeLossNr { ValueType: Number }
         EDIXLSLinkColumn Product1 { ValueType: String }
         EDIXLSLinkColumn Product2 { ValueType: String }
         EDIXLSLinkColumn Unit { ValueType: String }
+        EDIXLSLinkColumn ChangeLossNumber { ValueType: String }
       ]
     }
   }
diff --git a/_Main/BL/EDI/Broker_MP_ImportChangeLossSettingsBroker.qbl b/_Main/BL/EDI/Broker_MP_ImportChangeLossSettingsBroker.qbl
index 011a29e..3f2dd12 100644
--- a/_Main/BL/EDI/Broker_MP_ImportChangeLossSettingsBroker.qbl
+++ b/_Main/BL/EDI/Broker_MP_ImportChangeLossSettingsBroker.qbl
@@ -14,7 +14,7 @@
       PrimaryKeyColumns: Unit
       TargetType: ChangeLossSettingExcel
       TypeIndex: ChangeLossSettingTypeIndex
-      EDIMLColumn ChangeLossNr { Attribute: ChangeLossNr ValueType: Number }
+      EDIMLColumn ChangeLossNumber { Attribute: ChangeLossNumber ValueType: String }
       EDIMLColumn Product1 { Attribute: Product1 ValueType: String }
       EDIMLColumn Product2 { Attribute: Product2 ValueType: String }
       EDIMLColumn Unit { Attribute: Unit ValueType: String }
@@ -26,7 +26,7 @@
     {
       InputTable: ChangeoverLossSetting
       OutputTable: ChangeLossSettingExcel
-      EDIColumnMatch { InputColumn: ChangeLossNr OutputColumn: ChangeLossNr }
+      EDIColumnMatch { InputColumn: ChangeLossNumber OutputColumn: ChangeLossNumber }
       EDIColumnMatch { InputColumn: Product1 OutputColumn: Product1 }
       EDIColumnMatch { InputColumn: Product2 OutputColumn: Product2 }
       EDIColumnMatch { InputColumn: Unit OutputColumn: Unit }
@@ -39,10 +39,10 @@
     {
       Columns:
       [
-        EDIXLSLinkColumn ChangeLossNr { ValueType: Number }
         EDIXLSLinkColumn Product1 { ValueType: String }
         EDIXLSLinkColumn Product2 { ValueType: String }
         EDIXLSLinkColumn Unit { ValueType: String }
+        EDIXLSLinkColumn ChangeLossNumber { ValueType: String }
       ]
     }
   }
diff --git a/_Main/BL/Type_ChangeLossSettingExcel/Attribute_ChangeLossNr.qbl b/_Main/BL/Type_ChangeLossSettingExcel/Attribute_ChangeLossNr.qbl
deleted file mode 100644
index 379f527..0000000
--- a/_Main/BL/Type_ChangeLossSettingExcel/Attribute_ChangeLossNr.qbl
+++ /dev/null
@@ -1,8 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Attribute ChangeLossNr
-{
-  #keys: '3[415136.0.1035218301][415136.0.1035218300][415136.0.1035218302]'
-  Description: '鎹㈠瀷鎹熷け锛堝彴锛�'
-  ValueType: Number
-}
diff --git a/_Main/BL/Type_ChangeLossSettingExcel/Attribute_ChangeLossNumber.qbl b/_Main/BL/Type_ChangeLossSettingExcel/Attribute_ChangeLossNumber.qbl
new file mode 100644
index 0000000..d7b7fd4
--- /dev/null
+++ b/_Main/BL/Type_ChangeLossSettingExcel/Attribute_ChangeLossNumber.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute ChangeLossNumber
+{
+  #keys: '3[415136.0.1105920061][415136.0.1105920060][415136.0.1105920062]'
+  Description: '鎹㈠瀷鎹熷け锛堝彴锛�'
+  ValueType: String
+}
diff --git a/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_CheckImport.qbl b/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_CheckImport.qbl
index c1c2c55..a7c0e18 100644
--- a/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_CheckImport.qbl
+++ b/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_CheckImport.qbl
@@ -10,11 +10,11 @@
     if( exists( macroplan, ChangeLossSettingExcel, excel, excel.Product1() = '' 
                 or excel.Product2() = '' 
                 or excel.Unit() = '' 
-                or excel.ChangeLossNr() = 0 ) ){
+                or excel.ChangeLossNumber() = '' ) ){
       error( Translations::MP_ChangeLossSettingExcel_Import_NullInputRequiredField() );
     }
     //瀵煎叆鐨勬暟閲忓皬浜�0
-    if( exists( macroplan, ChangeLossSettingExcel, excel, excel.ChangeLossNr() < 0 ) ){
+    if( exists( macroplan, ChangeLossSettingExcel, excel, [Real]excel.ChangeLossNumber() > 0 and ceil( [Real]excel.ChangeLossNumber() ) <> floor( [Real]excel.ChangeLossNumber() ) ) ){
       error( Translations::MP_ChangeLossSettingExcel_Import_PositiveInteger() );
     }
     //瀵煎叆浜у搧鏄惁瀛樺湪
diff --git a/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_ExportTemplate.qbl b/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_ExportTemplate.qbl
index 74fc514..004c0ce 100644
--- a/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_ExportTemplate.qbl
+++ b/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_ExportTemplate.qbl
@@ -9,7 +9,7 @@
   [*
     // 鐢勫叞楦� Aug-22-2024 (created)
     traverse( macroplan, ChangeLossSetting, cls ){
-      macroplan.ChangeLossSettingExcel( relnew, Product1 := cls.ProductFirst().ID(), Product2 := cls.ProductSecond().ID(), Unit := cls.Unit().ID(), ChangeLossNr := cls.ChangeLossNr() );
+      macroplan.ChangeLossSettingExcel( relnew, Product1 := cls.ProductFirst().ID(), Product2 := cls.ProductSecond().ID(), Unit := cls.Unit().ID(), ChangeLossNumber := [String]cls.ChangeLossNr() );
     }
     value := macroplan.MP_ExportChangeLossSettingsBroker().ExecuteToXLS( isxlsxformat ).AsBinaryValue();
     macroplan.ChangeLossSettingExcel( relflush );
diff --git a/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_Import.qbl b/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_Import.qbl
index 94fe124..466849e 100644
--- a/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_Import.qbl
+++ b/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_Import.qbl
@@ -26,7 +26,7 @@
                                           and cls.ProductSecond().ID() = excel.Product2()
                                           and cls.Unit().ID() = excel.Unit() );
       if( isnull( cls ) ){
-        cls             := macroplan.ChangeLossSetting( relnew, ChangeLossNr := excel.ChangeLossNr() );
+        cls             := macroplan.ChangeLossSetting( relnew, ChangeLossNr := [Number]excel.ChangeLossNumber() );
         product1        := selectobject( macroplan, Product_MP, product, product.ID() = excel.Product1() );
         product2        := selectobject( macroplan, Product_MP, product, product.ID() = excel.Product2() );
         unit            := selectobject( macroplan, Unit, unit, unit.ID() = excel.Unit() );
@@ -34,7 +34,7 @@
         cls.ProductSecond( relset, product2 );
         cls.Unit( relset, unit );
       }else {
-        cls.ChangeLossNr( excel.ChangeLossNr() );
+        cls.ChangeLossNr( [Number]excel.ChangeLossNumber() );
       }
       excel.Delete();
     }
diff --git a/_var/_Main/Data/MP_ChangeoverLossSetting.xlsx b/_var/_Main/Data/MP_ChangeoverLossSetting.xlsx
index 47f6222..15643e7 100644
--- a/_var/_Main/Data/MP_ChangeoverLossSetting.xlsx
+++ b/_var/_Main/Data/MP_ChangeoverLossSetting.xlsx
Binary files differ

--
Gitblit v1.9.3