From 5c0d724cbfe1a987a9fe5f830d15d4e499abf705 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 15 四月 2026 14:21:44 +0800
Subject: [PATCH] 审批流添加工序子表
---
WebAPI/Controllers/基础资料/基础资料/Xt_CheckFlowBillController.cs | 81 ++++++++++++++++++++++++++++++++++++----
1 files changed, 73 insertions(+), 8 deletions(-)
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Xt_CheckFlowBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Xt_CheckFlowBillController.cs"
index c4211b2..db0fff8 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Xt_CheckFlowBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Xt_CheckFlowBillController.cs"
@@ -73,14 +73,15 @@
var _value = msg["msg"].ToString();
string msg3 = _value.ToString();
string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg1 = sArray[0].ToString();
- string msg2 = sArray[1].ToString();
- msg3 = sArray[2].ToString();
- string msg4 = sArray[3].ToString();
+ string msg1 = sArray[0].ToString(); //涓昏〃
+ string msg2 = sArray[1].ToString(); //瀹℃壒椤圭洰瀛愯〃
+ string msg4 = sArray[2].ToString(); //宸ュ簭瀛愯〃
+ string msg5 = sArray[3].ToString(); //鎿嶄綔绫诲瀷
+ string msg6 = sArray[4].ToString(); //鐢ㄦ埛鍚�
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Xt_CheckFlow_Edit", 1, false, msg4))
+ if (!DBUtility.ClsPub.Security_Log_second("Xt_CheckFlow_Edit", 1, false, msg6))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -94,7 +95,7 @@
List<Models.Xt_CheckFlowSub> lsmain = new List<Models.Xt_CheckFlowSub>();
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
- lsmain =JsonConvert.DeserializeObject<List<Xt_CheckFlowSub>>(msg2);
+ lsmain = JsonConvert.DeserializeObject<List<Xt_CheckFlowSub>>(msg2);
foreach (Xt_CheckFlowSub oItem in lsmain)
{
if (oItem.HCheckItemID == 0)
@@ -114,9 +115,19 @@
return objJsonResult;
}
}
+
+ //宸ュ簭瀛愯〃鏁版嵁
+ List<Models.Xt_CheckFlowSub_Proc> lsProc = new List<Models.Xt_CheckFlowSub_Proc>();
+ if (!string.IsNullOrEmpty(msg4) && msg4 != "[]")
+ {
+ msg4 = msg4.Replace("\\", "");
+ msg4 = msg4.Replace("\n", "");
+ lsProc = JsonConvert.DeserializeObject<List<Xt_CheckFlowSub_Proc>>(msg4);
+ }
+
ds = oCN.RunProcReturn("select * from h_v_Xt_CheckFlowList where Hmainid= " + main.HInterID, "h_v_Xt_CheckFlowList");
//淇濆瓨鍓嶆帶鍒跺垽鏂�
- string sql = "select * from Xt_CheckFlowMain where HBillTypeID = '" + main.HBillTypeID.ToString() + "' and HDeptID = " + main.HDeptID.ToString() + " and HStandard = 1 and HInterID <> "+ main.HInterID.ToString();
+ string sql = "select * from Xt_CheckFlowMain where HBillTypeID = '" + main.HBillTypeID.ToString() + "' and HDeptID = " + main.HDeptID.ToString() + " and HStandard = 1 and HInterID <> " + main.HInterID.ToString();
DataSet ds2 = oCN.RunProcReturn(sql, "Xt_CheckFlowMain");
if (ds2.Tables[0].Rows.Count > 0 && main.HStandard)
{
@@ -129,7 +140,7 @@
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
oCN.BeginTran();
- if (msg3 == "1" && ds.Tables[0].Rows.Count == 0)
+ if (msg5 == "1" && ds.Tables[0].Rows.Count == 0)
{
oCN.RunProc("Insert Into Xt_CheckFlowMain " +
"(HBillTypeID,HInterID,HDeptID" +
@@ -149,8 +160,12 @@
" where HInterID=" + main.HInterID.ToString());
//鍒犻櫎瀛愯〃
oCN.RunProc("delete from Xt_CheckFlowSub where HInterID=" + main.HInterID.ToString());
+ //鍒犻櫎宸ュ簭瀛愯〃
+ oCN.RunProc("delete from Xt_CheckFlowSub_Proc where HInterID=" + main.HInterID.ToString());
}
AddBillSub(lsmain, main.HInterID);
+ //淇濆瓨宸ュ簭瀛愯〃
+ AddBillProcSub(lsProc, main.HInterID);
oCN.Commit();
@@ -192,6 +207,56 @@
return objJsonResult;
}
+ //淇濆瓨宸ュ簭瀛愯〃
+ public json AddBillProcSub(List<Xt_CheckFlowSub_Proc> DetailColl, long HInterID)
+ {
+ int i = 1;
+ foreach (Xt_CheckFlowSub_Proc oSub in DetailColl)
+ {
+ oCN.RunProc("Insert into Xt_CheckFlowSub_Proc " +
+ " (HInterID,HEntryID,HProcID,HRemark" +
+ " )values("
+ + HInterID + "," + i + "," + oSub.HProcID + ",'" + oSub.HRemark + "') ");
+ i++;
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ #endregion
+
+ #region 宸ュ簭瀛愯〃鏌ヨ
+ [Route("Xt_CheckFlowBill/Xt_CheckFlowProcList")]
+ [HttpGet]
+ public object Xt_CheckFlowProcList(string sWhere)
+ {
+ try
+ {
+ string sql1 = string.Format(@"select a.HInterID,a.HEntryID,a.HProcID,b.HNumber as 宸ュ簭浠ｇ爜,b.HName as 宸ュ簭,a.HRemark as 澶囨敞
+ from Xt_CheckFlowSub_Proc a
+ left join Gy_Process b on a.HProcID = b.HItemID
+ where 1=1 ");
+
+ ds = oCN.RunProcReturn(sql1 + sWhere + " order by a.HEntryID", "Xt_CheckFlowSub_Proc");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
#endregion
#region 瀹℃牳娴佺▼鍗� 鍒犻櫎
--
Gitblit v1.9.1