From 8e7fba412a1c4cd46b9f71e518e6274583ff9d7a Mon Sep 17 00:00:00 2001
From: qianxj2004 <qianxj15@sina.com>
Date: 星期三, 01 四月 2026 13:26:46 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/GDN3.maint.cpp | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/jrj/project/business/GDN3.maint.cpp b/jrj/project/business/GDN3.maint.cpp
index d08baae..23931cc 100644
--- a/jrj/project/business/GDN3.maint.cpp
+++ b/jrj/project/business/GDN3.maint.cpp
@@ -1545,7 +1545,8 @@
}
else
{
- xml xp = ViewObject::RetrieveData(L"/sale/data/GDN3/profit/paramS", L"item", L"cryrate");
+ //xml xp = ViewObject::RetrieveData(L"/sale/data/GDN3/profit/paramSS", L"item", L"cryrate");
+ xml xp = ViewObject::RetrieveData(L"/sale/data/GDN3/profit/paramSS");
if (xp.selectSingleNode(L"root/item/@value"))
exchangeRate = xp.selectSingleNode(L"root/item/@value").text();
dw_profit.SetItemString(1, L"ExchangeRate", exchangeRate);
@@ -3332,14 +3333,19 @@
double amt = dw_profit.GetItemDouble(1, L"Amount");
xstring exchRate = L"";
xstring exchRate2 = L"";
-
+ xstring ETD = dw_base.GetItemString(1, L"ETD");
+ if (ETD == L"")
+ {
+ alert(L"填写船期！");
+ }
xml x = ViewObject::RetrieveData(L"/sale/data/GDN3/profit/paramS", L"item", L"prepareFeeRate");
if (x.selectSingleNode(L"root/item/@value"))
exchRate = x.selectSingleNode(L"root/item/@value").text();
double rate = exchRate.toDouble();
- xml x1 = ViewObject::RetrieveData(L"/sale/data/GDN3/profit/paramS", L"item", L"cryrate");
- if (x.selectSingleNode(L"root/item/@value"))
+ //xml x1 = ViewObject::RetrieveData(L"/sale/data/GDN3/profit/paramS", L"item", L"cryrate");
+ xml x1 = ViewObject::RetrieveData(L"/sale/data/GDN3/profit/paramEx", L"ETD", ETD);
+ if (x1.selectSingleNode(L"root/item/@value"))
exchRate2 = x1.selectSingleNode(L"root/item/@value").text();
double cryrate = exchRate2.toDouble();
@@ -3439,8 +3445,10 @@
xstring CurrencyCode = dw_base.GetItemString(1, L"CurrencyCode");
xstring expRate = L"";
xstring exchRate = L"";
+ xstring ETDEx = dw_base.GetItemString(1, L"ETD");
- xml x = ViewObject::RetrieveData(L"/sale/data/GDN3/profit/paramS", L"item", L"cryrate");
+ //xml x = ViewObject::RetrieveData(L"/sale/data/GDN3/profit/paramS", L"item", L"cryrate");
+ xml x = ViewObject::RetrieveData(L"/sale/data/GDN3/profit/paramEx", L"ETD", ETDEx);
if (x.selectSingleNode(L"root/item/@value"))
exchRate = x.selectSingleNode(L"root/item/@value").text();
@@ -3449,8 +3457,8 @@
expRate = x.selectSingleNode(L"root/item/@value").text();
//double sale = dw_profit.GetItemDouble(1,L"ExchangeAmountEx");
- xstring ETDEx = dw_base.GetItemString(1, L"ETD");
- if (ETDEx >= L"2023-01-01")
+
+ if (ETDEx <= L"2025-12-31")
{
expRate = L"0.2";
}
@@ -3483,8 +3491,11 @@
xstring CurrencyCode = dw_base.GetItemString(1, L"CurrencyCode");
xstring expRate = L"";
xstring exchRate = L"";
+ xstring ETDEx = dw_base.GetItemString(1, L"ETD");
- xml x = ViewObject::RetrieveData(L"/sale/data/GDN3/profit/paramS", L"item", L"cryrate");
+ xml x = ViewObject::RetrieveData(L"/sale/data/GDN3/profit/paramEx", L"ETD", ETDEx);
+
+ //xml x = ViewObject::RetrieveData(L"/sale/data/GDN3/profit/paramS", L"item", L"cryrate");
if (x.selectSingleNode(L"root/item/@value"))
exchRate = x.selectSingleNode(L"root/item/@value").text();
@@ -3494,7 +3505,7 @@
//alert(expRate);
//double sale = dw_profit.GetItemDouble(1,L"ExchangeAmountEx");
- xstring ETDEx = dw_base.GetItemString(1, L"ETD");
+
if (ETDEx < L"2023-01-01")
{
//alert(L"1");
@@ -3595,7 +3606,8 @@
xstring exchangeRate = L"";
exchangeRate = dw_profit.GetItemString(1, L"ExchangeRate");
if (exchangeRate == L"") {
- xml x = ViewObject::RetrieveData(L"/sale/data/GDN3/profit/paramS", L"item", L"cryrate");
+ //xml x = ViewObject::RetrieveData(L"/sale/data/GDN3/profit/paramS", L"item", L"cryrate");
+ xml x = ViewObject::RetrieveData(L"/sale/data/GDN3/profit/paramSS");
if (x.selectSingleNode(L"root/item/@value"))
exchangeRate = x.selectSingleNode(L"root/item/@value").text();
dw_profit.SetItemString(1, L"ExchangeRate", exchangeRate);
@@ -4140,7 +4152,7 @@
dw_custom.SetColumnState(L"ClassifyID", false);
dw_custom.SetColumnState(L"AmountEx", false);
//dw_custom.SetReadOnlyColumn(L"CustName",true);
- dw_custom.SetColumnState(L"LineNo", false);
+ //dw_custom.SetColumnState(L"LineNo", false);
dw_customex = GetControl(L"dw_customex");
--
Gitblit v1.9.3