From 2dad7a8139844ff4b57a2ca65e83155ba67a459e Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期一, 23 八月 2021 17:38:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_GroupController.cs | 70 ++++++++++++++++------------------
1 files changed, 33 insertions(+), 37 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
index 197e03e..cc9fafc 100644
--- a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
@@ -20,7 +20,7 @@
/// <summary>
- /// 杩斿洖宸ヤ綔涓績鍒楄〃
+ /// 杩斿洖鐝粍鍒楄〃
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
@@ -79,7 +79,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_GroupList where HitemID=" + HInterID, "h_v_GroupList");
+ ds = oCN.RunProcReturn("select * from h_v_GroupListDetail where HitemID=" + HInterID, "h_v_GroupListDetail");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -220,22 +220,18 @@
{
try
{
- DAL.ClsGy_Group_Ctl oDept = new DAL.ClsGy_Group_Ctl();
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- string msg3 = sArray[1].ToString();
- string msg4 = sArray[2].ToString();
- string msg5 = sArray[3].ToString();
//鍙嶅簭鍒楀寲
- msg2 = "[" + msg2.ToString() + "]";
- List<Gy_Group> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Group>>(msg2);
- long HItemID = int.Parse(msg3);
+ msg1 = "[" + msg1.ToString() + "]";
+ DAL.ClsGy_Group_Ctl oDept = new DAL.ClsGy_Group_Ctl();
+ List<Gy_Group> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Group>>(msg1);
+
+ long HItemID = list[0].HItemID;
string HNumber = list[0].HNumber;
string HName = list[0].HName;
string HShortNumber = list[0].HNumber;
- long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
+ long HParentID = list[0].HParentID;
string HHelpCode = list[0].HHelpCode;
string HRemark = list[0].HRemark;
string HStopflag = list[0].HStopflag;
@@ -246,30 +242,30 @@
var HProcID = list[0].HProcID;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, true, msg4))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (!DBUtility.ClsPub.AllowNumber(HNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (oDept.HavSameNumber(HItemID, HNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "浠ｇ爜閲嶅锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //if (oDept.HavSameNumber(HItemID, HNumber))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "浠ｇ爜閲嶅锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
@@ -288,7 +284,7 @@
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Group,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
//灏嗕笂绾� 涓洪潪鏈骇
- oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
//
oCN.Commit();
objJsonResult.code = "1";
--
Gitblit v1.9.1