From e6c0b43a4f21923ceeee5f9c35650314fc783962 Mon Sep 17 00:00:00 2001
From: limj <limj@taizhitech.com>
Date: 星期五, 15 九月 2023 17:08:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lmj
---
_Main/BL/Type_CustomerOrder/StaticMethod_CreateOrUpdate.qbl | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/_Main/BL/Type_CustomerOrder/StaticMethod_CreateOrUpdate.qbl b/_Main/BL/Type_CustomerOrder/StaticMethod_CreateOrUpdate.qbl
index d1d98d9..e885859 100644
--- a/_Main/BL/Type_CustomerOrder/StaticMethod_CreateOrUpdate.qbl
+++ b/_Main/BL/Type_CustomerOrder/StaticMethod_CreateOrUpdate.qbl
@@ -27,7 +27,7 @@
product := Product_MP::FindById( macroPlan, productId );
salesSegment := SalesSegment_MP::FindByName( macroPlan, salesSegmentName );
stockingPoint := StockingPoint_MP::FindById( macroPlan, stockingPointId );
- currency := Currency_MP::FindById( macroPlan, currencyId );
+ //currency := Currency_MP::FindById( macroPlan, currencyId );
unitOfMeasure := null( UnitOfMeasure_MP )
priority := null( Priority );
if( unitOfMeasureName <> "" ) {
@@ -38,32 +38,32 @@
}
// 妫�鏌ヤ緷璧栭」
if( isnull( product) ) {
- error( "product not found" );
+ info( "product not found" );
}
if( isnull( salesSegment) ) {
- error( "sales segment not found" );
+ info( "sales segment not found" );
}
if( isnull( stockingPoint) ) {
- error( "stock point not found" );
+ info( "stock point not found" );
}
- if( isnull( currency) ) {
- error( "currency not found" );
- }
+ //if( isnull( currency) ) {
+ // error( "currency not found" );
+ //}
if( unitOfMeasureName <> "" and isnull( unitOfMeasure) ) {
- error( "unit of measure not found" );
+ info( "unit of measure not found" );
}
if( priorityName <> "" and isnull( stockingPoint) ) {
- error( "priority not found" );
+ info( "priority not found" );
}
// 鏂板/鏇存柊
result := CustomerOrder::FindById( macroPlan, id );
if( isnull( result ) ) {
CustomerOrder::Create( product, stockingPoint, id, orderDate, quantity, price,
- priorityName, salesSegmentName, currency.Name(), unitOfMeasureName,
+ priorityName, salesSegmentName, currencyId, unitOfMeasureName,
false, customerName, customerId, orderId, orderLineId, true, true, true );
} else {
result.Update( product, stockingPoint, orderDate, quantity, price,
- priorityName, salesSegmentName, currency.Name(), unitOfMeasureName,
+ priorityName, salesSegmentName, currencyId, unitOfMeasureName,
false, customerName, customerId, orderId, orderLineId, true, true, true );
}
return result;
--
Gitblit v1.9.3