From 8b9038bda83efe8f9f4e3097395fd3ffee31ec9a Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 18 十一月 2024 23:16:27 +0800
Subject: [PATCH] update

---
 jrj/project/business/QuoteFile.cpp |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/jrj/project/business/QuoteFile.cpp b/jrj/project/business/QuoteFile.cpp
index 278e971..eb32a9e 100644
--- a/jrj/project/business/QuoteFile.cpp
+++ b/jrj/project/business/QuoteFile.cpp
@@ -2220,7 +2220,10 @@
 	{
 		trace(L"BusinessItemID:" + id);
 		xml x = ViewObject::RetrieveData(L"/sale/data/TO/business/document", L"BusinessItemID", id);
-
+		
+		BSTR str;
+		x.get_xml(str);
+		::SysFreeString(str);
 		/*
 		xml sheet ;
 		sheet.setNativePointer(x.CreateInstance());
@@ -4148,6 +4151,7 @@
 		ensureRowID();
 
 		xstring content = dw_cell.GetData();
+		string val = content.c_str();
 		content = content.mid(content.find(L"<xsheet"), 9999999);
 		while (true)
 		{
@@ -5059,7 +5063,7 @@
 			dw_cell.SetColumnWidth(colCustomerItemNo, 0);
 			dw_cell.SetColumnWidth(colItemName, 0);
 			dw_cell.SetColumnWidth(colItemCName, 0);
-			dw_cell.SetColumnWidth(colBuyerRemark, 0);
+			//dw_cell.SetColumnWidth(colBuyerRemark, 0);
 			dw_cell.SetColumnWidth(colPackage, 0);
 			dw_cell.SetColumnWidth(colQty, 0);
 			dw_cell.SetColumnWidth(col40HQ, 0);
@@ -5109,7 +5113,7 @@
 					}
 				}
 			}
-			if (!bPrice1)
+			if (!bPrice1 && colSupplier1 > 0)
 			{
 				dw_cell.SetRowColumn(1, colSupplier1);
 				dw_cell.SetAnchorRowColumn(1, colSupplier1);

--
Gitblit v1.9.3