From 6a58456625b8ff9b895f87f3d5a5965ab574f87a Mon Sep 17 00:00:00 2001
From: hongji.li <hongji.a.li@capgemini.com>
Date: 星期二, 17 十月 2023 15:20:24 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj
---
_Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning#662.qbl | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git "a/_Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning\043662.qbl" "b/_Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning\043662.qbl"
index 8bdc755..4443fed 100644
--- "a/_Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning\043662.qbl"
+++ "b/_Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning\043662.qbl"
@@ -1,7 +1,8 @@
Quintiq file version 2.0
#parent: #root
StaticMethod FromSupplyPlanning (
- GlobalOTDTable otdTable,
+ const GlobalOTDTable otdTable,
+ const GlobalOTDSOP otdSop,
MacroPlan macroPlan,
ProductInStockingPointInPeriod pispip,
String userId
@@ -22,7 +23,9 @@
mappingOperation := Global_MappingOperation::GetByProductId( otdTable, product.ID() );
// QID15
mappingProviderCapacity := Global_MappingProviderCapacity::GetByProductId( otdTable, product.ID() );
- matAttrSetting := null( MatAttrSettingAndPlanStrategy )/*MatAttrSettingAndPlanStrategy::GetExistByMatCode( otdTable, product.ID() )*/;
+
+ // 鐗╂枡鏍囩灞炴��
+ matAttrSetting := MatAttrSettingAndPlanStrategy::GetByMatCode( otdSop, product.ID() )
// 鏍规嵁pispip
result.MRPCalverNo( ifexpr( pispip.MRPCalverNo() = "", "鏆傛棤", pispip.MRPCalverNo() ) );
--
Gitblit v1.9.3