From 9ab768f94cecdcec13c22e7d70e9fd8a18afef53 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期二, 23 七月 2024 17:41:43 +0800
Subject: [PATCH] update

---
 jrj/project/business/Expense/CommissionExpense.cpp         |    0 
 jrj/project/business/VATNotify/list.vatinvoice.cpp         |    4 ++--
 jrj/project/business/Expense/APSplite.cpp                  |    0 
 jrj/project/business/Expense/BasicFare.cpp                 |    0 
 jrj/project/business/Expense/PaperCardReconciliation.cpp   |    0 
 jrj/project/business/Expense/list.expense.ap.cpp           |    0 
 jrj/project/business/AP/list.ap.cpp                        |    8 ++++----
 jrj/project/business/Expense/FreightExpenseInput.cpp       |    0 
 jrj/project/business/AR/ExchangeSignFast.cpp               |    2 +-
 jrj/project/business/Expense/list.manage.ap.cpp            |    0 
 jrj/project/business/Expense/PaperCardReconciliationEx.cpp |    0 
 jrj/project/business/GDN/tracer.so.cpp                     |    0 
 jrj/project/business/VATNotify/list.vatnotify.cpp          |    2 +-
 jrj/project/business/GDN/AdvanceChargeList.cpp             |    0 
 14 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jrj/project/business/AP/list.ap.cpp b/jrj/project/business/AP/list.ap.cpp
