From 9d8435352f7a1ac512554f9d22ce2a63d1b98f95 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 25 九月 2025 09:33:19 +0800
Subject: [PATCH] 来料检验单 产品入库检验单 添加 关闭/反关闭 作废/反作废
---
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs | 126 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 116 insertions(+), 10 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
index 2d264f4..ad42b8e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
@@ -434,6 +434,53 @@
}
}
+ /// <summary>
+ /// 鏌ヨ瀛愯〃鏂规硶
+ /// </summary>
+ [Route("Gy_WorkCenter/listSub")]
+ [HttpGet]
+ public object listSub(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_WorkCenter_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_WorkCenterSubList where 1 = 1 " + sWhere + " order by HItemID ", "h_v_WorkCenterSubList");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
@@ -600,6 +647,7 @@
string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg1 = sArray[0].ToString();
string msg2 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
//string msg4 = sArray[2].ToString();
//string msg5 = sArray[3].ToString();
@@ -612,10 +660,12 @@
objJsonResult.data = null;
return objJsonResult;
}
-
//鍙嶅簭鍒楀寲
msg1 = "[" + msg1.ToString() + "]";
+
List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg1);
+
+ List<ClsGy_WorkCenterSub> list1 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_WorkCenterSub>>(msg4);
long HItemID = list[0].HItemID;
string HNumber = list[0].HNumber;
@@ -696,7 +746,20 @@
//淇濆瓨瀹屾瘯鍚庡鐞�
if (HItemID == 0)
{
+ LogService.Write("鏂板");
oCN.BeginTran();
+ //鍒ゆ柇浠ｇ爜鏄惁閲嶅
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_WorkCenter where HNumber='" + HNumber + "'", "Gy_WorkCenter");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁浠ｇ爜閲嶅涓嶅厑璁告柊澧�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//淇濆瓨鍓嶆帶鍒�=========================================
string sql1 = "exec h_p_Gy_WorkCenter_BeforeSaveCtrl " + HMaker + ",'" + 1 + "'";
ds = oCN.RunProcReturn(sql1, "h_p_Gy_WorkCenter_BeforeSaveCtrl");
@@ -721,20 +784,43 @@
}
//==================================================================================
-
- oCN.RunProc("Insert into Gy_WorkCenter " +
+ string sql_Temp = "Insert into Gy_WorkCenter " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HDeptNumber,HWorkTimes,HQty,HUseFlag" +
",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase" +
",HProcID,HDayMoney,HUSEORGID,HCREATEORGID,HMaker,HMakeTime) " +
- " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
- ",'" + HDeptNumber + "'," + HWorkTimes + "," + HQty +",'"+ HUseFlag+
- "'," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) +
- ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "'," + HProcID + "," + HDayMoney + "," + HUSEORGID + "," + HCREATEORGID + "" +
- ",'" + HMaker + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
+ " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID.ToString() +
+ "','" + HDeptNumber + "'," + HWorkTimes + "," + HQty + ",'" + HUseFlag +
+ "'," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + ",'" + Convert.ToString(HStopflag ? 1 : 0) +
+ "','" + HRemark + "','" + HDeptID + "','" + HBarCodeForBase + "','" + HProcID + "'," + HDayMoney + "," + HUSEORGID + "," + HCREATEORGID + "" +
+ ",'" + HMaker + "',getdate())";
+ LogService.Write(sql_Temp);
+ oCN.RunProc(sql_Temp, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_WorkCenter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ DataSet temp_ds = oCN.RunProcReturn("select top 1 HItemID from Gy_WorkCenter where HNumber = N'" + HNumber + "'", "Gy_WorkCenter");
+
+ 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 = "";
+ foreach (ClsGy_WorkCenterSub listOne in list1)
+ {
+ sql3 += "insert into Gy_WorkCenterSub(HCenterID, HSourceID) Values("
+ + itemID + "," + listOne.HSourceID + ");";
+
+ }
+ LogService.Write(sql3);
+ oCN.RunProcReturn(sql3, "Gy_WorkCenterSub");
//淇濆瓨鍚庢帶鍒�=========================================
string sql2 = "exec h_p_Gy_WorkCenter_AfterSaveCtrl " + HMaker + ",'" + 1 + "'";
@@ -767,7 +853,18 @@
{
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
-
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_WorkCenter where HItemID=" + HItemID, "Gy_WorkCenter");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//淇濆瓨鍓嶆帶鍒�=========================================
string sql1 = "exec h_p_Gy_WorkCenter_BeforeSaveCtrl " + HMaker + ",'" + 1 + "'";
ds = oCN.RunProcReturn(sql1, "h_p_Gy_WorkCenter_BeforeSaveCtrl");
@@ -812,7 +909,16 @@
",HCREATEORGID='" + HCREATEORGID + "'" +
",HBarCodeForBase='" + HBarCodeForBase + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
- //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_WorkCenter,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProcReturn("delete from Gy_WorkCenterSub where HCenterID = " + HItemID, "Gy_WorkCenterSub");
+
+ string sql3 = "";
+ foreach(ClsGy_WorkCenterSub listOne in list1)
+ {
+ sql3 += "insert into Gy_WorkCenterSub(HCenterID, HSourceID) Values("
+ + HItemID + "," + listOne.HSourceID + ")";
+ }
+
+ oCN.RunProcReturn(sql3, "Gy_WorkCenterSub");
//灏嗕笂绾� 涓洪潪鏈骇
oCN.RunProc("Update Gy_WorkCenter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
--
Gitblit v1.9.1