From cee055eb7cdecf5d995cc65d379494e471bde9c8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 02 四月 2025 10:06:03 +0800
Subject: [PATCH] 合并
---
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs | 148 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 146 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
index 1e0a616..5f07608 100644
--- a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -711,8 +711,6 @@
}
#endregion
-
-
#region 鍩虹璧勬枡 鑾峰彇鏁版嵁
[Route("Gy_GetBaseData/Gy_GetBaseData")]
[HttpGet]
@@ -750,5 +748,151 @@
}
}
#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