From 02bfe366088dd52dd143239a94ea45a1e3e898fe Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 30 八月 2023 09:02:51 +0800
Subject: [PATCH] 采购订单动态列，物料、工序、工艺路线新增质检方案字段，
---
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs | 738 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 667 insertions(+), 71 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
index c6baa4b..2e4b67e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -16,16 +17,14 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
-
/// <summary>
- /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Gy_Process/EditBill")]
+ [Route("Gy_Process/AddNew")]
[HttpPost]
- //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
- public object EditBill([FromBody] JObject oMain)
+ public object AddNew([FromBody] JObject oMain)
{
try
{
@@ -33,7 +32,9 @@
string msg1 = _value.ToString();
//鍙嶅簭鍒楀寲
msg1 = "[" + msg1.ToString() + "]";
+
DAL.ClsGy_Process_Ctl oDept = new DAL.ClsGy_Process_Ctl();
+ DAL.ClsGy_Process_View oDeptHlp = new DAL.ClsGy_Process_View();
List<Gy_Process> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Process>>(msg1);
long HItemID = list[0].HItemID;
@@ -64,46 +65,16 @@
long HDeptID = list[0].HDeptID;
long 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 (!DBUtility.ClsPub.AllowNumber(HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
-
- //涓昏〃
-
- //oCN.RunProc("Update Gy_Process set " +
- // " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- // ",HTypeFlow,HTypeCount,HDeptNumber,HSNo" +
- // ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
- // ",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote) " +
- // " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
- // "," + Convert.ToString(HTypeFlow ? 1 : 0) + "," + Convert.ToString(HTypeCount ? 1 : 0) + ",'" + HDeptNumber + "'," + HSNo.ToString() +
- // "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID +
- // ",'" + HBarCode + "'," + HProcessID_K3 + ",'" + HBillSubType + "'," + Convert.ToString(HAutoTrunFlag ? 1 : 0) +
- // "," + HFixPrice.ToString() + "," +HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo);
-
oCN.BeginTran();
oCN.RunProc("Update Gy_Process set " +
" HNumber='" + HNumber + "'" +
@@ -127,21 +98,346 @@
",HFixPrice= " + HFixPrice +
",HOverFixPrice= " + HOverFixPrice +
",HProcMulID= " + HProcMulID +
- ",HProcCheckNote='" + HProcCheckNote + "'" +
- " Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ ",HProcCheckNote='" + HProcCheckNote + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
- //return true;
- //淇敼瀛愰」鐩唬鐮�
- //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.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "淇敼鍗曟嵁鎴愬姛锛�";
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
//objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ ///// <summary>
+ ///// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
+ /////鍙傛暟锛歴tring sql銆�
+ /////杩斿洖鍊硷細object銆�
+ ///// </summary>
+ //[Route("Gy_Process/EditBill")]
+ //[HttpPost]
+ ////鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ //public object EditBill([FromBody] JObject oMain)
+ //{
+ // try
+ // {
+ // var _value = oMain["oMain"].ToString();
+ // string msg1 = _value.ToString();
+ // //鍙嶅簭鍒楀寲
+ // msg1 = "[" + msg1.ToString() + "]";
+ // DAL.ClsGy_Process_Ctl oDept = new DAL.ClsGy_Process_Ctl();
+ // List<Gy_Process> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Process>>(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;
+ // string HHelpCode = list[0].HHelpCode;
+ // bool HTypeFlow = list[0].HTypeFlow;
+ // bool HTypeCount = list[0].HTypeCount;
+ // string HDeptNumber = "";
+ // long HLevel = ClsPub.GetLevel(list[0].HNumber.Trim());
+ // bool HEndFlag = false;
+ // long HProcessID_K3 = list[0].HProcessID_K3;
+ // string HBillSubType = list[0].HType;
+ // bool HAutoTrunFlag = list[0].HAutoTrunFlag;
+ // string HFixPrice = list[0].HFixPrice;
+ // string HOverFixPrice = list[0].HOverFixPrice;
+ // string HSNo = list[0].HSNo;
+ // string HBarCode = list[0].HBarCode;
+ // string HProcMulID = list[0].HProcMulID;
+ // string HProcCheckNote = list[0].HProcCheckNote;
+ // string HRemark = list[0].HRemark;
+ // bool HStopflag = list[0].HStopflag;
+ // string HUseFlag = list[0].HUseFlag;
+ // long HEmpQty = list[0].HEmpQty;
+ // string HBarCodeForBase = list[0].HBarCodeForBase;
+ // long HDeptID = list[0].HDeptID;
+ // long HProcID = list[0].HProcID;
+
+ // //鍒ゆ柇鏉冮檺
+ // //if (!ClsPub.Security_Log(msg5, 1, false, 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.RunProc("Update Gy_Process set " +
+ // // " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ // // ",HTypeFlow,HTypeCount,HDeptNumber,HSNo" +
+ // // ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
+ // // ",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote) " +
+ // // " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
+ // // "," + Convert.ToString(HTypeFlow ? 1 : 0) + "," + Convert.ToString(HTypeCount ? 1 : 0) + ",'" + HDeptNumber + "'," + HSNo.ToString() +
+ // // "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID +
+ // // ",'" + HBarCode + "'," + HProcessID_K3 + ",'" + HBillSubType + "'," + Convert.ToString(HAutoTrunFlag ? 1 : 0) +
+ // // "," + HFixPrice.ToString() + "," +HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+
+
+ // oCN.BeginTran();
+ // oCN.RunProc("Update Gy_Process set " +
+ // " HNumber='" + HNumber + "'" +
+ // ",HName='" + HName + "'" +
+ // ",HHelpCode='" + HHelpCode + "'" +
+ // ",HShortNumber='" + HShortNumber + "'" +
+ // ",HParentID= " + HParentID +
+ // ",HTypeFlow= '" + HTypeFlow + "'" +
+ // ",HTypeCount= '" + HTypeCount + "'" +
+ // ",HDeptNumber='" + HDeptNumber + "'" +
+ // ",HSNo= " + HSNo +
+ // ",HLevel= " + HLevel +
+ // ",HEndFlag= '" + HEndFlag + "'" +
+ // ",HStopflag= '" + HStopflag + "'" +
+ // ",HRemark='" + HRemark + "'" +
+ // ",HDeptID= " + HDeptID +
+ // ",HBarCodeForBase='" + HBarCodeForBase + "'" +
+ // ",HProcessID_K3= " + HProcessID_K3 +
+ // ",HBillSubType='" + HBillSubType + "'" +
+ // ",HAutoTrunFlag= '" + HAutoTrunFlag + "'" +
+ // ",HFixPrice= " + HFixPrice +
+ // ",HOverFixPrice= " + HOverFixPrice +
+ // ",HProcMulID= " + HProcMulID +
+ // ",HProcCheckNote='" + HProcCheckNote + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ // //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ // oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ // //return true;
+ // //淇敼瀛愰」鐩唬鐮�
+ // //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.Commit();
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "淇敼鍗曟嵁鎴愬姛锛�";
+ // //objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // catch (Exception e)
+ // {
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "Exception锛�" + e.Message;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
+
+ /// <summary>
+ /// 淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Process/ModifyByID")]
+ [HttpPost]
+ public object ModifyByID([FromBody] JObject oMain)
+ {
+ try
+ {
+ DAL.ClsGy_Process_Ctl oDept = new DAL.ClsGy_Process_Ctl();
+ DAL.ClsGy_Process_View oDeptHlp = new DAL.ClsGy_Process_View();
+
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();//鐢ㄦ埛鍚�
+
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_Process_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愮紪杈�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //string msg3 = sArray[1].ToString();
+ //string msg4 = sArray[2].ToString();
+ //string msg5 = sArray[3].ToString();
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Gy_Process> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Process>>(msg2);
+
+ 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;
+ string HHelpCode = list[0].HHelpCode;
+ bool HTypeFlow = list[0].HTypeFlow;
+ bool HTypeCount = list[0].HTypeCount;
+ string HDeptNumber = "";
+ long HLevel = ClsPub.GetLevel(list[0].HNumber.Trim());
+ bool HEndFlag = true;
+ long HProcessID_K3 = list[0].HProcessID_K3;
+ string HBillSubType = list[0].HType;
+ bool HAutoTrunFlag = list[0].HAutoTrunFlag;
+ string HFixPrice = list[0].HFixPrice;
+ string HOverFixPrice = list[0].HOverFixPrice;
+ string HSNo = list[0].HSNo;
+ string HBarCode = list[0].HBarCode;
+ string HProcMulID = list[0].HProcMulID==null?"0": list[0].HProcMulID;
+ string HProcCheckNote = list[0].HProcCheckNote;
+ string HRemark = list[0].HRemark;
+ bool HStopflag = list[0].HStopflag;
+ string HUseFlag = list[0].HUseFlag;
+ long HEmpQty = list[0].HEmpQty;
+ string HBarCodeForBase = list[0].HBarCodeForBase;
+ long HDeptID = list[0].HDeptID;
+ long HProcID = list[0].HProcID;
+ int HUSEORGID = list[0].HUSEORGID;
+ bool HTProcessFlag = list[0].HTProcessFlag;
+ int HQCSchemeID_Fst = list[0].HQCSchemeID_Fst;
+ int HQCSchemeID_Proc = list[0].HQCSchemeID_Proc;
+ int HQCSchemeID_Patrol = list[0].HQCSchemeID_Patrol;
+
+
+
+
+ long HWorkCenterID = list[0].HWorkCenterID; //宸ヤ綔涓績
+
+ long HBadWHID = list[0].HBadWHID; //涓嶈壇浠撳簱
+ long HWasterWHID = list[0].HWasterWHID; //鎶ュ簾浠撳簱
+ long HBadCountDevelopWHID = list[0].HBadCountDevelopWHID; //鐮斿彂涓嶈壇鍝佷粨搴�
+ long HWWBadWHID = list[0].HWWBadWHID; //濮斿涓嶈壇浠撳簱
+ long HWWWasterWHID = list[0].HWWWasterWHID; //濮斿鎶ュ簾浠撳簱
+ long HWHID = list[0].HWHID; //鑹搧浠撳簱
+
+
+ //鍒ゆ柇鏉冮檺
+ //if (!ClsPub.Security_Log("Gy_Process_Edit", 1, false, msg3))
+ //{
+ // 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 (HItemID == 0)
+ {
+ oCN.BeginTran();
+ oCN.RunProc("Insert into Gy_Process " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HTypeFlow,HTypeCount,HDeptNumber,HSNo" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
+ ",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote" +
+ ",HUSEORGID,HWorkCenterID,HBadWHID,HWasterWHID,HBadCountDevelopWHID,HWWBadWHID,HWWWasterWHID,HWHID,HTProcessFlag" +
+ ",HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol) " +
+ " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
+ "," + Convert.ToString(HTypeFlow ? 1 : 0) + "," + Convert.ToString(HTypeCount ? 1 : 0) + ",'" + HDeptNumber + "','" + HSNo.ToString() +
+ "'," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID +
+ ",'" + HBarCode + "'," + HProcessID_K3 + ",'" + HBillSubType + "'," + Convert.ToString(HAutoTrunFlag ? 1 : 0) +
+ ",'" + HFixPrice.ToString() + "'," + HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "'" +
+ "," + HUSEORGID + "," + HWorkCenterID + "," + HBadWHID + "," + HWasterWHID + "," + HBadCountDevelopWHID + "," + HWWBadWHID + "," + HWWWasterWHID + "," + HWHID + "," + Convert.ToString(HTProcessFlag ? 1 : 0) + "," + HQCSchemeID_Fst + "," + HQCSchemeID_Proc + "," + HQCSchemeID_Patrol + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ }
+ else
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ oCN.RunProc("Update Gy_Process set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HHelpCode='" + HHelpCode + "'" +
+ ",HShortNumber='" + HShortNumber + "'" +
+ ",HParentID= " + HParentID +
+ ",HTypeFlow= '" + HTypeFlow + "'" +
+ ",HTypeCount= '" + HTypeCount + "'" +
+ ",HDeptNumber='" + HDeptNumber + "'" +
+ ",HSNo= " + HSNo +
+ ",HLevel= " + HLevel +
+ ",HEndFlag= '" + HEndFlag + "'" +
+ ",HTProcessFlag= '" + HTProcessFlag + "'" +
+ ",HStopflag= '" + HStopflag + "'" +
+ ",HRemark='" + HRemark + "'" +
+ ",HDeptID= " + HDeptID +
+ ",HBarCodeForBase='" + HBarCode + "'" +
+ ",HProcessID_K3= " + HProcessID_K3 +
+ ",HBillSubType='" + HBillSubType + "'" +
+ ",HAutoTrunFlag= '" + HAutoTrunFlag + "'" +
+ ",HFixPrice= " + HFixPrice +
+ ",HOverFixPrice= " + HOverFixPrice +
+ ",HProcMulID= " + HProcMulID +
+ ",HWorkCenterID= " + HWorkCenterID +
+ ",HBadWHID= " + HBadWHID +
+ ",HWasterWHID= " + HWasterWHID +
+ ",HBadCountDevelopWHID= " + HBadCountDevelopWHID +
+ ",HWWBadWHID= " + HWWBadWHID +
+ ",HWWWasterWHID= " + HWWWasterWHID +
+ ",HWHID= " + HWHID +
+ ",HQCSchemeID_Fst= " + HQCSchemeID_Fst +
+ ",HQCSchemeID_Proc= " + HQCSchemeID_Proc +
+ ",HQCSchemeID_Patrol= " + HQCSchemeID_Patrol +
+ ",HProcCheckNote='" + HProcCheckNote + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCN.Commit();
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
return objJsonResult;
}
catch (Exception e)
@@ -161,36 +457,57 @@
/// </summary>
[Route("Gy_Process/list")]
[HttpGet]
- public object getProcessList(string sWhere)
+ public object getProcessList(string sWhere,string user)
{
try
{
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_Process_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList " + sWhere, "h_v_Gy_ProcessList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessList order by 宸ュ簭浠ｇ爜 ", "h_v_Gy_ProcessList");
}
else
{
string sql1 = "select * from h_v_Gy_ProcessList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by 宸ュ簭浠ｇ爜 ";
ds = oCN.RunProcReturn(sql, "h_v_Gy_ProcessList");
}
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception e)
{
@@ -242,7 +559,286 @@
return objJsonResult;
}
}
+ /// <summary>
+ /// 宸ュ簭鍒楄〃鍒犻櫎鍔熻兘
+ /// </summary>
+ /// <returns></returns>
+ [Route("DeltetGy_Process")]
+ [HttpGet]
+ public object DeltetGy_Process(string HItemID, string user)
+ {
+ DataSet ds;
+ DataSet ds1;
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_Process_Delete", 1, false, user))
+ {
+ 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_Process where HItemID=" + HItemID, "Gy_Process");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ //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;
+ //}
+ ds1 = oCN.RunProcReturn("Select HItemID from Gy_Process Where HParentID='" + HItemID + "'", " Gy_Process");
+ 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;
+ }
+
+ oCN.RunProc("delete from Gy_Process where HItemID=" + HItemID);
+ oCN.Commit();//鎻愪氦浜嬪姟
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
//
+
+ #region 宸ュ簭瀹℃牳銆佸弽瀹℃牳
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_Process/AuditGy_Process")]
+ [HttpGet]
+ public object AuditGy_Process(int HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Process_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_Process where HItemID=" + HInterID, "Gy_Process");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ oCN.RunProc("update Gy_Process set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ oCN.RunProc("update Gy_Process set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ュ簭绂佺敤銆佸弽绂佺敤
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsStop">绂佺敤(0),鍙嶇鐢�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_Process/StopGy_Process")]
+ [HttpGet]
+ public object StopGy_Process(int HInterID, int IsStop, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Process_Stop", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_Process where HItemID=" + HInterID, "Gy_Process");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsStop == 0) //绂佺敤鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘鍐嶆绂佺敤锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鐢�!涓嶉渶瑕佸弽绂佺敤!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsStop == 0) //绂佺敤鍒ゆ柇
+ {
+ oCN.RunProc("update Gy_Process set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+ oCN.RunProc("update Gy_Process set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄦ垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触鎴栬�呭弽绂佺敤澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1