From fcad30fe36ca74109cc943ed10ae877550c991a6 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期五, 01 十一月 2024 12:25:57 +0800
Subject: [PATCH] update

---
 jrj/project/business/SO/delivery.base.maint.so.cpp |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/jrj/project/business/SO/delivery.base.maint.so.cpp b/jrj/project/business/SO/delivery.base.maint.so.cpp
index b674738..8edfda2 100644
--- a/jrj/project/business/SO/delivery.base.maint.so.cpp
+++ b/jrj/project/business/SO/delivery.base.maint.so.cpp
@@ -1,20 +1,17 @@
-#include <wobject/xstring.hpp>
+锘�#include <wobject/xstring.hpp>
 #include <xcontrol/xtreeview.hpp>
 #include <xcontrol/xdwgrid.hpp>
 #include <xcontrol/xcell.hpp>
-
 
 #include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
 #include "viewobject/view.base.hpp"
 
 
-
+using xml = KXMLDOMDocument;
 	class __declspec(dllexport) DeliveryEdit : public xframe
 	{
 	public:
 		xdwtable	dw_1;
-
-		vcontrol vc;
 		xcell	dw_cell;
 
 	public:
@@ -28,7 +25,7 @@
 
 		xstring OnCreateTxt()
 		{
-			//dw_1.AcceptText(); //不能加会报错
+			//dw_1.AcceptText(); //涓嶈兘鍔犱細鎶ラ敊
 			xstring sType;
 			xstring sDeliveryRule;
 			xstring sDeliveryDays;
@@ -74,8 +71,11 @@
 
 		int OnOk()
 		{
+			xml x;
 			dw_1.AcceptText();
-
+			dw_1.DwUpdateAllTo(x);
+			GetArg().SetArg(L"content", x.xml());
+			GetArg().SetArg(L"process",L"ok");
 			CloseWindow();
 
 			return 1;
@@ -89,7 +89,7 @@
 
 			if (colname == L"DeliveryRule")
 			{
-				xstring sP = L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='保护' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial=''><edit edittype=''/></cellprop>";
+				xstring sP = L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='淇濇姢' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial=''><edit edittype=''/></cellprop>";
 				xstring sUp = L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial=''><edit edittype=''/></cellprop>";
 
 				if (value == L"1" || value == L"2" || value == L"3")
@@ -111,7 +111,7 @@
 
 			}
 
-			//生成交货期
+			//鐢熸垚浜よ揣鏈�
 			if (colname == L"DeliveryRule" || colname == L"DeliveryDays" || colname == L"ScheduleShipDate")
 			{
 				xstring sTxt = OnCreateTxt();
@@ -145,7 +145,8 @@
 
 		int OnInit()
 		{
-			int iArgs = GetParam();
+			/*
+			int iArgs = GetArg();
 
 			XXmlContentSvr xdoc = new XXmlContentSvr;
 			xdoc.setNativePointer(iArgs);
@@ -154,16 +155,14 @@
 
 			vbind bind = new vbind;
 			bind.bind(dw_1, vc);
-
+			*/
 			xml x;
-			x = new xml;
-			x.setNativePointer(xml::CreateInstance());
-			x.LoadXml(vc.GetContent());
-
+			xstring xs = GetArg().GetArgString(L"content");
+			x.loadXML(xs.c_str());
 			dw_1.Retrieve(x);
 
 			xstring sDeliveryRule = dw_1.GetItemString(1, L"DeliveryRule");
-			xstring sP = L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='保护' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial=''><edit edittype=''/></cellprop>";
+			xstring sP = L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='淇濇姢' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial=''><edit edittype=''/></cellprop>";
 			if (sDeliveryRule != L"1" && sDeliveryRule != L"2" && sDeliveryRule != L"3")
 				dw_cell.SetCellProps(3, 3, sP);
 			if (sDeliveryRule != L"5")
@@ -174,6 +173,7 @@
 
 		int onload()
 		{
+			SetArg();
 			dw_1 = GetControl(L"dw_1");
 			dw_1.openUrl(L"/sale/view/SaleOrder/template/delivery"); //base.maint.so.tpl/delivery
 			dw_1.SetColHeaderHeight(0);
@@ -184,7 +184,7 @@
 			dw_cell.setNativePointer(dw_1.QueryItem(L"ixcell"));
 			OnAttachEvent();
 
-			if (GetParam())OnInit();
+			if (GetWinParam())OnInit();
 
 			return 1;
 		}

--
Gitblit v1.9.3