From 44648729417a911fc1939ea48cda9d06adbef367 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 18 三月 2025 08:56:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs | 240 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 216 insertions(+), 24 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
index bec08dd..3d8ea9e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
@@ -182,9 +182,55 @@
objJsonResult.data = null;
return objJsonResult;
}
+ oCN.BeginTran();
//
+ //鍒犻櫎鍓嶆帶鍒�=========================================
+ ds = oCN.RunProcReturn("Exec h_p_Gy_QCCheckClass_BeforeDelCtrl " + HItemID + ",'" + User + "'", "h_p_Gy_QCCheckClass_BeforeDelCtrl");
+
+ if (ds == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
if (oDept.DeleteByID(HItemID))
{
+ //鍒犻櫎鍚庢帶鍒�=========================================
+ DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_QCCheckClass_AfterDelCtrl " + HItemID + ",'" + User + "'", "h_p_Gy_QCCheckClass_AfterDelCtrl");
+ if (ds2 == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鍚庡垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+ oCN.Commit();
//鍐欏叆鏃ュ織
ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oDeptHlp.omodel.HNumber + ",鍚嶇О锛�" + oDeptHlp.omodel.HName, ClsPub.CurUserName);
//鏇存柊涓婄骇涓� 鏈骇
@@ -196,6 +242,7 @@
}
else
{
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鍒犻櫎澶辫触";
@@ -268,8 +315,11 @@
string HHelpCode = list[0].HHelpCode;
string HRemark = list[0].HRemark;
bool HStopflag = list[0].HStopflag;
- bool HUseFlag = list[0].HUseFlag;
+ string HUseFlag = list[0].HUseFlag;
long HQCCheckClassID = list[0].HQCCheckClassID;
+ string HMakeEmp = list[0].HMakeEmp;
+ long HUSEORGID = list[0].HUSEORGID;
+ long HCREATEORGID = list[0].HCREATEORGID;
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
@@ -282,17 +332,66 @@
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ DataSet ds = oCN.RunProcReturn("Exec h_p_Gy_QCCheckClass_BeforeSaveCtrl " + msg4 + ",'1'", "h_p_Gy_QCCheckClass_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
//涓昏〃
oCN.RunProc("Insert Into Gy_QCCheckClass " +
"(HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark" +
+ ",HMakeEmp,HMakeTime,HUSEORGID,HCREATEORGID,HUseFlag) " +
" values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HItemID + "'" +
- ",'1',0,'" + Convert.ToString(HStopflag ? 1 : 0) + "','" + HRemark + "','鏈娇鐢�')");
+ ",'1',0,'" + Convert.ToString(HStopflag ? 1 : 0) + "','" + HRemark + "'" +
+ ",'" + HMakeEmp + "',getdate()," + HUSEORGID + "," + HCREATEORGID + ",'" + HUseFlag + "')");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
if (list[0].HItemID.ToString() != "")
{
oCN.RunProc("Update Gy_QCCheckClass set HEndflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
}
+
+ //淇濆瓨鍚庢帶鍒�=========================================
+ DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_QCCheckClass_AfterSaveCtrl " + msg4 + ",'1'", "h_p_Gy_QCCheckClass_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨鍚庡垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -348,7 +447,7 @@
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
- List<MaintenanceAcceptItem> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MaintenanceAcceptItem>>(msg2);
+ List<CheckItem> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<CheckItem>>(msg2);
long HItemID = int.Parse(msg3);
string HNumber = list[0].HNumber;
@@ -357,8 +456,10 @@
long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
string HHelpCode = list[0].HHelpCode;
string HRemark = list[0].HRemark;
- string HStopflag = list[0].HStopflag;
+ bool HStopflag = list[0].HStopflag;
string HUseFlag = list[0].HUseFlag;
+ string HModifyEmp = msg4;
+ long HUSEORGID = list[0].HUSEORGID;
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
@@ -381,10 +482,36 @@
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ DataSet ds = oCN.RunProcReturn("Exec h_p_Gy_QCCheckClass_BeforeSaveCtrl " + msg4 + ",'1'", "h_p_Gy_QCCheckClass_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
//涓昏〃
oCN.RunProc("Update Gy_QCCheckClass set " +
" HNumber='" + HNumber + "'" +
",HName='" + HName + "'" +
+ ",HModifyEmp='" + HModifyEmp + "'" +
+ ",HModifyTime=getdate()" +
+ ",HUSEORGID='" + HUSEORGID + "'" +
",HShortNumber='" + HShortNumber + "'" +
",HHelpCode='" + HHelpCode + "'" +
",HParentID=" + HParentID +
@@ -395,6 +522,30 @@
//灏嗕笂绾� 涓洪潪鏈骇
oCN.RunProc("Update Gy_QCCheckClass set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
//
+
+ //淇濆瓨鍚庢帶鍒�=========================================
+ DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_QCCheckClass_AfterSaveCtrl " + msg4 + ",'1'", "h_p_Gy_QCCheckClass_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨鍚庡垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -463,10 +614,10 @@
}
#endregion
- #region 鏍￠獙椤圭洰鍒楄〃 鏂囦欢涓婁紶
- [Route("Gy_QCCheckClass/Gy_Process_Excel")]
+ #region 鏍￠獙椤圭洰鍒嗙被鍒楄〃 鏂囦欢涓婁紶
+ [Route("Gy_QCCheckClass/Gy_QCCheckClass_Excel")]
[HttpPost]
- public json Gy_Process_Excel()
+ public json Gy_QCCheckClass_Excel()
{
json res = new json();
try
@@ -492,7 +643,8 @@
{
provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
}
-
+ //妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
+ provisional.Columns.Add("HOrgID", typeof(Int32));//缁勭粐ID
//娣诲姞鏁版嵁
for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
{
@@ -517,12 +669,39 @@
for (int i = 0; i <= provisional.Rows.Count - 1; i++)
{
- string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["浠ｇ爜"].ToString());
- string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍚嶇О"].ToString());
- string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
- string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["澶囨敞"].ToString());
+ string HQCCheckClassName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�楠岄」鐩垎绫�"].ToString());
+ string HQCCheckClassNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�楠岄」鐩垎绫讳唬鐮�"].ToString());
+ string HORGNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["缁勭粐浠ｇ爜"].ToString());
+ string HORGName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["缁勭粐鍚嶇О"].ToString());
//鑾峰彇鐪熷疄琛屾暟
int line = i + 1;
+ if (HORGNumber != "")
+ {
+ //鏌ヨ缁勭粐
+ ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "绗�" + line + "琛�,缁勭粐涓嶅瓨鍦紒";
+ res.data = null;
+ return res;
+ }
+ else
+ {
+ provisional.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ else
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "绗�" + line + "琛�,缁勭粐浠ｇ爜涓虹┖";
+ res.data = null;
+ return res;
+ }
}
res.code = "1";
@@ -551,17 +730,29 @@
var error = "";
//鏌ヨ娌℃湁鐨勫垪
- if (!provisional.Columns.Contains("浠ｇ爜"))
- error += "娌℃湁鎵惧埌銆愪唬鐮併�戠殑鏍囬,";
+ if (!provisional.Columns.Contains("缁勭粐浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囦唬鐮併�戠殑鏍囬,";
- if (!provisional.Columns.Contains("鍚嶇О"))
- error += "娌℃湁鎵惧埌銆愬悕绉般�戠殑鏍囬,";
+ if(!provisional.Columns.Contains("妫�楠岄」鐩垎绫讳唬鐮�"))
+ error += "娌℃湁鎵惧埌銆愭楠岄」鐩垎绫讳唬鐮併�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("缁勭粐鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囧悕绉般�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("妫�楠岄」鐩垎绫�"))
+ error += "娌℃湁鎵惧埌銆愭楠岄」鐩垎绫汇�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("鍔╄鐮�"))
+ error += "娌℃湁鎵惧埌銆愬姪璁扮爜銆戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("澶囨敞"))
+ error += "娌℃湁鎵惧埌銆愬娉ㄣ�戠殑鏍囬,";
return error;
}
#endregion
- #region 鏍￠獙椤圭洰鍒楄〃 瀵煎叆(淇濆瓨)
- [Route("Gy_QCCheckClass/Gy_Process_btnSave")]
+ #region 鏍￠獙椤圭洰鍒嗙被鍒楄〃 瀵煎叆(淇濆瓨)
+ [Route("Gy_QCCheckClass/Gy_QCCheckClass_btnSave")]
[HttpPost]
public object Gy_Group_btnSave([FromBody] JObject sMainSub)
{
@@ -573,7 +764,7 @@
string organ = sArray[2].ToString();
try
{
- if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckClass_Edit", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -599,8 +790,9 @@
int i = 1;
foreach (Dictionary<string, string> item in list)
{
- string HNumber = item["浠ｇ爜"].ToString();
- string HName = item["鍚嶇О"].ToString();
+ string HNumber = item["妫�楠岄」鐩垎绫讳唬鐮�"].ToString();
+ string HUSEORGID = item["HOrgID"].ToString();
+ string HName = item["妫�楠岄」鐩垎绫�"].ToString();
string HHelpCode = item["鍔╄鐮�"];
string HRemark = item["澶囨敞"].ToString();
@@ -633,12 +825,12 @@
{
string sql = "insert into Gy_QCCheckClass (HName,HNumber,HShortNumber,HLevel,HHelpCode,HParentID,HStopflag,HEndFlag,HRemark,HUseFlag, HUSEORGID, HCREATEORGID, HMakeTime,HMakeEmp)" +
- $"values('{HName}', '{HNumber}', '{sShortNumber}',{HLevel},'',0,'0','0','{HRemark}', '鏈娇鐢�', '{organ}', '{organ}', '{System.DateTime.Now.ToString("G")}', '{user}')";
+ $"values('{HName}', '{HNumber}', '{sShortNumber}',{HLevel},'',0,'0','0','{HRemark}', '鏈娇鐢�', '{HUSEORGID}', '{HUSEORGID}', '{System.DateTime.Now.ToString("G")}', '{user}')";
oCN.RunProc(sql);
}
else
{
- oCN.RunProc("update Gy_QCCheckClass set HName='" + HName + "', HHelpCode='" + HHelpCode + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "'where HNumber='" + HNumber + "'");
+ oCN.RunProc("update Gy_QCCheckClass set HName='" + HName + "', HHelpCode='" + HHelpCode + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "',HUSEORGID="+ HUSEORGID + ",HRemark='"+HRemark+"' where HNumber='" + HNumber + "'");
}
i++;
--
Gitblit v1.9.1