From 5b6d9876d89219f34a2fda2820b1de752d28d77e Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 08 四月 2025 11:05:24 +0800
Subject: [PATCH] 物料：增加 制单人
---
WebAPI/Controllers/WebAPIController.cs | 123 +++++++++++++++++++++++++++++++++++++---
1 files changed, 113 insertions(+), 10 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 310e994..aa090e6 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -351,7 +351,7 @@
{
objjson.code = "0";
objjson.count = 0;
- objjson.Message = "瀵嗙爜閿欒锛�";
+ objjson.Message = "[0000-1-072]瀵嗙爜閿欒锛�";
objjson.data = null;
return objjson;
}
@@ -379,7 +379,7 @@
objjson.code = "0";
objjson.count = 1;
- objjson.Message = "鐧诲綍鎴愬姛锛�";
+ objjson.Message = "[0000-1-073]鐧诲綍鎴愬姛锛�";
objjson.data = ds.Tables[0];
return objjson;
@@ -389,7 +389,7 @@
objjson.code = "0";
objjson.count = 0;
- objjson.Message = "鐧诲綍寮傚父锛�" + e.Message;
+ objjson.Message = "[0000-1-074]鐧诲綍寮傚父锛�" + e.Message;
objjson.data = null;
return objjson; ;
}
@@ -2217,6 +2217,103 @@
return objjson;
}
}
+
+ /// <summary>
+ /// 鑾峰彇鐜妫�楠屾柟妗堝垪琛�
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Web/Gy_EnvironmentTestSchemeBillList_Json")]
+ [HttpGet]
+ public object Gy_EnvironmentTestSchemeBillList_Json(string sWhere)
+ {
+ DataSet ds;
+
+ if (sWhere != "")
+ {
+ sWhere = " and ( 鐢熶骇閮ㄩ棬 like '%" + sWhere + "%' or 宸ヤ綔涓績 like '%" + sWhere + "%' or 宸ュ簭鍚嶇О like '%" + sWhere + "%' or 妫�娴嬮」鐩� like '%" + sWhere + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("select * from h_v_Gy_EnvironmentTestSchemeBillList_PDA where 瀹℃牳浜� !='' and 鍏抽棴浜�='' " + sWhere + " Order by 鍗曟嵁鍙� ", "h_v_Gy_EnvironmentTestSchemeBillList_PDA");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触";
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鐜妫�娴嬮」鐩垪琛�
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Web/Gy_EnvironmentTestItemList_Json")]
+ [HttpGet]
+ public object Gy_EnvironmentTestItemList_Json(string sWhere)
+ {
+ DataSet ds;
+
+ if (sWhere != "")
+ {
+ sWhere = " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("select HItemID ,HName 鐜妫�娴嬮」鐩�,HNumber 鐜妫�娴嬩唬鐮� from Gy_EnvironmentTestItem where ISNULL(HCheckTime,'')!='' and HStopflag =0 " + sWhere + " Order by HNumber ", "Gy_EnvironmentTestItem");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触";
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
/// <summary>
/// 鑾峰彇閾惰鍒楄〃
@@ -18092,7 +18189,7 @@
{
try
{
- ds = oCN.RunProcReturn("select * from xt_BaseInfo", "xt_BaseInfo");
+ ds = oCN.RunProcReturn("select HItemID,HNumber,HCusName,HLogoLabel,HMenuLabel,HUserQty,ISNULL(HLogoTranslationText_English,HLogoLabel) HLogoTranslationText_English,ISNULL(HLogoTranslationText_Spain,HLogoLabel) HLogoTranslationText_Spain , ISNULL(HMenuTranslationText_English, HLogoLabel) HMenuTranslationText_English, ISNULL(HMenuTranslationText_Spain, HLogoLabel) HMenuTranslationText_Spain from xt_BaseInfo", "xt_BaseInfo");
if (ds is null)
{
objjson.code = "0";
@@ -19630,7 +19727,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.Message = "[0000-1-068]鏃犳潈闄愭煡璇�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -19653,7 +19750,7 @@
res.code = CodeConstant.SUCCEED;
res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
- res.Message = "Sucess锛�";
+ res.Message = "[0000-1-037]Sucess锛�";
res.list = columnNameList;
res.data = ds.Tables[0];
return res;
@@ -19662,7 +19759,7 @@
{
res.code = CodeConstant.FAIL;
res.count = CountConstant.FAIL;
- res.Message = "Exception锛�" + e.ToString();
+ res.Message = "[0000-1-038]Exception锛�" + e.ToString();
res.data = null;
return res;
}
@@ -20468,6 +20565,8 @@
public string Hurl { get; set; }
public string HPicNum { get; set; }
public string HShowMode { get; set; }
+ public string HTranslationText_English { get; set; }
+ public string HTranslationText_Spain { get; set; }
public List<MenuLoad> childMenus { get; set; }
}
@@ -20489,7 +20588,7 @@
ds = oCn.RunProcReturn(sql1, "Gy_MenuDefineSet"); //鏌ヨ鐢ㄦ埛缁戝畾鐨勮鑹� 鏄惁璁剧疆鑿滃崟淇℃伅 鍙栬鑹插悕绉版渶鐭殑涓�涓�
if ((ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0))
{
- sql = "Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID ";
+ sql = "Select HitemID,HNumber,HName,HPartentID,HLevel,Hurl,HShowMode,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain,HPicNum from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID ";
ds = oCn.RunProcReturn(sql, "Gy_Menu_1");
}
}
@@ -20506,6 +20605,8 @@
tbj.HLevel = int.Parse(ds.Tables[0].Rows[i]["HLevel"].ToString());
tbj.Hurl = ds.Tables[0].Rows[i]["Hurl"].ToString();
tbj.HShowMode = ds.Tables[0].Rows[i]["HShowMode"].ToString();
+ tbj.HTranslationText_English = ds.Tables[0].Rows[i]["HTranslationText_English"].ToString();
+ tbj.HTranslationText_Spain = ds.Tables[0].Rows[i]["HTranslationText_Spain"].ToString();
if (ds.Tables[0].Rows[i]["HPicNum"] != null)
{
tbj.HPicNum = ds.Tables[0].Rows[i]["HPicNum"].ToString();
@@ -20549,6 +20650,8 @@
tbjson.HLevel = tree[m].HLevel;
tbjson.Hurl = dt.Rows[i]["Hurl"].ToString();
tbjson.HShowMode = dt.Rows[i]["HShowMode"].ToString();
+ tbjson.HTranslationText_English = dt.Rows[i]["HTranslationText_English"].ToString();
+ tbjson.HTranslationText_Spain = dt.Rows[i]["HTranslationText_Spain"].ToString();
if (dt.Rows[i]["HPicNum"] != null)
{
tbjson.HPicNum = dt.Rows[i]["HPicNum"].ToString();
@@ -20934,12 +21037,12 @@
try
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- string sql = "select a.HSubFuncID, a.HCaption,a.HPicNum,b.Hurl from Xt_UserFastMenu as a join Gy_Menu_1 as b on a.HSubFuncID = b.HItemID where a.HUserID = '" + HMakeName + "' and b.HType = '" + HType + "' Order by a.HItemID";
+ string sql = "select a.HSubFuncID, a.HCaption,a.HPicNum,b.Hurl,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain from Xt_UserFastMenu as a join Gy_Menu_1 as b on a.HSubFuncID = b.HItemID where a.HUserID = '" + HMakeName + "' and b.HType = '" + HType + "' Order by a.HItemID";
ds = oCn.RunProcReturn(sql, "Xt_UserFastMenu"); //鑾峰彇Xt_UserFastMenu涓鐢ㄦ埛璁剧疆鐨勮嚜瀹氫箟鑿滃崟淇℃伅锛岀敤浜庡湪鍓嶇鍔犺浇
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
- sql = "select a.HSubFuncID, a.HCaption,a.HPicNum,b.Hurl from Xt_UserFastMenu as a join Gy_Menu_1 as b on a.HSubFuncID = b.HItemID where a.HUserID = 'admin' and b.HType = '" + HType + "' Order by a.HItemID";
+ sql = "select a.HSubFuncID, a.HCaption,a.HPicNum,b.Hurl,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain from Xt_UserFastMenu as a join Gy_Menu_1 as b on a.HSubFuncID = b.HItemID where a.HUserID = 'admin' and b.HType = '" + HType + "' Order by a.HItemID";
ds = oCn.RunProcReturn(sql, "Xt_UserFastMenu"); //鑾峰彇Xt_UserFastMenu涓鐢ㄦ埛璁剧疆鐨勮嚜瀹氫箟鑿滃崟淇℃伅锛岀敤浜庡湪鍓嶇鍔犺浇
}
--
Gitblit v1.9.1