From 2911ecc4d0eb8578a7c75aa905c947a7d5aa0793 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期日, 17 十一月 2024 17:08:28 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/BL/Type_ExportXMLData/Method_CalculatePriority.qbl | 2 +-
_Main/BL/Type_ExportXMLManager/Function_CalcFinalXML.qbl | 2 +-
_Main/BL/Type_LocalCell_Default/StaticMethod_GetColumnXML.qbl | 2 +-
_Main/BL/Type_PackagingPlanCell/StaticMethod_Package.qbl | 7 +++++++
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/_Main/BL/Type_ExportXMLData/Method_CalculatePriority.qbl b/_Main/BL/Type_ExportXMLData/Method_CalculatePriority.qbl
index 580dd44..2b296d3 100644
--- a/_Main/BL/Type_ExportXMLData/Method_CalculatePriority.qbl
+++ b/_Main/BL/Type_ExportXMLData/Method_CalculatePriority.qbl
@@ -13,7 +13,7 @@
priority := 2 ;
}else if( element.LikeUserLocale( "<name>Unit</name>" )){
priority := 3 ;
- }else if( element.LikeUserLocale( "<name> </name>" )){
+ }else if( element.LikeUserLocale( "<name>@EMPTY@</name>" )){
priority := 4 ;
}else if( element.LikeUserLocale( "<name>Attribute</name>" )){
priority := 5 ;
diff --git a/_Main/BL/Type_ExportXMLManager/Function_CalcFinalXML.qbl b/_Main/BL/Type_ExportXMLManager/Function_CalcFinalXML.qbl
index f3709af..2a0bc33 100644
--- a/_Main/BL/Type_ExportXMLManager/Function_CalcFinalXML.qbl
+++ b/_Main/BL/Type_ExportXMLManager/Function_CalcFinalXML.qbl
@@ -10,7 +10,7 @@
datas := selectsortedset( this,ExportXMLData,data,data.Priority() );
traverse( datas,Elements,data ){
- xmlTemplate := xmlTemplate + data.XML();
+ xmlTemplate := xmlTemplate + data.XML().ReplaceAll( "@EMPTY@"," ");
}
xmlTemplate := xmlTemplate + "</table>";
diff --git a/_Main/BL/Type_LocalCell_Default/StaticMethod_GetColumnXML.qbl b/_Main/BL/Type_LocalCell_Default/StaticMethod_GetColumnXML.qbl
index 9cb69dc..a61d5a7 100644
--- a/_Main/BL/Type_LocalCell_Default/StaticMethod_GetColumnXML.qbl
+++ b/_Main/BL/Type_LocalCell_Default/StaticMethod_GetColumnXML.qbl
@@ -22,7 +22,7 @@
columnXML := columnXML + "</column>";
}
if( type = "attribute" ){
- columnXML1 := "<column><name> </name><type>String</type>";
+ columnXML1 := "<column><name>@EMPTY@</name><type>String</type>";
traverse ( cells, Elements, cell ) {
cellXML := '<cell value="' + cell.LocalRow().Name() + '"/>'
columnXML1 := columnXML1 + cellXML;
diff --git a/_Main/BL/Type_PackagingPlanCell/StaticMethod_Package.qbl b/_Main/BL/Type_PackagingPlanCell/StaticMethod_Package.qbl
index 7e0d597..de9ca8b 100644
--- a/_Main/BL/Type_PackagingPlanCell/StaticMethod_Package.qbl
+++ b/_Main/BL/Type_PackagingPlanCell/StaticMethod_Package.qbl
@@ -46,6 +46,13 @@
canPackagingQuantity := ifexpr( ceil( needPackagingQuantity / ppls.LotSize() ) < floor( ppnc.MaximumDailyPackagingQuantity() / ppls.LotSize() ),
ceil( needPackagingQuantity / ppls.LotSize() ),
floor( ppnc.MaximumDailyPackagingQuantity() / ppls.LotSize() ) ) * ppls.LotSize();
+ // 鏀圭被涓嬪叾浠栦骇鍝佸寘瑁呮�诲拰
+ categoryPackageQuantity := sum( indexPPCell, PackagingPlanColumn.PackagingPlanCell, tempPPCell,
+ tempPPCell <> indexPPCell and
+ tempPPCell.PackagingPlanRow().Factory() = indexPPCell.PackagingPlanRow().Factory() and
+ tempPPCell.PackagingPlanRow().Category() = indexPPCell.PackagingPlanRow().Category(),
+ tempPPCell.Package() );
+ canPackagingQuantity := minvalue( [Number] ( ppnc.MaximumDailyPackagingQuantity() - categoryPackageQuantity ), canPackagingQuantity );
// info( "寮�濮嬪寘瑁呯殑鏃ユ湡锛�", indexPPCell.StartDate().Format( "Y-M2-D2" ), " 鑳藉寘瑁呯殑鏁伴噺:", canPackagingQuantity );
indexPPCell.Package( canPackagingQuantity );
--
Gitblit v1.9.3