From 1e5c4412216cdba315ab37ebc8e85644f39a7df1 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 11 七月 2025 16:50:02 +0800
Subject: [PATCH] PDA校验扫描物料条码方法修改，增加校验模块免扫物料条码系统参数
---
WebAPI/Controllers/WebAPIController.cs | 80 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 76 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index c0c90bf..a2d7e36 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -19220,6 +19220,60 @@
}
/// <summary>
+ /// 鏍规嵁妯″叿浠撳簱缂栧彿鑾峰彇妯″叿鏁版嵁
+ /// </summary>
+ /// <param name="sWhere">绛涢�夋潯浠�</param>
+ /// <param name="user">鎿嶄綔鐢ㄦ埛</param>
+ /// <param name="Organization">缁勭粐</param>
+ /// <returns>妯″叿鏁版嵁娓呭崟</returns>
+ [Route("Web/Get_Sc_MouldStatusAnalysisList")]
+ [HttpGet]
+ public object Get_Sc_MouldStatusAnalysisList(string sWhere, string user, string Organization)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("Select * from h_v_Sc_MouldStatusAnalysisList where 1=1 Order by HInterID DESC", "h_v_Sc_MouldStatusAnalysisList");
+ }
+ else
+ {
+ string sql1 = "Select * from h_v_Sc_MouldStatusAnalysisList where 1=1 ";
+ string sql = sql1 + sWhere + " Order by HInterID DESC";
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldStatusAnalysisList");
+ }
+
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ 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;
+ }
+ }
+
+ /// <summary>
/// 鑾峰彇鍣ㄥ叿鍒楄〃
/// </summary>
/// <returns></returns>
@@ -20474,7 +20528,7 @@
{
objjson.code = "0";
objjson.count = 0;
- objjson.Message = "鑾峰彇澶辫触,鏌ユ棤鏁版嵁" + DBUtility.ClsPub.sErrInfo;
+ objjson.Message = "鑾峰彇澶辫触,鏄庣粏鏌ユ棤鏁版嵁";
objjson.data = null;
return objjson;
}
@@ -21272,18 +21326,36 @@
//鑾峰彇鎵�鏈夋ā鍧楅〉闈�
[Route("Web/ModePageList")]
[HttpGet]
- public object ModePageList()
+ public object ModePageList(string HMakeName, string HType)
{
try
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- ds = oCn.RunProcReturn("Select * from Gy_Menu_1 where isnull(Hurl,'') like'%html%' Order by HItemID ", "Gy_Menu"); //鑾峰彇Gy_Menu_1涓殑鎵�鏈夎彍鍗曚俊鎭紝鐢ㄤ簬涓簃enuInitList鍒楄〃鍏�
+
+
+ string sql = "select * from Gy_MenuDefineSet where HMakeName = '" + HMakeName + "' and HType = '" + HType + "' and isnull(Hurl,'') like'%html%' order by HPosition";
+ ds = oCn.RunProcReturn(sql, "Gy_MenuDefineSet"); //鏌ヨ褰撳墠鐢ㄦ埛鐨勮嚜瀹氫箟鑿滃崟鏁版嵁
+ if (ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0) //鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁鏈夎缃繃鑷畾涔変俊鎭紝鑻ヨ褰曟暟涓�0锛屽垯娌℃湁璁剧疆杩囷紝鍔犺浇鎵�鏈夌殑鑿滃崟淇℃伅
+ {
+ string sql1 = "select * 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 )) and isnull(Hurl,'') like'%html%'";
+ ds = oCn.RunProcReturn(sql1, "Gy_MenuDefineSet"); //鏌ヨ鐢ㄦ埛缁戝畾鐨勮鑹� 鏄惁璁剧疆鑿滃崟淇℃伅 鍙栬鑹插悕绉版渶鐭殑涓�涓�
+ if ((ds.Tables[0] == null || ds.Tables[0].Rows.Count == 0))
+ {
+ sql = "Select * from h_v_Gy_Menu_1 Order by HPosition,len(HitemID),HitemID ";
+ ds = oCn.RunProcReturn(sql, "Gy_Menu_1");
+ }
+ }
+
+
+ //ds = oCn.RunProcReturn("Select * from Gy_Menu_1 where isnull(Hurl,'') like'%html%' Order by HItemID ", "Gy_Menu_1"); //鑾峰彇Gy_Menu_1涓殑鎵�鏈夎彍鍗曚俊鎭紝鐢ㄤ簬涓簃enuInitList鍒楄〃鍏�
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鏌ヨ鎴愬姛锛�";
- objJsonResult.data = ds;
+ objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
catch (Exception e)
--
Gitblit v1.9.1