From 549df1cac1529f4fc9b5d9b64e27de5d5d8b8951 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 22 十月 2025 13:53:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/WebAPIController.cs | 133 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 118 insertions(+), 15 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index effe158..f52ff93 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -18364,7 +18364,7 @@
Int64 HItemID = 0;
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
-
+
ListModels oListModels = new ListModels();
try
{
@@ -18876,7 +18876,8 @@
objjson.data = ds.Tables[0];
return objjson;
}
- } catch (Exception e)
+ }
+ catch (Exception e)
{
objjson.code = "0";
objjson.count = 0;
@@ -20178,6 +20179,7 @@
}
}
+
/// <summary>
/// 鏍规嵁鐗╂枡+宸ュ簭鑾峰彇妫�楠屾柟妗�
/// </summary>
@@ -21389,7 +21391,7 @@
{
DataSet ds = oCN.RunProcReturn("exec [h_p_Gy_MenuDefineSet_APP_Get] " +
"@HMaker = N'" + HMaker + "'," +
- "@HType = N'" + HType + "'," +
+ "@HType = N'" + HType + "'," +
"@HMenuListName = N'" + HMenuListName + "'"
, "h_p_Gy_MenuDefineSet_APP_Get");
@@ -21444,7 +21446,7 @@
list.ForEach(one =>
{
string sql2 = "insert into Gy_MenuDefineSet_APP( HEntryID, HIndex, HName, HMenuName, HPicNum, HShowMode, HMaker)" +
- "Values('" + one.HEntryID + "','" + one.HIndex + "','" + one.HName + "','" + MenuName + "','"
+ "Values('" + one.HEntryID + "','" + one.HIndex + "','" + one.HName + "','" + MenuName + "','"
+ one.HPicNum + "','" + one.HShowMode + "','" + user + "')";
oCN.RunProcReturn(sql2, "Gy_MenuDefineSet_APP");
});
@@ -21511,7 +21513,7 @@
{
string sql1 = "select HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HPicNum,HShowMode,isnull(HTranslationText_English,HName) HTranslationText_English,isnull(HTranslationText_Spain,HName) HTranslationText_Spain from Gy_MenuDefineSet where HMakeName=" +
"(select top 1 c.GroupName from Gy_Czygl a left join System_UserGroupInfo b on a.Czybm = b.UserId " +
- "left join System_UserGroup c on b.GroupId = c.GroupID where a.Czymc ='"+HMakeName+"' order by len(c.GroupName ))";
+ "left join System_UserGroup c on b.GroupId = c.GroupID where a.Czymc ='" + HMakeName + "' order by len(c.GroupName ))";
ds = oCn.RunProcReturn(sql1, "Gy_MenuDefineSet"); //鏌ヨ鐢ㄦ埛缁戝畾鐨勮鑹� 鏄惁璁剧疆鑿滃崟淇℃伅 鍙栬鑹插悕绉版渶鐭殑涓�涓�
if ((ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0))
{
@@ -21522,8 +21524,8 @@
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");
}
-
- }
+
+ }
}
for (int i = 0; i < ds.Tables[0].Rows.Count; i++) //灏嗚彍鍗曠殑鏍硅妭鐐逛繚瀛樺埌鍒楄〃menu涓�
@@ -21725,7 +21727,7 @@
{
try
{
-
+
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
@@ -21817,7 +21819,7 @@
if (HPartentID == "0" || HPartentID == ds.Tables[0].Rows[0]["HItemID"].ToString())
{
string HPosition = ds.Tables[0].Rows[0]["HPosition"].ToString();
- sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition,HTranslationText_English,HTranslationText_Spain) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','" + HPosition + "','"+ HTranslationText_English + "','" + HTranslationText_Spain + "')";
+ sql = "insert into Gy_MenuDefineSet(HItemID,HPartentID,HNumber,HName,HLevel,Hurl,HType,HMakeName,HPicNum,HPosition,HTranslationText_English,HTranslationText_Spain) values('" + saveDataList[i].HItemID + "','" + HPartentID + "','" + HNumber + "','" + saveDataList[i].HName + "'," + HLevel + ",'" + Hurl + "','" + HType + "','" + HMakeName + "','" + HPicNum + "','" + HPosition + "','" + HTranslationText_English + "','" + HTranslationText_Spain + "')";
oCN.RunProc(sql);
}
else
@@ -21861,7 +21863,7 @@
//蹇嵎鏂瑰紡鑷畾涔夎彍鍗曪細鑾峰彇鏍戠粍浠舵暟鎹�
[Route("Web/Xt_UserFastMenu_Display")]
[HttpGet]
- public object Xt_UserFastMenu_Display(string HMakeName, string HType,string HModelAtributos)
+ public object Xt_UserFastMenu_Display(string HMakeName, string HType, string HModelAtributos)
{
try
{
@@ -21983,7 +21985,7 @@
string HCaption = ds.Tables[0].Rows[0]["HName"].ToString();
string HType = ds.Tables[0].Rows[0]["HType"].ToString();
- sql = "insert into Xt_UserFastMenu(HUserID,HSubFuncID,HCaption,HType,HModelAtributos) values('" + HUserID + "','" + HSubFuncID + "','" + HCaption + "','" + HType + "','"+ HModelAtributos + "')";
+ sql = "insert into Xt_UserFastMenu(HUserID,HSubFuncID,HCaption,HType,HModelAtributos) values('" + HUserID + "','" + HSubFuncID + "','" + HCaption + "','" + HType + "','" + HModelAtributos + "')";
oCN.RunProc(sql);
}
}
@@ -22013,7 +22015,7 @@
//蹇嵎鏂瑰紡鑷畾涔夎彍鍗曪細鑾峰彇鏍戠粍浠舵暟鎹�
[Route("Web/Xt_UserFastMenu_Init")]
[HttpGet]
- public object Xt_UserFastMenu_Init(string HMakeName, string HType,string HModelAtributos)
+ public object Xt_UserFastMenu_Init(string HMakeName, string HType, string HModelAtributos)
{
try
{
@@ -22442,6 +22444,7 @@
}
}
+ #region 閫氳繃鍗曟嵁绫诲瀷銆佸崟鎹彿鏌ヨ鍗曟嵁淇℃伅
/// <summary>
/// 閫氳繃鍗曟嵁绫诲瀷鑾峰彇瀵瑰簲瑙嗗浘骞堕�氳繃鍗曟嵁鍙锋煡璇㈠崟鎹俊鎭�
/// </summary>
@@ -22457,7 +22460,7 @@
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("exec h_p_Gy_GetBillInfoByHBillTypeAndHBillNo N'" + HBillType + "',N'" + HBillNo +
+ ds = oCN.RunProcReturn("exec h_p_Gy_GetBillInfoByHBillTypeAndHBillNo N'" + HBillType + "',N'" + HBillNo +
"'," + HStockOrgID, "h_p_Gy_GetBillInfoByHBillTypeAndHBillNo");
if (ds == null)
@@ -22468,7 +22471,7 @@
objjson.data = null;
return objjson;
}
- else if((bool)ds.Tables[1].Rows[0]["returnType"] == false)
+ else if ((bool)ds.Tables[1].Rows[0]["returnType"] == false)
{
objjson.code = "0";
objjson.count = 0;
@@ -22494,6 +22497,62 @@
return objjson;
}
}
+ #endregion
+
+ #region 閫氳繃鍗曟嵁绫诲瀷銆佸崟鎹唴鐮併�佸瓙鍐呯爜鏌ヨ鍗曟嵁淇℃伅
+ /// <summary>
+ /// 閫氳繃鍗曟嵁绫诲瀷鑾峰彇瀵瑰簲瑙嗗浘骞堕�氳繃鍗曟嵁鍙锋煡璇㈠崟鎹俊鎭�
+ /// </summary>
+ /// <param name="HBillNo"></param>
+ /// <param name="HBillType"></param>
+ /// <param name="HStoreOrgID"></param>
+ /// <returns></returns>
+ [Route("Web/GetBillInfo_GenerateBillCode")]
+ [HttpGet]
+ public object GetBillInfo_GenerateBillCode(string HBillType, string HInterID, int HEntryID)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ ds = oCN.RunProcReturn("exec h_p_Gy_GetBillInfo_GenerateCode N'" + HBillType + "'," + HInterID +
+ "," + HEntryID, "h_p_Gy_GetBillInfo_GenerateCode");
+
+ if (ds == null)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else if ((bool)ds.Tables[1].Rows[0]["returnType"] == false)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ds.Tables[1].Rows[1]["payload"];
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+ #endregion
/// <summary>
@@ -22556,7 +22615,51 @@
}
}
+ #region 灏忓崼鐢靛櫒鑾峰彇鐗╂枡鏉＄爜瀵瑰簲鍗曟嵁
+ /// <summary>
+ /// 灏忓崼鐢靛櫒鑾峰彇鐗╂枡鏉＄爜瀵瑰簲鍗曟嵁
+ /// </summary>
+ /// <param name="sWhere">鑷畾涔夎繃婊ゆ潯浠�</param>
+ /// <param name="HBillType">鍗曟嵁鍙�</param>
+ /// <param name="HSourceBillType">婧愬崟鍙�</param>
+ /// <returns></returns>
+ [Route("web/XiaoWeiBarCodeQuery")]
+ [HttpGet]
+ public object XiaoWeiBarCodeQuery(string sWhere, int HBillType, int HSourceBillType)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_XiaoWeiBarCodeQuery '" + sWhere + "'," + HBillType + "," + HSourceBillType, "h_p_XiaoWeiBarCodeQuery");
+ 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 = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ #endregion
+
+
+
}
-
}
--
Gitblit v1.9.1