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

xj qian

2024-07-09 6c05d4f3d5e7cd966be24c7d0ab70e5aae51b614

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

 jrj/project/business/Customer3.maint.cpp

@@ -797,7 +797,7 @@
                arg.AddArg(L"FROM", L"Customer");                    
                arg.AddArg(L"CustomerName", dw_detail.GetItemString(1,L"Name"));                
                arg.AddArg(L"config", L"客户产品.vface/config/CustomerGoodsVdVd/view");
                //arg.AddArg(L"CustomerHWND",GetHWND().toString());
                //arg.AddArg(L"CustomerHWND",xstring((__int64)GetHWND()));
                arg.SetParam(L"CustomerHWND", (LPARAM)GetHWND());

                int nIndex = xsheet.InsertSheet(-1, L"客户ID货号库", xp, (void *) &arg);
@@ -1135,7 +1135,7 @@
        arg.AddArg(L"CustomerID", this.m_EntityID);
        arg.AddArg(L"CustomerName", dw_detail.GetItemString(1,L"Name"));                
        arg.AddArg(L"config", L"客户产品.vface/config/CustomerGoodsNewVd/view");
        arg.AddArg(L"CustomerHWND",this.GetHWND().toString());
        arg.AddArg(L"CustomerHWND",this.xstring((__int64)GetHWND()));
        //trace(this.m_EntityID);
        int p =arg.__nativept;*/
        //int nIndex = xsheet.InsertSheet(-1, L"客户ID货号库", xp, 0);
@@ -1229,7 +1229,7 @@
                arg.AddArg(L"FROM", L"Customer");                    
                arg.AddArg(L"CustomerName", dw_detail.GetItemString(1,L"Name"));                
                arg.AddArg(L"config", L"客户产品.vface/config/CustomerGoodsVdVd/view");
                //arg.AddArg(L"CustomerHWND",GetHWND().toString());
                //arg.AddArg(L"CustomerHWND",xstring((__int64)GetHWND()));
                arg.SetParam(L"CustomerHWND", (LPARAM)GetHWND());

                int nIndex = xsheet.InsertSheet(-1, L"客户ID货号库", xp, (void*)&arg);

 jrj/project/business/Expense/BasicFare.cpp

Binary files differ

 jrj/project/business/Expense/CommissionExpense.cpp

Binary files differ

 jrj/project/business/Expense/CommissionExpenseBase.cpp

Binary files differ

 jrj/project/business/Expense/CommissionExpenseItem.cpp

Binary files differ

 jrj/project/business/Expense/Drawback.cpp

Binary files differ

 jrj/project/business/Expense/ExchangeRate.cpp

Binary files differ

 jrj/project/business/Expense/ExportCredit.SwitchTo.cpp

Binary files differ

 jrj/project/business/Expense/ExportCredit.cpp

Binary files differ

 jrj/project/business/Expense/ExportCreditMaint.cpp

Binary files differ

 jrj/project/business/Expense/FreightExpenseInput.cpp

Binary files differ

 jrj/project/business/Expense/FreightExpenseItem.cpp

Binary files differ

 jrj/project/business/Expense/MouldFee.cpp

Binary files differ

 jrj/project/business/Expense/PaperCardReconciliationEx.cpp

Binary files differ

 jrj/project/business/Expense/Reimbursement.cpp

Binary files differ

 jrj/project/business/Expense/ReimbursementMaint.cpp

Binary files differ

 jrj/project/business/Expense/Salaryslip.cpp

Binary files differ

 jrj/project/business/Expense/SampleFee.cpp

Binary files differ

 jrj/project/business/Expense/SampleRequestForm.cpp

Binary files differ

 jrj/project/business/Expense/SelectSalaryslip.cpp

Binary files differ

 jrj/project/business/Expense/SpecialDeductFeeList.cpp

Binary files differ

 jrj/project/business/Expense/TestExpense.cpp

Binary files differ

 jrj/project/business/Expense/TestExpenseBase.cpp

Binary files differ

 jrj/project/business/Expense/TestExpenseBase2.cpp

Binary files differ

 jrj/project/business/Expense/basicfareTypeList.cpp

Binary files differ

 jrj/project/business/Expense/maint.Document.ExportCredit.cpp

Binary files differ

 jrj/project/business/Expense/maint.Document.SampleRequestForm.cpp

Binary files differ

 jrj/project/business/Expense/maint.basicfare.cpp

Binary files differ

 jrj/project/business/Expense/maint.salaryslip.cpp

Binary files differ

 jrj/project/business/Expense/maint.samplefee.cpp

Binary files differ

 jrj/project/business/Expense/maint.samplesequest.cpp

Binary files differ

 jrj/project/business/GDN3.maint.cpp

@@ -3187,7 +3187,7 @@
                xaserverarg& arg2 = *new xaserverarg;
                
                arg2.AddArg(L"InvoiceNo", dw_base.GetItemString(1, L"InvoiceNo"));
                //arg2.AddArg(L"HWND", GetHWND().toString());
                //arg2.AddArg(L"HWND", xstring((__int64)GetHWND()));
                arg2.SetParam(L"HWND", (LPARAM)GetHWND());
                OpenWindow(L"dev:xpage[GDNSourcePaperCard.vx]",(LPARAM)&arg2);
            }

 jrj/project/business/Supplier/maint.Document.SupplierSD.cpp

Binary files differ