index 32b5155..fd27ed8 100644
--- a/jrj/project/business/AP/list.ap.cpp
+++ b/jrj/project/business/AP/list.ap.cpp
@@ -191,7 +191,7 @@
 			int h = xcombobox::GetCurSel(evt->command.hCtrl);
 			if (h > -1)
 			{
-				xstring txt = xcombobox::GetLBText(evt->command.hCtrl, h);
+				xstring txt = (string)xcombobox::GetLBText(evt->command.hCtrl, h);
 				apType = L"---";
 				if (txt == L"已付货款")
 				{
@@ -300,7 +300,7 @@
 				int h = xcombobox::GetCurSel(evt->command.hCtrl);
 				if (h > -1)
 				{
-					xstring txt = xcombobox::GetLBText(evt->command.hCtrl, h);
+					xstring txt = (string)xcombobox::GetLBText(evt->command.hCtrl, h);
 					if (txt == L"出运日期")
 					{
 						apType = L"000";
@@ -326,7 +326,7 @@
 				int h1 = xcombobox::GetCurSel(evt->command.hCtrl);
 				if (h1 > -1)
 				{
-					xstring txt1 = xcombobox::GetLBText(evt->command.hCtrl, h1);
+					xstring txt1 = (string)xcombobox::GetLBText(evt->command.hCtrl, h1);
 					if (txt1 == L"出运日期")
 					{
 						apType = L"001";
@@ -352,7 +352,7 @@
 				int h2 = xcombobox::GetCurSel(evt->command.hCtrl);
 				if (h2 > -1)
 				{
-					xstring txt2 = xcombobox::GetLBText(evt->command.hCtrl, h2);
+					xstring txt2 = (string)xcombobox::GetLBText(evt->command.hCtrl, h2);
 					if (txt2 == L"出运日期")
 					{
 						apType = L"001";
diff --git a/jrj/project/business/AR/ExchangeSignFast.cpp b/jrj/project/business/AR/ExchangeSignFast.cpp
index 63e1b6c..71177b6 100644
--- a/jrj/project/business/AR/ExchangeSignFast.cpp
+++ b/jrj/project/business/AR/ExchangeSignFast.cpp
@@ -134,7 +134,7 @@
 			int h = xcombobox::GetCurSel(evt->command.hCtrl);
 			if (h > -1)
 			{
-				xstring txt = xcombobox::GetLBText(evt->command.hCtrl, h);
+				xstring txt = (string)xcombobox::GetLBText(evt->command.hCtrl, h);
 				if (txt == L"限定客户")
 				{
 					OnRetrieve(1);
diff --git a/jrj/project/business/Expense/APSplite.cpp b/jrj/project/business/Expense/APSplite.cpp
index a94c061..cdef550 100644
--- a/jrj/project/business/Expense/APSplite.cpp
+++ b/jrj/project/business/Expense/APSplite.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/BasicFare.cpp b/jrj/project/business/Expense/BasicFare.cpp
index 9fb8658..3b6285f 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 70496b8..846415f 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/FreightExpenseInput.cpp b/jrj/project/business/Expense/FreightExpenseInput.cpp
index 0a43dce..ac449c3 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/PaperCardReconciliation.cpp b/jrj/project/business/Expense/PaperCardReconciliation.cpp
index 6582b86..e73a5b9 100644
--- a/jrj/project/business/Expense/PaperCardReconciliation.cpp
+++ b/jrj/project/business/Expense/PaperCardReconciliation.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/PaperCardReconciliationEx.cpp b/jrj/project/business/Expense/PaperCardReconciliationEx.cpp
index dd1aee2..4cb541b 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/list.expense.ap.cpp b/jrj/project/business/Expense/list.expense.ap.cpp
index 0e24d94..acc555a 100644
--- a/jrj/project/business/Expense/list.expense.ap.cpp
+++ b/jrj/project/business/Expense/list.expense.ap.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/list.manage.ap.cpp b/jrj/project/business/Expense/list.manage.ap.cpp
index df91714..52f73f3 100644
--- a/jrj/project/business/Expense/list.manage.ap.cpp
+++ b/jrj/project/business/Expense/list.manage.ap.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/AdvanceChargeList.cpp b/jrj/project/business/GDN/AdvanceChargeList.cpp
index d6d6ed0..9fdba08 100644
--- a/jrj/project/business/GDN/AdvanceChargeList.cpp
+++ b/jrj/project/business/GDN/AdvanceChargeList.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/tracer.so.cpp b/jrj/project/business/GDN/tracer.so.cpp
index 8c22d3c..dc4a320 100644
--- a/jrj/project/business/GDN/tracer.so.cpp
+++ b/jrj/project/business/GDN/tracer.so.cpp
Binary files differ
diff --git a/jrj/project/business/VATNotify/list.vatinvoice.cpp b/jrj/project/business/VATNotify/list.vatinvoice.cpp
index f4a5f8c..efbd86c 100644
--- a/jrj/project/business/VATNotify/list.vatinvoice.cpp
+++ b/jrj/project/business/VATNotify/list.vatinvoice.cpp
@@ -98,7 +98,7 @@
 			int h = xcombobox::GetCurSel(evt->command.hCtrl);
 			if(h > -1) 
 			{
-				xstring txt = xcombobox::GetLBText(evt->command.hCtrl, h);
+				xstring txt = (string)xcombobox::GetLBText(evt->command.hCtrl, h);
 				if(txt==L"增值税票")
 				{
 					dw_list.openUrl(L"/sale/view/VATNotify/template/VATInvoice/list");
@@ -203,7 +203,7 @@
 			int h = xcombobox::GetCurSel(evt->command.hCtrl);
 			if(h > -1) 
 			{
-				xstring txt = xcombobox::GetLBText(evt->command.hCtrl, h);
+				xstring txt = (string)xcombobox::GetLBText(evt->command.hCtrl, h);
 				if(txt==L"出运日期")
 				{
 				
diff --git a/jrj/project/business/VATNotify/list.vatnotify.cpp b/jrj/project/business/VATNotify/list.vatnotify.cpp
index bda9215..82305aa 100644
--- a/jrj/project/business/VATNotify/list.vatnotify.cpp
+++ b/jrj/project/business/VATNotify/list.vatnotify.cpp
@@ -289,7 +289,7 @@
 			int h = xcombobox::GetCurSel(evt->command.hCtrl);
 			if (h > -1)
 			{
-				xstring txt = xcombobox::GetLBText(evt->command.hCtrl, h);
+				xstring txt = (string)xcombobox::GetLBText(evt->command.hCtrl, h);
 				if (txt == L"通知日期")
 				{
 

--
Gitblit v1.9.3