From 1b0f461e0db93c3f504b8be975a5b7ffddbcc584 Mon Sep 17 00:00:00 2001
From: Tianma21 <Administrator@TOTDQAE01.tianmame.cn>
Date: 星期日, 08 十月 2023 13:47:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev

---
 _Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_CreateFillingCapacityOrderScheme.qbl |   51 +++++++++++++++++++++++++++++----------------------
 1 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_CreateFillingCapacityOrderScheme.qbl b/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_CreateFillingCapacityOrderScheme.qbl
index 15c7113..3f0ea88 100644
--- a/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_CreateFillingCapacityOrderScheme.qbl
+++ b/_Main/BL/Type_FilllingCapacityOrderScheme/StaticMethod_CreateFillingCapacityOrderScheme.qbl
@@ -8,7 +8,7 @@
   TextBody:
   [*
     // NBoTk Sep-14-2023 (created)
-    
+    info('test' )
     fillingCapacityOrders := selectset( owner,FillingCapacityOrder,fillingOrder,
                                         not fillingOrder.IsFilling()
                                         );
@@ -34,8 +34,7 @@
     salesSegmentName := salesSegmentNameList.Concatenate( ",")
     
     schemeDate := Date::Today();
-    
-    filllingCapacityOrderScheme := owner.FilllingCapacityOrderScheme(relnew,SchemeName := schemeName,SchemeDate := schemeDate,BusinessType := businessType,Customer := customer,CustomerID := customerID,
+    owner.FilllingCapacityOrderScheme(relnew,SchemeName := schemeName,SchemeDate := schemeDate,BusinessType := businessType,Customer := customer,CustomerID := customerID,
                                                                       SalesSegmentName := salesSegmentName);
     
     
@@ -43,27 +42,35 @@
     {
       e.SchemeName(schemeName);
       e.IsFilling(true);
-      filllingCapacityOrderScheme.FillingCapacityOrder(relinsert, e);
     }
-    
-    // 鐗堟湰鍙�
-    verNoOrder := select( filllingCapacityOrderScheme,FillingCapacityOrder,o,
-                                 o.VerNo() <> ''
-                                 )
     
     // 闇�瑕佸皢閿�鍞鍗曞拰棰勫敭璁㈠崟鍚屾椂淇濆瓨鍒版柟妗堜腑
-    traverse( owner,CustomerAndForecastOrder,order)
-    {
-      
-         fillingOrder := owner.FillingCapacityOrder(relnew,BusinessType := order.BusinessType(),Customer := order.Customer(),CustomerID := order.CustomerID(),
-                                                                           DemandDate := order.DemandDate(),ForecastDemandDate := order.ForecastDemandDate(),IsFilling := true,
-                                                                           OrderType := '鎻愭媺',PanelBigSheetQuantity := order.PanelBigSheetQuantity(),ProductID := order.ProductID(),
-                                                                           Quantity := order.Quantity(),SalesSegmentName := order.SalesSegmentName(),SalesAmount := order.SalesAmount(),
-                                                                           SchemeName := schemeName,StockingPointID := order.StockingPointID(),UnitOfMeasureName := order.UnitOfMeasureName(),
-                                                                           VerNo := verNoOrder.VerNo()
-                                                                           );
-                                                                           
-        filllingCapacityOrderScheme.FillingCapacityOrder(relinsert, fillingOrder);
-    }
+    //traverse( owner,CustomerAndForecastOrder,order)
+    //{
+    //  
+    //     fillingOrder := owner.FillingCapacityOrder(relnew,BusinessType := order.BusinessType(),Customer := order.Customer(),CustomerID := order.CustomerID(),
+    //                                                                       DemandDate := order.DemandDate(),ForecastDemandDate := order.ForecastDemandDate(),IsFilling := true,
+    //                                                                       OrderType := '鎻愭媺',PanelBigSheetQuantity := order.PanelBigSheetQuantity(),ProductID := order.ProductID(),
+    //                                                                       Quantity := order.Quantity(),SalesSegmentName := order.SalesSegmentName(),SalesAmount := order.SalesAmount(),
+    //                                                                       SchemeName := schemeName,StockingPointID := order.StockingPointID(),UnitOfMeasureName := order.UnitOfMeasureName(),
+    //                                                                       VerNo := order.VerNo()
+    //                                                                       );
+    //                                                                       
+    //    filllingCapacityOrderScheme.FillingCapacityOrder(relinsert, fillingOrder);
+    //}
+    
+    //// 鏂板鍙嶇/鎺堟潈璁㈠崟 璁㈠崟淇℃伅鍔犲叆濉骇
+    //traverse( owner,H_Forecast,hf)
+    //{
+    //          fillingOrder := owner.FillingCapacityOrder(relnew,BusinessType := hf.Department(),Customer := hf.CustomName(),CustomerID := hf.CustomCode(),
+    //                                                                       DemandDate := Date::Today(),ForecastDemandDate := Date::Today(),IsFilling := true,
+    //                                                                       OrderType := '鎻愭媺',PanelBigSheetQuantity := 0,ProductID := '',
+    //                                                                       Quantity := hf.ForecastQty(),SalesSegmentName := '',SalesAmount := 0,
+    //                                                                       SchemeName := schemeName,StockingPointID := '',UnitOfMeasureName := hf.Util(),
+    //                                                                       VerNo := ''
+    //                                                                       );
+    //                                                                       
+    //    filllingCapacityOrderScheme.FillingCapacityOrder(relinsert, fillingOrder);
+    //}
   *]
 }

--
Gitblit v1.9.3