From 378955a39437125d274173c1ebcfd91dba15fc18 Mon Sep 17 00:00:00 2001
From: renhao <renhui.hao@capgemini.com>
Date: 星期二, 19 九月 2023 13:59:53 +0800
Subject: [PATCH] 需求和外部库存日期限制过滤取消 创建采购供应
---
_Main/BL/Type_MacroPlan/Method_MappingCustomerOrderData.qbl | 2 +-
_Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl | 2 +-
_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl | 4 ++--
_Main/BL/Type_MacroPlan/Method_MappingOperationBOMDataSupplyPurchase.qbl | 17 +++++++++--------
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingCustomerOrderData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingCustomerOrderData.qbl
index 3916a05..7ec0576 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingCustomerOrderData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingCustomerOrderData.qbl
@@ -17,7 +17,7 @@
}
queryStartDate := guard( min( this, Period_MP, item, true, item.StartDate() ) - Duration::Days( 30 ), DateTime::MinDateTime() ).Date();
queryEndDate := guard( max( this, Period_MP, item, true, item.EndDate() ), Date::MaxDate() );
- listToDeal := selectset( listToDeal, Elements, item, item.OrderDate() >= queryStartDate and item.OrderDate() <= queryEndDate, not isnull( Product_MP::FindById( this, item.ProductID() ) ) and not isnull( StockingPoint_MP::FindById( this, item.StockPointID() ) ) and not isnull( SalesSegment_MP::FindByName( this, item.SalesSegmentName() ) ) );
+ listToDeal := selectset( listToDeal, Elements, item, item.OrderDate() >= queryStartDate /*and item.OrderDate() <= queryEndDate*/, not isnull( Product_MP::FindById( this, item.ProductID() ) ) and not isnull( StockingPoint_MP::FindById( this, item.StockPointID() ) ) and not isnull( SalesSegment_MP::FindByName( this, item.SalesSegmentName() ) ) );
totalcount := listToDeal.Size();
info( "CustomerOrder has " + totalcount.AsQUILL() + " rows in total" );
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl
index 3ab280c..ead549d 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl
@@ -10,7 +10,7 @@
// renhao Aug-14-2023 (created)
queryStartDate := guard( min( this, Period_MP, item, true, item.StartDate() ) - Duration::Days( 30 ), DateTime::MinDateTime() ).Date();
queryEndDate := guard( max( this, Period_MP, item, true, item.EndDate() ), Date::MaxDate() );
- listtodeal := selectset( this,MappingExternalSupply,externalSupply, externalSupply.UserQuantity()>0 and externalSupply.Date() >= queryStartDate and externalSupply.Date() <= queryEndDate);
+ listtodeal := selectset( this,MappingExternalSupply,externalSupply, externalSupply.UserQuantity()>0 and externalSupply.Date() >= queryStartDate /*and externalSupply.Date() <= queryEndDate*/);
totalcount := listtodeal.Size();
description := "鍦ㄩ�斿湪鍒�";
info( "ExternalSupply has " + totalcount.AsQUILL() + " rows in total" );
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
index b152a6e..887f9ad 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
@@ -71,9 +71,9 @@
}
if( createPurchaseSupplyMaterial ) {
toCreateBomList := selectuniquevalues( bomList, Elements, item,
- item.ProductType() = "P", item.OrganCode() + item.ComponentCode());
+ item.ComponentType() = "P", item.OrganCode() + item.ComponentCode());
traverse( toCreateBomList, Elements, key ) {
- boms := selectset( bomList, Elements, item, item.ProductType() = "P" and item.OrganCode() + item.ComponentCode() = key );
+ boms := selectset( bomList, Elements, item, item.ComponentType() = "P" and item.OrganCode() + item.ComponentCode() = key );
bom := boms.First();
this.MappingOperationBOMDataSupplyPurchase( bom.OrganCode(), bom.ComponentCode(), bom.ComponentType());
}
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMDataSupplyPurchase.qbl b/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMDataSupplyPurchase.qbl
index 6a24698..71d3cbd 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMDataSupplyPurchase.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMDataSupplyPurchase.qbl
@@ -8,14 +8,7 @@
{
TextBody:
[*
- routingId := "PR_"+orgCode + "_" + productId;
- unitId := "渚涘簲鍟�";
- routingStepName := "Purchase";
- operationId := orgCode + "_PR_" + productId;
- routing := Routing::CreateOrUpdate( this, routingId );
- toDeleteSteps := selectset( routing, RoutingStep, routingStep, true );
- RoutingStep::Delete( toDeleteSteps );
- routingStep := RoutingStep::Create( routing, routingStepName, "", true );
+
product := Product_MP::FindById( this, productId );
if( isnull( product ) ) {
info( "product : " + productId + " not found" );
@@ -27,6 +20,14 @@
}
if( not isnull( product) and not isnull( stockingPoint)){
+ routingId := "PR_"+orgCode + "_" + productId;
+ unitId := "渚涘簲鍟�";
+ routingStepName := "Purchase";
+ operationId := orgCode + "_PR_" + productId;
+ routing := Routing::CreateOrUpdate( this, routingId );
+ toDeleteSteps := selectset( routing, RoutingStep, routingStep, true );
+ RoutingStep::Delete( toDeleteSteps );
+ routingStep := RoutingStep::Create( routing, routingStepName, "", true );
unit := Unit::FindById( this, unitId );
if( isnull( unit ) ) {
unit := this.Unit( relnew,
--
Gitblit v1.9.3