Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

qianxj2004

7 小时以前 8e7fba412a1c4cd46b9f71e518e6274583ff9d7a

Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

 jrj/project/business/Expense/ManageCostList.cpp

Binary files differ

 jrj/project/business/Expense/SaleCostList.cpp

Binary files differ

 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");