From 03626d36cad79f629616dc40a0a099f0631a4672 Mon Sep 17 00:00:00 2001 From: yxj <yxj@hz-kingdee.com> Date: 星期五, 03 一月 2025 15:35:59 +0800 Subject: [PATCH] 1 --- WebAPI/Controllers/WebAPIController.cs | 67 +++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs index a81e782..1536146 100644 --- a/WebAPI/Controllers/WebAPIController.cs +++ b/WebAPI/Controllers/WebAPIController.cs @@ -16736,6 +16736,12 @@ 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"; 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"; + ds = oCn.RunProcReturn(sql, "Xt_UserFastMenu"); //鑾峰彇Xt_UserFastMenu涓鐢ㄦ埛璁剧疆鐨勮嚜瀹氫箟鑿滃崟淇℃伅锛岀敤浜庡湪鍓嶇鍔犺浇 + } + objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "鏌ヨ鎴愬姛锛�"; @@ -17206,6 +17212,67 @@ } } + + /// <summary> + /// 閲戝竻WMS鎺ュ彛 + /// </summary> + /// <returns></returns> + [Route("Web/WMSBarcodeQuery")] + [HttpGet] + public object WMSBarcodeQuery(DateTime dateTime, string UserName, string PassWord) + { + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + //鏉冮檺鍒ゅ畾 + DAL.ClsUser oUser = new DAL.ClsUser(); + DataSet DS; + DS = oCN.RunProcReturn("select * from Gy_Czygl where Czymc='" + UserName.Trim() + "' and Czmm='" + DBUtility.ClsPub.StrToPsd(PassWord.Trim()) + "' ", "Gy_Czygl"); + if (UserName == "" || UserName != "鍞悗鏉$爜鏌ヨ") + { + objjson.code = "0"; + objjson.count = 0; + objjson.Message = "鐢ㄦ埛涓嶅锛�"; + objjson.data = null; + return objjson; + } + if (DS == null || DS.Tables[0].Rows.Count == 0) + { + objjson.code = "0"; + objjson.count = 0; + objjson.Message = "瀵嗙爜閿欒锛�"; + objjson.data = null; + return objjson; + } + ds = oCN.RunProcReturn("exec h_p_WMSBarcodeQuery '" + dateTime + "'", "h_p_WMSBarcodeQuery"); + + 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 = "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; + } + } + } } -- Gitblit v1.9.1