From 6c05d4f3d5e7cd966be24c7d0ab70e5aae51b614 Mon Sep 17 00:00:00 2001 From: xj qian <qianxj15@sina.com> Date: 星期二, 09 七月 2024 16:10:50 +0800 Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj --- jrj/project/business/Expense/CommissionExpenseBase.cpp | 0 jrj/project/business/Expense/Drawback.cpp | 0 jrj/project/business/Expense/SpecialDeductFeeList.cpp | 0 jrj/project/business/Expense/basicfareTypeList.cpp | 0 jrj/project/business/Expense/CommissionExpenseItem.cpp | 0 jrj/project/business/Expense/maint.samplesequest.cpp | 0 jrj/project/business/Expense/ReimbursementMaint.cpp | 0 jrj/project/business/Expense/ExportCreditMaint.cpp | 0 jrj/project/business/Expense/ExportCredit.cpp | 0 jrj/project/business/Supplier/maint.Document.SupplierSD.cpp | 0 jrj/project/business/Expense/FreightExpenseItem.cpp | 0 jrj/project/business/Expense/TestExpenseBase.cpp | 0 jrj/project/business/Expense/maint.Document.SampleRequestForm.cpp | 0 jrj/project/business/Expense/CommissionExpense.cpp | 0 jrj/project/business/Expense/ExportCredit.SwitchTo.cpp | 0 jrj/project/business/Expense/maint.basicfare.cpp | 0 jrj/project/business/Expense/BasicFare.cpp | 0 jrj/project/business/Expense/SelectSalaryslip.cpp | 0 jrj/project/business/Expense/Salaryslip.cpp | 0 jrj/project/business/Expense/ExchangeRate.cpp | 0 jrj/project/business/Expense/FreightExpenseInput.cpp | 0 jrj/project/business/Expense/Reimbursement.cpp | 0 jrj/project/business/Expense/maint.samplefee.cpp | 0 jrj/project/business/Expense/TestExpense.cpp | 0 jrj/project/business/Expense/PaperCardReconciliationEx.cpp | 0 jrj/project/business/Customer3.maint.cpp | 6 +++--- jrj/project/business/Expense/maint.Document.ExportCredit.cpp | 0 jrj/project/business/Expense/SampleFee.cpp | 0 jrj/project/business/Expense/TestExpenseBase2.cpp | 0 jrj/project/business/GDN3.maint.cpp | 2 +- jrj/project/business/Expense/MouldFee.cpp | 0 jrj/project/business/Expense/SampleRequestForm.cpp | 0 jrj/project/business/Expense/maint.salaryslip.cpp | 0 33 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jrj/project/business/Customer3.maint.cpp b/jrj/project/business/Customer3.maint.cpp index 830737d..936c46f 100644 --- a/jrj/project/business/Customer3.maint.cpp +++ b/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); diff --git a/jrj/project/business/Expense/BasicFare.cpp b/jrj/project/business/Expense/BasicFare.cpp index 7dfdb52..e74b03a 100644 --- a/jrj/project/business/Expense/BasicFare.cpp +++ b/jrj/project/business/Expense/BasicFare.cpp Binary files differ diff --git a/jrj/project/business/Expense/CommissionExpense.cpp b/jrj/project/business/Expense/CommissionExpense.cpp index c4a8600..99ccd69 100644 --- a/jrj/project/business/Expense/CommissionExpense.cpp +++ b/jrj/project/business/Expense/CommissionExpense.cpp Binary files differ diff --git a/jrj/project/business/Expense/CommissionExpenseBase.cpp b/jrj/project/business/Expense/CommissionExpenseBase.cpp index 765e880..6a433f6 100644 --- a/jrj/project/business/Expense/CommissionExpenseBase.cpp +++ b/jrj/project/business/Expense/CommissionExpenseBase.cpp Binary files differ diff --git a/jrj/project/business/Expense/CommissionExpenseItem.cpp b/jrj/project/business/Expense/CommissionExpenseItem.cpp index 794c22e..a1080f7 100644 --- a/jrj/project/business/Expense/CommissionExpenseItem.cpp +++ b/jrj/project/business/Expense/CommissionExpenseItem.cpp Binary files differ diff --git a/jrj/project/business/Expense/Drawback.cpp b/jrj/project/business/Expense/Drawback.cpp index 35fb2e4..d5729b3 100644 --- a/jrj/project/business/Expense/Drawback.cpp +++ b/jrj/project/business/Expense/Drawback.cpp Binary files differ diff --git a/jrj/project/business/Expense/ExchangeRate.cpp b/jrj/project/business/Expense/ExchangeRate.cpp index 52f874d..4015b3b 100644 --- a/jrj/project/business/Expense/ExchangeRate.cpp +++ b/jrj/project/business/Expense/ExchangeRate.cpp Binary files differ diff --git a/jrj/project/business/Expense/ExportCredit.SwitchTo.cpp b/jrj/project/business/Expense/ExportCredit.SwitchTo.cpp index e9c684e..c6a5f19 100644 --- a/jrj/project/business/Expense/ExportCredit.SwitchTo.cpp +++ b/jrj/project/business/Expense/ExportCredit.SwitchTo.cpp Binary files differ diff --git a/jrj/project/business/Expense/ExportCredit.cpp b/jrj/project/business/Expense/ExportCredit.cpp index f8954fa..bf0f8b8 100644 --- a/jrj/project/business/Expense/ExportCredit.cpp +++ b/jrj/project/business/Expense/ExportCredit.cpp Binary files differ diff --git a/jrj/project/business/Expense/ExportCreditMaint.cpp b/jrj/project/business/Expense/ExportCreditMaint.cpp index 1a4e93b..3ff980d 100644 --- a/jrj/project/business/Expense/ExportCreditMaint.cpp +++ b/jrj/project/business/Expense/ExportCreditMaint.cpp Binary files differ diff --git a/jrj/project/business/Expense/FreightExpenseInput.cpp b/jrj/project/business/Expense/FreightExpenseInput.cpp index f6b04cd..8bc89e8 100644 --- a/jrj/project/business/Expense/FreightExpenseInput.cpp +++ b/jrj/project/business/Expense/FreightExpenseInput.cpp Binary files differ diff --git a/jrj/project/business/Expense/FreightExpenseItem.cpp b/jrj/project/business/Expense/FreightExpenseItem.cpp index ea5c9f8..ecfacbe 100644 --- a/jrj/project/business/Expense/FreightExpenseItem.cpp +++ b/jrj/project/business/Expense/FreightExpenseItem.cpp Binary files differ diff --git a/jrj/project/business/Expense/MouldFee.cpp b/jrj/project/business/Expense/MouldFee.cpp index d093587..151790f 100644 --- a/jrj/project/business/Expense/MouldFee.cpp +++ b/jrj/project/business/Expense/MouldFee.cpp Binary files differ diff --git a/jrj/project/business/Expense/PaperCardReconciliationEx.cpp b/jrj/project/business/Expense/PaperCardReconciliationEx.cpp index 08ed45f..60e5b48 100644 --- a/jrj/project/business/Expense/PaperCardReconciliationEx.cpp +++ b/jrj/project/business/Expense/PaperCardReconciliationEx.cpp Binary files differ diff --git a/jrj/project/business/Expense/Reimbursement.cpp b/jrj/project/business/Expense/Reimbursement.cpp index 48a66da..b60710f 100644 --- a/jrj/project/business/Expense/Reimbursement.cpp +++ b/jrj/project/business/Expense/Reimbursement.cpp Binary files differ diff --git a/jrj/project/business/Expense/ReimbursementMaint.cpp b/jrj/project/business/Expense/ReimbursementMaint.cpp index f5aebab..e71c89a 100644 --- a/jrj/project/business/Expense/ReimbursementMaint.cpp +++ b/jrj/project/business/Expense/ReimbursementMaint.cpp Binary files differ diff --git a/jrj/project/business/Expense/Salaryslip.cpp b/jrj/project/business/Expense/Salaryslip.cpp index 2234ae6..a305606 100644 --- a/jrj/project/business/Expense/Salaryslip.cpp +++ b/jrj/project/business/Expense/Salaryslip.cpp Binary files differ diff --git a/jrj/project/business/Expense/SampleFee.cpp b/jrj/project/business/Expense/SampleFee.cpp index a17bbb0..1eacdfc 100644 --- a/jrj/project/business/Expense/SampleFee.cpp +++ b/jrj/project/business/Expense/SampleFee.cpp Binary files differ diff --git a/jrj/project/business/Expense/SampleRequestForm.cpp b/jrj/project/business/Expense/SampleRequestForm.cpp index 9bb4b15..c4d1236 100644 --- a/jrj/project/business/Expense/SampleRequestForm.cpp +++ b/jrj/project/business/Expense/SampleRequestForm.cpp Binary files differ diff --git a/jrj/project/business/Expense/SelectSalaryslip.cpp b/jrj/project/business/Expense/SelectSalaryslip.cpp index 5e52a32..1d9cf41 100644 --- a/jrj/project/business/Expense/SelectSalaryslip.cpp +++ b/jrj/project/business/Expense/SelectSalaryslip.cpp Binary files differ diff --git a/jrj/project/business/Expense/SpecialDeductFeeList.cpp b/jrj/project/business/Expense/SpecialDeductFeeList.cpp index 754bef2..6153f43 100644 --- a/jrj/project/business/Expense/SpecialDeductFeeList.cpp +++ b/jrj/project/business/Expense/SpecialDeductFeeList.cpp Binary files differ diff --git a/jrj/project/business/Expense/TestExpense.cpp b/jrj/project/business/Expense/TestExpense.cpp index d062457..b381fac 100644 --- a/jrj/project/business/Expense/TestExpense.cpp +++ b/jrj/project/business/Expense/TestExpense.cpp Binary files differ diff --git a/jrj/project/business/Expense/TestExpenseBase.cpp b/jrj/project/business/Expense/TestExpenseBase.cpp index 8b30c9c..c3f6bbd 100644 --- a/jrj/project/business/Expense/TestExpenseBase.cpp +++ b/jrj/project/business/Expense/TestExpenseBase.cpp Binary files differ diff --git a/jrj/project/business/Expense/TestExpenseBase2.cpp b/jrj/project/business/Expense/TestExpenseBase2.cpp index 2e5e7a5..cde82b0 100644 --- a/jrj/project/business/Expense/TestExpenseBase2.cpp +++ b/jrj/project/business/Expense/TestExpenseBase2.cpp Binary files differ diff --git a/jrj/project/business/Expense/basicfareTypeList.cpp b/jrj/project/business/Expense/basicfareTypeList.cpp index 5b41822..f26ab11 100644 --- a/jrj/project/business/Expense/basicfareTypeList.cpp +++ b/jrj/project/business/Expense/basicfareTypeList.cpp Binary files differ diff --git a/jrj/project/business/Expense/maint.Document.ExportCredit.cpp b/jrj/project/business/Expense/maint.Document.ExportCredit.cpp index 3e4f4ca..0fb25c4 100644 --- a/jrj/project/business/Expense/maint.Document.ExportCredit.cpp +++ b/jrj/project/business/Expense/maint.Document.ExportCredit.cpp Binary files differ diff --git a/jrj/project/business/Expense/maint.Document.SampleRequestForm.cpp b/jrj/project/business/Expense/maint.Document.SampleRequestForm.cpp index 68ffd1a..8cda51d 100644 --- a/jrj/project/business/Expense/maint.Document.SampleRequestForm.cpp +++ b/jrj/project/business/Expense/maint.Document.SampleRequestForm.cpp Binary files differ diff --git a/jrj/project/business/Expense/maint.basicfare.cpp b/jrj/project/business/Expense/maint.basicfare.cpp index 18960d0..c32b7c1 100644 --- a/jrj/project/business/Expense/maint.basicfare.cpp +++ b/jrj/project/business/Expense/maint.basicfare.cpp Binary files differ diff --git a/jrj/project/business/Expense/maint.salaryslip.cpp b/jrj/project/business/Expense/maint.salaryslip.cpp index 1f503da..9208779 100644 --- a/jrj/project/business/Expense/maint.salaryslip.cpp +++ b/jrj/project/business/Expense/maint.salaryslip.cpp Binary files differ diff --git a/jrj/project/business/Expense/maint.samplefee.cpp b/jrj/project/business/Expense/maint.samplefee.cpp index 603a586..1ccbda8 100644 --- a/jrj/project/business/Expense/maint.samplefee.cpp +++ b/jrj/project/business/Expense/maint.samplefee.cpp Binary files differ diff --git a/jrj/project/business/Expense/maint.samplesequest.cpp b/jrj/project/business/Expense/maint.samplesequest.cpp index 4c94682..2fbb20c 100644 --- a/jrj/project/business/Expense/maint.samplesequest.cpp +++ b/jrj/project/business/Expense/maint.samplesequest.cpp Binary files differ diff --git a/jrj/project/business/GDN3.maint.cpp b/jrj/project/business/GDN3.maint.cpp index 868e093..5325a11 100644 --- a/jrj/project/business/GDN3.maint.cpp +++ b/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); } diff --git a/jrj/project/business/Supplier/maint.Document.SupplierSD.cpp b/jrj/project/business/Supplier/maint.Document.SupplierSD.cpp index dccdf65..311f6ac 100644 --- a/jrj/project/business/Supplier/maint.Document.SupplierSD.cpp +++ b/jrj/project/business/Supplier/maint.Document.SupplierSD.cpp Binary files differ -- Gitblit v1.9.3