From 5d2aa0cb0f40854a2d24a54d03d452987bc97484 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期四, 26 二月 2026 16:40:54 +0800
Subject: [PATCH] 优化数采查询报表 增加了工艺参数子表保存
---
WebAPI/Controllers/BaseSet/Gy_TechnologyController.cs | 89 ++++++++++++++++++++++++++++++++------------
1 files changed, 65 insertions(+), 24 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_TechnologyController.cs b/WebAPI/Controllers/BaseSet/Gy_TechnologyController.cs
index 63e4918..331008a 100644
--- a/WebAPI/Controllers/BaseSet/Gy_TechnologyController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_TechnologyController.cs
@@ -142,7 +142,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_TechnologyParameterList where HitemID=" + HInterID, "h_v_Gy_TechnologyParameterList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_TechnologyParameterEdit where HitemID=" + HInterID, "h_v_Gy_TechnologyParameterEdit");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -231,7 +231,7 @@
return objJsonResult;
}
- List<TechnologyParameter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<TechnologyParameter>>(msg1);
+ List<Gy_TechnologyParameter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_TechnologyParameter>>(msg1);
long HItemID = list[0].HItemID;
string HNumber = list[0].HNumber;
@@ -305,11 +305,25 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log("Gy_TechnologyParameter_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
- List<TechnologyParameter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<TechnologyParameter>>(msg2);
-
+ List<Gy_TechnologyParameter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_TechnologyParameter>>(msg2);
+ List<Gy_TechnologyParameterSub> list1 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_TechnologyParameterSub>>(msg3
+ );
long HItemID = list[0].HItemID;
string HNumber = list[0].HNumber;
string HName = list[0].HName;
@@ -328,15 +342,6 @@
long HUnitID = list[0].HUnitID;
long HClassID = list[0].HClassID;
- //鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log("Gy_TechnologyParameter_Edit", 1, false, msg3))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
@@ -346,18 +351,8 @@
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)
{
@@ -394,7 +389,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触: 宸ヨ壓浠ｇ爜閲嶅!";
+ objJsonResult.Message = "淇濆瓨澶辫触: 宸ヨ壓鍙傛暟浠ｇ爜閲嶅!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -409,6 +404,35 @@
// Convert.ToString(HEndFlag ? 1 : 0); Convert.ToString(HStopflag ? 1 : 0);HUseFlag
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_TechnologyParameter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ // 鎵ц鏌ヨ鑾峰彇HItemID
+ DataSet temp_ds = oCN.RunProcReturn("select top 1 HItemID from Gy_TechnologyParameter where HNumber = N'" + HNumber + "'", "Gy_TechnologyParameter");
+
+ if (temp_ds.Tables[0].Rows.Count < 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜锛氭彃鍏ヤ富琛ㄦ暟鎹け璐�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ int itemID = int.Parse(temp_ds.Tables[0].Rows[0]["HItemID"].ToString());
+ string sql3 = "";
+
+ // 鏀逛负for寰幆锛孒EntryID浠�1寮�濮嬮�掑
+ for (int i = 0; i < list1.Count; i++)
+ {
+ // 鑾峰彇褰撳墠寰幆鐨勫疄浣撳璞�
+ Gy_TechnologyParameterSub listOne = list1[i];
+ int entryID = i + 1;
+
+ sql3 += "insert into Gy_TechnologyParameterSub(HInterID, HEntryID, HRemark,HEquipID,HTechParamAliasName) Values("
+ + itemID + "," + entryID + ",N'" + listOne.HRemark + "','" + listOne.HEquipID + "','" + listOne.HTechParamAliasName + "');";
+ }
+
+ oCN.RunProcReturn(sql3, "Gy_TechnologyParameterSub");
//淇濆瓨鍚庢帶鍒�=========================================
@@ -488,6 +512,23 @@
//灏嗕笂绾� 涓洪潪鏈骇
oCN.RunProc("Update Gy_TechnologyParameter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProcReturn("delete from Gy_TechnologyParameterSub where HInterID = " + HItemID, "Gy_TechnologyParameterSub");
+
+ string sql3 = "";
+
+ // 鏀逛负for寰幆锛孒EntryID浠�1寮�濮嬮�掑
+ for (int i = 0; i < list1.Count; i++)
+ {
+ // 鑾峰彇褰撳墠寰幆鐨勫疄浣撳璞�
+ Gy_TechnologyParameterSub listOne = list1[i];
+ int entryID = i + 1;
+
+ sql3 += "insert into Gy_TechnologyParameterSub(HInterID, HEntryID, HRemark,HEquipID,HTechParamAliasName) Values("
+ + HItemID + "," + entryID + ",N'" + listOne.HRemark + "','" + listOne.HEquipID + "','" + listOne.HTechParamAliasName + "');";
+ }
+
+ oCN.RunProcReturn(sql3, "Gy_TechnologyParameterSub");
+
//淇濆瓨鍚庢帶鍒�=========================================
string sql2 = "exec h_p_Gy_TechnologyParameter_AfterSaveCtrl " + HMakeEmp + ",'" + 2 + "'";
ds = oCN.RunProcReturn(sql2, "h_p_Gy_TechnologyParameter_AfterSaveCtrl");
--
Gitblit v1.9.1