From a91fdba94705dd25cecccc7a4a5dcc2b3f2c09a6 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 22 十二月 2025 16:16:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_PropertyController.cs | 114 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 97 insertions(+), 17 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_PropertyController.cs b/WebAPI/Controllers/BaseSet/Gy_PropertyController.cs
index 477ac6b..2e9b717 100644
--- a/WebAPI/Controllers/BaseSet/Gy_PropertyController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_PropertyController.cs
@@ -19,6 +19,73 @@
DataSet ds;
+ #region 杈呭姪灞炴�у垪琛�-鍒嗛〉
+ [Route("Gy_Property/listPage")]
+ [HttpGet]
+ public object listPage(string sWhere, string user, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_Property", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_IF_PropertyList " + page + "," + size + "," + "''", "h_p_Gy_CarList");
+ }
+ else
+ {
+ sWhere = sWhere.Replace("'", "''");
+
+ ds = oCN.RunProcReturn("exec h_p_IF_PropertyList " + page + "," + size + ",'" + sWhere + "'", "h_p_Gy_CarList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
/// <summary>
/// 杩斿洖杈呭姪灞炴�у垪琛�
///鍙傛暟锛歴tring sql銆�
@@ -374,39 +441,52 @@
try
{
var _value = msg["model"].ToString();
- _value = _value.Replace("\"hendflag\": \"1\"", "\"hendflag\": true")
+ LogService.Write("1" + _value);
+ var entry = msg["model"]["HENTRY"].ToString();
+ LogService.Write("1" + _value);
+ LogService.Write("12" + entry);
+ entry = entry.Replace("\"hendflag\": \"1\"", "\"hendflag\": true")
.Replace("\"hstopflag\": \"0\"", "\"hstopflag\": false")
.Replace("\"hendflag\": \"0\"", "\"hendflag\": false")
.Replace("\"hstopflag\": \"1\"", "\"hstopflag\": true");
LogService.Write($"澶勭悊鍚庣殑JSON: {_value}");
- //LogService.Write(_value);
+ _value = "[" + _value.ToString() + "]";
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ListModels oListModels = new ListModels();
- List<Model.ClsGy_Property_Model> lsmain = new List<Model.ClsGy_Property_Model>();
- lsmain = oListModels.getObjectByJson_Gy_Property(_value);
+ List<Model.ClsGy_PropertyType_Model> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_PropertyType_Model>>(_value);
+ List<Model.ClsGy_Property_Model> lssub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_Property_Model>>(entry);
string sql = string.Empty;
LogService.Write(lsmain);
//淇濆瓨
oCN.BeginTran();
- sql = $"delete Gy_Property where HItemID = {lsmain[0].HItemID}";
- oCN.RunProc(sql);
+ foreach (var osub in lssub)
+ {
+ sql = $"delete Gy_Property where HItemID = {osub.HItemID}";
+ oCN.RunProc(sql);
+ }
+ foreach (var osub in lsmain)
+ {
+ sql = $"delete Gy_PropertyEntry where HItemID = {osub.HItemID}";
+ oCN.RunProc(sql);
+ }
+
+
sql = "set identity_insert Gy_Property on";
oCN.RunProc(sql);
oCN.RunProc($@"insert into Gy_Property(HItemID,HNumber,HShortNumber,HName,HHelpCode,HParentID
,HLevel,HEndFlag,HStopflag,HRemark,HPropertyTypeID,HUseFlag,HERPItemID,HMakeTime)
- values({lsmain[0].HItemID},'{lsmain[0].HNumber}','{lsmain[0].HShortNumber}','{lsmain[0].HName}','{lsmain[0].HHelpCode}',{lsmain[0].HParentID},{lsmain[0].HLevel}
- ,{Convert.ToString(lsmain[0].HEndFlag ? 1 : 0)},{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },'{lsmain[0].HRemark}',{lsmain[0].HPropertyTypeID},'{lsmain[0].HUseFlag}',{lsmain[0].HERPItemID},'{lsmain[0].HMakeTime}')", ref DBUtility.ClsPub.sExeReturnInfo);
- LogService.Write("涓昏〃鎻掑叆鎴愬姛");
+ values({lssub[0].HItemID},'{lssub[0].HNumber}','{lssub[0].HShortNumber}','{lssub[0].HName}','{lssub[0].HHelpCode}',{lssub[0].HParentID},{lssub[0].HLevel}
+ ,{Convert.ToString(lssub[0].HEndFlag ? 1 : 0)},{Convert.ToString(lssub[0].HStopflag ? 1 : 0) },'{lssub[0].HRemark}',{lssub[0].HPropertyTypeID},'{lssub[0].HUseFlag}',{lssub[0].HERPItemID},'{lssub[0].HMakeTime}')", ref DBUtility.ClsPub.sExeReturnInfo);
+ LogService.Write("杈呭姪灞炴�ц〃鎻掑叆鎴愬姛");
- ////鏂板杈呭姪瀛愯〃锛�
- //oCN.RunProc($@"insert into Gy_PropertyEntry
- // (HItemID,HERPItemID,HAuxpuID,HMaterID,HISDefault,HStopflag,HSno)
- // values({lsmain[1].HItemID},'{lsmain[1].HERPItemID}','{lsmain[1].HAuxpuID}','{lsmain[1].HMaterID}','{lsmain[1].HISDefault}',{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },'{lsmain[1].HSno}')", ref DBUtility.ClsPub.sExeReturnInfo);
- ////淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- //sql = "set identity_insert Gy_Property off";
- //LogService.Write("瀛愯〃鎻掑叆鎴愬姛");
+ //鏂板杈呭姪瀛愯〃锛�
+ oCN.RunProc($@"insert into Gy_PropertyEntry
+ (HItemID,HERPItemID,HAuxpuID,HMaterID,HISDefault,HStopflag,HSno)
+ values({lsmain[0].HItemID},'{lsmain[0].HERPItemID}','{lsmain[0].HAuxpuID}','{lsmain[0].HMaterID}','{lsmain[0].HISDefault}',{Convert.ToString(lsmain[0].HStopflag ? 1 : 0) },'{lsmain[0].HSno}')", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Gy_Property off";
+ LogService.Write("杈呭姪灞炴�у�艰〃鎻掑叆鎴愬姛");
oCN.RunProc(sql);
oCN.Commit();
--
Gitblit v1.9.1