From 385da37de94758dfe8befb0635307409869ec68a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 08 四月 2025 11:06:07 +0800
Subject: [PATCH] 还样获取取样单数据
---
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs | 215 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 209 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
index 628d7d6..5f07608 100644
--- a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -35,7 +35,7 @@
{
ds = oCN.RunProcReturn("select * from Xt_grdAlignment_WMES where HModName='" + HModName + "' and (HUserName='admin' or HUserName='Admin')", "Xt_grdAlignment_WMES");
- if (ds.Tables[0].Rows.Count == 0) {
+ if (ds.Tables[0].Rows.Count != 0) {
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
@@ -88,6 +88,7 @@
public string Alignment;
public string ColumnWidth;
public string ColumnName_Other;
+ public bool IsTotalRow;
}
[Route("Xt_grdAlignment_WMES/AddgrdAlignmentWMES")]
@@ -140,7 +141,7 @@
var ColumnName_Other = (omdelsub[i].ColumnName_Other == null || omdelsub[i].ColumnName_Other.Trim() == "") ? omdelsub[i].ColumnName : omdelsub[i].ColumnName_Other;
- HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{ColumnName_Other}|{omdelsub[i].ColumnName},";
+ HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{ColumnName_Other}|{omdelsub[i].ColumnName}|{(omdelsub[i].IsTotalRow == true ? 1 : 0)},";
}
HGridString = HGridString.Substring(0, HGridString.Length - 1);
@@ -223,7 +224,9 @@
var width = omdelsub[i].ColumnWidth;
if (string.IsNullOrEmpty(width) || DBUtility.ClsPub.isLong(width) == 0)
width = "120";
- HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{omdelsub[i].ColumnName},";
+ var ColumnName_Other = (omdelsub[i].ColumnName_Other == null || omdelsub[i].ColumnName_Other.Trim() == "") ? omdelsub[i].ColumnName : omdelsub[i].ColumnName_Other;
+ HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{ColumnName_Other}|{omdelsub[i].ColumnName}|{(omdelsub[i].IsTotalRow == true ? 1 : 0)},";
+
}
HGridString = HGridString.Substring(0, HGridString.Length - 1);
@@ -306,8 +309,20 @@
{
try
{
- ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + HUserName + "'", "Xt_ModuleButtonSet");
+ ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + HUserName + "' order by HOrder", "Xt_ModuleButtonSet");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + "admin" + "' order by HOrder", "Xt_ModuleButtonSet");
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = ds.Tables[0].Rows.Count;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
objJsonResult.code = "1";
objJsonResult.count = ds.Tables[0].Rows.Count;
objJsonResult.Message = "Sucess锛�";
@@ -331,6 +346,7 @@
public string BtnID;
public string BtnName;
public bool IsHide;
+ public string HOtherName;
}
public class noEditList
{
@@ -341,6 +357,7 @@
public int HOrder;
public bool HHideFlag;
public bool HEditFlag;
+ public string HOtherName;
}
[Route("Xt_ModuleButtonSet_WMES/AddModuleButtonSetWMES")]
@@ -402,6 +419,7 @@
string HButtonID = HButtonIDLists[j].ToString();
string HButtonName = HButtonNameLists[j].ToString();
int HOrder = HOrderLists[j];
+ string HOtherName = button[i].HOtherName;
if (button[i].IsHide)
{
HHideFlag = 1;
@@ -411,7 +429,7 @@
HEditFlag = 0;
HHideFlag = 0;
}
- string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "'";
+ string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "','" + HOtherName + "'";
oCN.RunProc(sql);
}
}
@@ -429,7 +447,8 @@
string HButtonID = noEditLists[i].HButtonID;
string HButtonName = noEditLists[i].HButtonName;
int HOrder = HOrderLists[j];
- string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "'";
+ string HOtherName = noEditLists[i].HOtherName;
+ string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "','" + HOtherName + "'";
oCN.RunProc(sql);
}
}
@@ -691,5 +710,189 @@
}
}
#endregion
+
+ #region 鍩虹璧勬枡 鑾峰彇鏁版嵁
+ [Route("Gy_GetBaseData/Gy_GetBaseData")]
+ [HttpGet]
+ public object Gy_GetBaseData(string sql,string tableView, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+
+ ds = oCN.RunProcReturn(sql, tableView);
+
+ //娣诲姞鍒楀悕
+ 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
+
+ #region 鍗曟嵁缈昏瘧 鍒濆鍖� 鏌ヨ
+ [Route("Xt_grdAlignment_WMES/SelectMESLanguage")]
+ [HttpGet]
+ public object SelectMESLanguage(string sWhere)
+ {
+ try
+ {
+ //鑾峰彇鍏叡鏁版嵁鐨勬暟閲�
+ int count = 0;
+ DataSet dataSet = oCN.RunProcReturn("select * from h_v_Xt_LanModuleList where 1=1 and HModuleCode in('GYModel')", "h_v_Xt_LanModuleList");
+ if (dataSet.Tables[0].Rows.Count > 0)
+ {
+ count = dataSet.Tables[0].Rows.Count;
+ }
+
+ //鏍规嵁鍗曟嵁妯″潡鍚嶇О 鍜� 缈昏瘧绫诲瀷 鍘� 妯″潡琛ㄩ噷鏌ヨ 濡傛灉娌℃湁鏁版嵁 灏辨柊澧�,濡傛灉鏈夋暟鎹氨涓嶄繚瀛�
+
+ ds = oCN.RunProcReturn("select * from h_v_Xt_LanModuleList where 1=1 " + sWhere, "h_v_Xt_LanModuleList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = count;
+ objJsonResult.Message = "";
+ 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 鍗曟嵁缈昏瘧 鍒濆鍖� 淇濆瓨
+ [Route("Xt_grdAlignment_WMES/SaveMESLanguage")]
+ [HttpPost]
+ public object SaveMESLanguage([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0];
+ string HModName = sArray[1];
+ //濡傛灉娌℃湁鏁版嵁 灏辨柊澧�,濡傛灉鏈夋暟鎹氨涓嶄繚瀛�
+ //閫氳繃,杩涜鍒嗙粍
+ string[] data = msg2.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+
+ oCN.BeginTran();
+
+ string HBillType = "3033";
+ long HInterID = DBUtility.ClsPub.CreateBillID(HBillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //瀹氫箟涓�涓┖闆嗗悎 鍘� 鍒ゆ柇鏄惁鏈夐噸澶嶇殑id
+ string[] list = new string[data.Length];
+
+ //鍒ゆ柇鏄惁璺熷叕鍏卞瓧娈甸噸澶�
+ ds = oCN.RunProcReturn(" select * from h_v_Xt_LanModuleList where HModuleCode='GYModel'", "h_v_Xt_LanModuleList");
+ string[] Datalist = new string[ds.Tables[0].Rows.Count];
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ Datalist[i] = ds.Tables[0].Rows[i]["HFieldCode"].ToString() + ds.Tables[0].Rows[i]["HFieldName"].ToString();
+ }
+ }
+
+ //瀹氫箟涓�涓� num 鍘诲畾涔� 褰撳墠鐨勭储寮�
+ int num = 0;
+
+ for (int i = 0; i < data.Length; i++)
+ {
+ string[] Lable = data[i].Split(new string[] { "|" }, StringSplitOptions.RemoveEmptyEntries);
+
+ if (Lable.Length == 3) {
+
+ string HFieldCode = Lable[0];
+ string HFieldName = Lable[1];
+ string HFieldModelType = Lable[2];
+
+ if (!list.Contains(HFieldCode + HFieldName) && !Datalist.Contains(HFieldCode + HFieldName))
+ {
+
+ list[num] = HFieldCode + HFieldName;
+ num += 1;
+
+ oCN.RunProc("insert into Xt_LanModuleSub(HInterID,HEntryID,HFieldModelType,HFieldCode,HFieldName)" +
+ "values(" + HInterID + "," + num + ",'" + HFieldModelType + "','" + HFieldCode + "','" + HFieldName + "')");
+ }
+ }
+ }
+
+ oCN.RunProc("insert into Xt_LanModuleMain(HInterID,HBillType,HModuleName,HModuleCode)" +
+ "values(" + HInterID + ",'" + HBillType + "','','" + HModName + "')");
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鎶ラ敊淇℃伅 鏌ヨ
+ [Route("Xt_grdAlignment_WMES/SelectMessageError")]
+ [HttpGet]
+ public object SelectMessageError(string ErrorCode)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from Xt_MessageError where HErrorCode='" + ErrorCode + "'", "Xt_MessageError");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ 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
}
}
\ No newline at end of file
--
Gitblit v1.9.1