From 73fb291c8893188ca5e4a8188d8dfe5a2d8321fc Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 06 三月 2024 17:31:47 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index c195f24..f81653f 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -1623,6 +1623,7 @@
{
string ModRightNameCheck = "Xs_SeOrderBill_Close";
DBUtility.ClsPub.CurUserName = CurUserName;
+ string sql = "";
try
{
//妫�鏌ユ潈闄�
@@ -1686,6 +1687,18 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸弽鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇鍗曟嵁鏄惁涓鸿嚜鍔ㄥ叧闂�
+ sql = "select * from Xs_SeOrderBillMain where HInterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, "Xs_SeOrderBillMain");
+ if (ds.Tables[0].Rows[0]["HCloseType"].ToString() == "False")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍗曟嵁涓鸿嚜鍔ㄥ叧闂紝涓嶈兘杩涜鎵嬪姩鍙嶅叧闂紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -1865,6 +1878,17 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "琛屾湭鍏抽棴!涓嶉渶瑕佸啀琛屽弽鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇琛屾槸鍚︿负鑷姩鍏抽棴
+ string temp = ds.Tables[0].Rows[0]["HCloseType"].ToString();
+ if (ds.Tables[0].Rows[0]["HCloseType"].ToString() == "False")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "琛屽弽鍏抽棴澶辫触!琛屼负鑷姩鍏抽棴锛屼笉鑳借繘琛屾墜鍔ㄥ弽鍏抽棴锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2194,29 +2218,7 @@
}
else
{
- string sql = "select * from Gy_UserCustomerRelation where HUserID = '" + CurUserID + "'";
- ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- sWhere = " and 1 = 0";
- }
- else
- {
- sWhere = " and HCusID in (";
- for (var i = 0; i < ds.Tables[0].Rows.Count; i++)
- {
- if (i < ds.Tables[0].Rows.Count - 1)
- {
- sWhere += ds.Tables[0].Rows[i]["HCusID"].ToString() + ",";
- }
- else
- {
- sWhere += ds.Tables[0].Rows[i]["HCusID"].ToString() + ")";
- }
- }
- }
-
- //sWhere = " and 1=1 ";
+ sWhere = " and HCusID in (select hcusid from Gy_UserCustomerRelation Where HUserID = '" + CurUserID + "') ";
}
objJsonResult.code = "1";
--
Gitblit v1.9.1