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/Expense/ManageCostList.cpp | 0
jrj/project/business/Expense/SaleCostList.cpp | 0
jrj/project/business/GDN3.maint.cpp | 24 +++++++++++++++++-------
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/jrj/project/business/Expense/ManageCostList.cpp b/jrj/project/business/Expense/ManageCostList.cpp
index 342f696..5dbe5e2 100644
--- a/jrj/project/business/Expense/ManageCostList.cpp
+++ b/jrj/project/business/Expense/ManageCostList.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/SaleCostList.cpp b/jrj/project/business/Expense/SaleCostList.cpp
index 81085ae..2796886 100644
--- a/jrj/project/business/Expense/SaleCostList.cpp
+++ b/jrj/project/business/Expense/SaleCostList.cpp
Binary files differ
diff --git a/jrj/project/business/GDN3.maint.cpp b/jrj/project/business/GDN3.maint.cpp
index 368e7a1..23931cc 100644
--- a/jrj/project/business/GDN3.maint.cpp
+++ b/jrj/project/business/GDN3.maint.cpp
@@ -3333,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();
@@ -3440,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();
@@ -3450,7 +3457,7 @@
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"2025-12-31")
{
expRate = L"0.2";
@@ -3484,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();
@@ -3495,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");
--
Gitblit v1.9.3