From 33641eb36f27b95c3cc676948043f57f56cb4e4a Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 29 十一月 2022 09:00:31 +0800
Subject: [PATCH] 合并
---
WebAPI/Controllers/BaseSet/Gy_TechParamByProcController.cs | 258 ++++++++++++++++++++++++++++-----------------------
1 files changed, 142 insertions(+), 116 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_TechParamByProcController.cs b/WebAPI/Controllers/BaseSet/Gy_TechParamByProcController.cs
index 5010733..759f580 100644
--- a/WebAPI/Controllers/BaseSet/Gy_TechParamByProcController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_TechParamByProcController.cs
@@ -117,6 +117,52 @@
}
}
+ #region 缂栬緫鏃惰繑鍥炲伐鑹哄弬鏁板搴旇〃淇℃伅
+ [Route("Gy_TechParamByProc/GetTechParamByProcValue")]
+ [HttpGet]
+ public object GetProcPriceValue(int HItemID)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ ds = oCN.RunProcReturn("select * from h_v_GetTechParamByProcValue where HInterID = " + HItemID, "h_v_GetTechParamByProcValue");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垪琛ㄤ俊鎭紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ //娣诲姞鍒楀悕
+ 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;
+ }
+ }
+ #endregion
+
/// <summary>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -162,7 +208,7 @@
long HTechParamUnitID = list[0].HTechParamUnitID;
string HStd = list[0].HStd;
long HDeptID = list[0].HDeptID;
- DateTime HMakeDate = list[0].HMakeDate;
+ DateTime HMakeDate = DateTime.Now;
//DateTime HDeleteDate = list[0].HDeleteDate;
@@ -218,9 +264,6 @@
{
try
{
- DAL.ClsGy_Warehouse_Ctl oDept = new DAL.ClsGy_Warehouse_Ctl();
- DAL.ClsGy_Warehouse_View oDeptHlp = new DAL.ClsGy_Warehouse_View();
-
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -230,90 +273,111 @@
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<TechParamByProc> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<TechParamByProc>>(msg2);
+ List<TechParamByProc> sublist = Newtonsoft.Json.JsonConvert.DeserializeObject<List<TechParamByProc>>(msg3);
- long HInterID = list[0].HInterID;
- string HMaker = list[0].HMaker;
- string HChecker = list[0].HChecker;
- string HRemark = list[0].HRemark;
- //string HStopflag = list[0].HStopflag;
- long HMaterID = list[0].HMaterID;
- long HProcID = list[0].HProcID;
- long HTechParamID = list[0].HTechParamID;
- long HTechParamUnitID = list[0].HTechParamUnitID;
- string HStd = list[0].HStd;
- long HDeptID = list[0].HDeptID;
- DateTime HMakeDate = list[0].HMakeDate;
+ DAL.ClsGy_TechParamByProc_Ctl BillNew = new DAL.ClsGy_TechParamByProc_Ctl();
+ List<Model.ClsGy_TechParamByProc_Model> DetailColl = new List<Model.ClsGy_TechParamByProc_Model>();
- ////鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log("Gy_TechnologyParameter_Add_Edit_", 1, false, msg3))
+ for (int i = 0; i < sublist.ToArray().Length; i++)
+ {
+ if (i >= 0)//HQty
+ {
+ Model.ClsGy_TechParamByProc_Model oSub = new Model.ClsGy_TechParamByProc_Model();
+ oSub.HInterID = DBUtility.ClsPub.isLong(sublist[i].HInterID);
+ oSub.HMaker = DBUtility.ClsPub.isStrNull(list[0].HMaker);
+ oSub.HChecker = DBUtility.ClsPub.isStrNull(list[0].HChecker);
+ oSub.HRemark = DBUtility.ClsPub.isStrNull(sublist[i].HRemark);
+ oSub.HMaterID = DBUtility.ClsPub.isLong(sublist[i].HMaterID);
+ oSub.HProcID = DBUtility.ClsPub.isLong(sublist[i].HProcID);
+ oSub.HTechParamID = DBUtility.ClsPub.isLong(list[0].HTechParamID);
+ oSub.HTechParamUnitID = DBUtility.ClsPub.isLong(list[0].HTechParamUnitID);
+ oSub.HStd = DBUtility.ClsPub.isLong(sublist[i].HStd);
+ oSub.HDeptID = DBUtility.ClsPub.isLong(sublist[i].HDeptID);
+ oSub.HMakeDate = DateTime.Now;
+
+ BillNew.DetailColl.Add(oSub);
+ DetailColl.Add(oSub);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳槑缁嗚淇℃伅!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //if (!DBUtility.ClsPub.AllowNumber(HStd))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ // objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
// objJsonResult.data = null;
// return objJsonResult;
//}
- if (!DBUtility.ClsPub.AllowNumber(HStd))
+ // 鎵归噺鎿嶄綔锛堟柊澧烇級
+ foreach (Model.ClsGy_TechParamByProc_Model oSub in DetailColl)
{
- 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 (HInterID == 0)
- {
- //褰撳墠鏃堕棿
- var currentTime = DateTime.Now.ToString();
- oCN.BeginTran();
- //涓昏〃
- oCN.RunProc("Insert into Gy_TechParamByProc " +
- " (HInterID,HMaker,HChecker,HRemark,HMaterID" +
- ",HProcID,HTechParamID,HTechParamUnitID,HStd,HMakeDate" +
- ",HDeptID) " +
- " Values('" + HInterID + "','" + HChecker + "','" + HChecker + "','" + HRemark + "','" + HMaterID + "','" + HProcID + "','" + HTechParamID + "','" + HTechParamUnitID + "','" + HStd + "','" + currentTime + "','" + HDeptID + "')");
-
- // Convert.ToString(HEndFlag ? 1 : 0); Convert.ToString(HStopflag ? 1 : 0);HUseFlag
- //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Gy_TechnologyParameter set HEndflag=0 where HEntryID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- oCN.Commit();
- }
- else
- {
- //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
- oCN.BeginTran();
- //涓昏〃
- oCN.RunProc("Update Gy_TechParamByProc set " +
- " HStd='" + HStd + "'" +
- //",HName='" + HName + "'" +
- //",HShortNumber='" + HShortNumber + "'" +
- //",HHelpCode='" + HHelpCode + "'" +
- //",HLevel='" + HLevel.ToString() + "'" +
- //",HParentID='" + HParentID.ToString() + "'" +
- //",HEndflag=" + Convert.ToString(HEndFlag ? 1 : 0) +
- //",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
- //",HUseFlag=" + Convert.ToString(HUseFlag ? 1 : 0) +
- //",HMakeTime= getdate()" +
- //",HMakeEmp='" + HMakeEmp + "'" +
- /*",HRemark='" + HRemark + */"Where HEntryID='" + HInterID + "'", ref DBUtility.ClsPub.sExeReturnInfo);
- //淇敼瀛愰」鐩唬鐮�
- //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
- //灏嗕笂绾� 涓洪潪鏈骇
- //oCN.RunProc("Update Gy_TechParamByProc set HEndflag=0 where HEntryID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
- //
- oCN.Commit();
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (oSub.HInterID == 0)
+ {
+ DataSet Ds;
+ Int64 HEntryID = 1;
+ Ds = oCN.RunProcReturn("select MAX(HEntryID) HEntryID from Gy_TechParamByProc", "Gy_TechParamByProc");
+ if (Ds.Tables[0].Rows.Count != 0 && ClsPub.isLong(Ds.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
+ {
+ HEntryID = ClsPub.isLong(Ds.Tables[0].Rows[0]["HEntryID"].ToString());
+ HEntryID += 1;
+ }
+ DataSet Cs;
+ oSub.HInterID = 1;
+ Cs = oCN.RunProcReturn("select MAX(HInterID) HInterID from Gy_TechParamByProc", "Gy_TechParamByProc");
+ if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HInterID"].ToString()) != 0)
+ {
+ oSub.HInterID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HInterID"].ToString());
+ oSub.HInterID += 1;
+ }
+ //褰撳墠鏃堕棿
+ var currentTime = DateTime.Now.ToString();
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Insert into Gy_TechParamByProc " +
+ " (HInterID,HEntryID,HMaker,HChecker,HRemark,HMaterID" +
+ ",HProcID,HTechParamID,HTechParamUnitID,HStd,HMakeDate" +
+ ",HDeptID) " +
+ " Values('" + oSub.HInterID + "','" + HEntryID + "','" + oSub.HMaker + "','" + oSub.HChecker + "','" + oSub.HRemark + "','" + oSub.HMaterID + "','" + oSub.HProcID + "','" + oSub.HTechParamID + "','" + oSub.HTechParamUnitID + "','" + oSub.HStd + "','" + currentTime + "','" + oSub.HDeptID + "')");
+ // Convert.ToString(HEndFlag ? 1 : 0); Convert.ToString(HStopflag ? 1 : 0);HUseFlag
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ //oCN.RunProc("Update Gy_TechParamByProc set HEndflag=0 where HEntryID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ }
+ else
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Update Gy_TechParamByProc set " +
+ " HStd='" + oSub.HStd + "'" +
+ ",HMaterID='" + oSub.HMaterID + "'" +
+ ",HProcID='" + oSub.HProcID + "'" +
+ ",HTechParamID='" + oSub.HTechParamID + "'" +
+ ",HTechParamUnitID='" + oSub.HTechParamUnitID + "'" +
+ ",HDeptID='" + oSub.HDeptID + "'" +
+ ",HRemark='" + oSub.HRemark + "'" +
+ //",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
+ //",HUseFlag=" + Convert.ToString(HUseFlag ? 1 : 0) +
+ //",HMakeTime= getdate()" +
+ //",HMakeEmp='" + HMakeEmp + "'" +
+ /*",HRemark='" + HRemark + */"Where HInterID ='" + oSub.HInterID + "'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ //oCN.RunProc("Update Gy_TechParamByProc set HEndflag=0 where HEntryID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCN.Commit();
+ }
}
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -345,16 +409,6 @@
DataSet ds1;
try
{
- //鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("DeltetGy_TechnologyParameter", 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))
{
@@ -374,34 +428,6 @@
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_TechParamByProc Where HParentID='" + HItemID + "'", "Gy_TechParamByProc");
- //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_TechParamByProc where HInterID=" + HItemID);
oCN.Commit();//鎻愪氦浜嬪姟
--
Gitblit v1.9.1