From d63c79fa7bca8a286351b35bcea334509a1bb3fd Mon Sep 17 00:00:00 2001
From: 仲国强 <519541279@qq.com>
Date: 星期五, 03 九月 2021 16:43:29 +0800
Subject: [PATCH] 首检、工序检、质量汇报模块存入生产任务单子id。
---
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs | 294 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 256 insertions(+), 38 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
index a218daf..da3b415 100644
--- a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -78,13 +78,23 @@
{
try
{
- ds = oCN.RunProcReturn("select * from Gy_Department where hitemid = " + HInterID, "Gy_Department");
-
+ ds = oCN.RunProcReturn("select * from h_v_IF_DepartmentListDetail where HitemID = " + HInterID, "h_v_IF_DepartmentListDetail");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
+ }
}
catch (Exception e)
{
@@ -97,33 +107,102 @@
}
/// <summary>
- /// 閮ㄩ棬鍒楄〃鍒犻櫎鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
+ /// 閮ㄩ棬鍒楄〃鍒犻櫎鍔熻兘
/// </summary>
- [Route("Gy_Department/Delete_Json")]
+ /// <returns></returns>
+ [Route("DeltetGy_Department")]
[HttpGet]
- public object Delete_Json(long HItemID)
+ public object DeltetGy_Department(string HItemID)
{
+ DataSet ds;
+ DataSet ds1;
try
{
- ds = oCN.RunProcReturn("delete from Gy_Department where HItemID = " + HItemID, "Gy_Department");
-
- objJsonResult.code = "1";
+ //鍒犻櫎鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (string.IsNullOrWhiteSpace(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HItemID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+ ds = oCN.RunProcReturn("select * from Gy_Department where HItemID=" + HItemID, "Gy_Department");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ ds1 = oCN.RunProcReturn("Select HItemID from Gy_Department Where HParentID='" + HItemID + "'", "Gy_Department");
+ if (ds1.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
+ if (HUseFlag == "宸蹭娇鐢�")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩凡浣跨敤锛屼笉鑳藉垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //v
+ //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ //if (HStopflag)
+ //{
+ // oCN.RollBack();//鍥炴粴浜嬪姟
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ oCN.RunProc("delete from Gy_Department where HItemID=" + HItemID);
+ oCN.Commit();//鎻愪氦浜嬪姟
+ objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
objJsonResult.data = null;
- return objJsonResult;
+ return objJsonResult; ;
+
}
catch (Exception e)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
}
+
+ //[Route("Gy_Department/LoadTree")]
+ //[HttpGet]
+ //public object LoadTree_Json()
+ //{
+ // DBUtility.Gy_BaseFun.LoadTree(tv, imageList1, this.Text, BillName);
+ //}
+
/// <summary>
/// 閮ㄩ棬鍒楄〃绂佺敤鎸夐挳
@@ -197,6 +276,12 @@
string msg1 = _value.ToString();
//鍙嶅簭鍒楀寲
msg1 = "[" + msg1.ToString() + "]";
+
+ DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
+ DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
+
+
+
List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg1);
long HItemID = list[0].HItemID;
@@ -206,6 +291,30 @@
string HRemark = list[0].HRemark;
string HUseFlag = list[0].HUseFlag;
long HParentID = list[0].HParentID;
+ string HBarCode = list[0].HBarCode;
+ string HHelpCode = list[0].HHelpCode;
+ long HSecManagerID = list[0].HSecManagerID;
+ string HCreator = list[0].HCreator;
+ long HCreateOrgID = list[0].HCreateOrgID;
+ //DateTime HCreateDate = list[0].HCreateDate;
+ long HUseOrgID = list[0].HUseOrgID;
+ string HUpdater = list[0].HUpDater;
+ //DateTime HUpdateDate = list[0].HUpDateDate;
+ string HChecker = list[0].HChecker;
+ //DateTime HCheckDate = list[0].HCheckDate;
+ string HDeleteMan = list[0].HDeleteMan;
+ //DateTime HDeleteDate = list[0].HDeleteDate;
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
@@ -214,9 +323,15 @@
oCN.RunProc("Insert Into Gy_Department " +
"(HNumber,HShortNumber,HName,HParentID" +
",HLevel,HEndFlag,HRemark,HStopFlag,HUseFlag" +
+ ",HCREATEORGID,HUSEORGID,HBarCode,HCreator" +
+ ",HUpdater,HChecker,HDeleteMan" +
+ ",HSecManagerID,HCreateDate" +
") " +
" values('" + HNumber + "','" + HShortNumber + "','" + HName + "',0" +
",'',0,'" + HRemark + "',0,''" +
+ "," + HCreateOrgID + "," + HUseOrgID + ",'" + HBarCode + "','" + HCreator + "'" +
+ ",'" + HUpdater + "','" + HChecker + "','" + HDeleteMan + "'" +
+ "," + HSecManagerID + ", getdate()" +
") ");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -240,7 +355,7 @@
/// <summary>
- /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
+ /// 淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
@@ -248,45 +363,121 @@
[HttpPost]
public object AddBill1([FromBody] JObject oMain)
{
+
try
{
+ DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
+ DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
+
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[1].ToString();
- string msg3 = sArray[0].ToString();
+ string msg2 = sArray[0].ToString();
+ //string msg3 = sArray[1].ToString();
+ //string msg4 = sArray[2].ToString();
+ //string msg5 = sArray[3].ToString();
//鍙嶅簭鍒楀寲
- msg3 = "[" + msg3.ToString() + "]";
- List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg3);
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg2);
- long HItemID = int.Parse(msg2);
+ long HItemID = list[0].HItemID;
string HNumber = list[0].HNumber;
string HName = list[0].HName;
string HShortNumber = list[0].HShortNumber;
string HRemark = list[0].HRemark;
string HUseFlag = list[0].HUseFlag;
long HParentID = list[0].HParentID;
+ string HBarCode = list[0].HBarCode;
+ string HHelpCode = list[0].HHelpCode;
+ string HUpDater = list[0].HUpDater;
+ long HEmpID = list[0].HEmpID;
+ bool HStopflag = list[0].HStopflag;
+ long HSecManagerID = list[0].HSecManagerID;
+ //string HCreator = list[0].HCreator;
+ long HCreateOrgID = list[0].HCreateOrgID;
+ //DateTime HCreateDate = list[0].HCreateDate;
+ long HUseOrgID = list[0].HUseOrgID;
+ string HUpdater = list[0].HUpDater;
+ //DateTime HUpdateDate = list[0].HUpDateDate;
+ string HChecker = list[0].HChecker;
+ //DateTime HCheckDate = list[0].HCheckDate;
+ string HDeleteMan = list[0].HDeleteMan;
+ //DateTime HDeleteDate = list[0].HDeleteDate;
+ long HLevel = 1;
+ bool HEndFlag = true;
+ long HEntityID = 1;
+
+ //鍒ゆ柇鏉冮檺
+ //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
- //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- oCN.BeginTran();
- //涓昏〃
- oCN.RunProc("Update Gy_Department set " +
- " HNumber='" + HNumber + "'" +
- ",HName='" + HName + "'" +
- ",HShortNumber='" + HShortNumber + "'" +
- ",HParentID=" + HParentID +
- ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼瀛愰」鐩唬鐮�
- //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
- //灏嗕笂绾� 涓洪潪鏈骇
- //oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
- //
- oCN.Commit();
- objJsonResult.code = "1";
+ //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 (HItemID == 0)
+ {
+ //鏂板
+ oCN.BeginTran();
+ oCN.RunProc("Insert into Gy_Department " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HBarCodeForBase,HEntityID,HUSEORGID) " +
+ " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
+ "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID + ",'" + HBarCode + "'" +
+ "," + HEntityID.ToString() +","+ HUseOrgID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ }
+ else
+ {
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Update Gy_Department set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HHelpCode='" + HHelpCode + "'" +
+ ",HShortNumber='" + HShortNumber + "'" +
+ ",HParentID=" + HParentID +
+ ",HEmpID=" + HEmpID.ToString() +
+ ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
+ //",HUpdater='" + HUpdater + "'" +
+ //",HUpdateDate= getdate()" +
+ ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ }
+ objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "淇敼鍗曟嵁鎴愬姛锛�";
- //objJsonResult.data = null;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
return objJsonResult;
}
catch (Exception e)
@@ -299,7 +490,6 @@
return objJsonResult;
}
}
-
/// <summary>
/// 鑾峰彇鏈�澶у熀纭�璧勬枡ID
@@ -361,6 +551,34 @@
}
+
+ [Route("Gy_Department/LoadTree")]
+ [HttpGet]
+ public object LoadTree_Json(string sWhere)
+ {
+ SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
+ //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
+ ds = oCN.RunProcReturn("select * from h_v_DepartmentLoadTree", "h_v_DepartmentLoadTree");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+
+
+
//
}
}
\ No newline at end of file
--
Gitblit v1.9.1