From 9ac9cc9e9cd91b97d35a6e28400df71630765e40 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 21 八月 2024 14:35:51 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/GDN3.list.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jrj/project/business/GDN3.list.cpp b/jrj/project/business/GDN3.list.cpp
index fe164f6..18475f1 100644
--- a/jrj/project/business/GDN3.list.cpp
+++ b/jrj/project/business/GDN3.list.cpp
@@ -420,7 +420,7 @@
KXMLDOMDocument supplier_x = ViewObject::RetrieveData(L"/sale/data/SupplierV3/entity/FindBySaleType", L"id", s);
if (supplier_x)
{
- if (supplier_x.text() != L"跟单")
+ if ((xstring)supplier_x.text() != L"跟单")
{
alert(L"当前角色不是跟单员不能新增单子，请重新选择角色");
return 0;
@@ -433,7 +433,7 @@
xstring EntityIDEx = dw_list.GetGuid(dw_list.GetRow());
xaserverarg argEx;
- alert(EntityIDEx);
+ //alert(EntityIDEx);
argEx.AddArg(L"GDNID", EntityIDEx);
OpenWindow(L"dev:xpage[GDNDelay.vx]", argEx);
return 1;
--
Gitblit v1.9.3