From 13f2dee8954b5bd589c1998a4fc2f98d93325d1c Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期五, 16 六月 2023 13:25:14 +0800 Subject: [PATCH] 1 --- WebAPI/Controllers/LMESController.cs | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 159 insertions(+), 2 deletions(-) diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs index 97dfadb..816c3c2 100644 --- a/WebAPI/Controllers/LMESController.cs +++ b/WebAPI/Controllers/LMESController.cs @@ -17,6 +17,7 @@ private json objJsonResult = new json(); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); /// <summary> /// 杩斿洖杩涚珯鎵弿鍒楄〃|宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛� ///鍙傛暟锛歴tring sql銆� @@ -70,6 +71,20 @@ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!"; objJsonResult.data = null; return objJsonResult; + } + + //鑾峰彇绯荤粺鍙傛暟 + string Ret = ""; + if (oSystemParameter.ShowBill(ref Ret)) + { + //鍒ゆ柇瀹㈡埛涓洪緳灞辨苯閰� + if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤") + { + //鑾峰彇闇�瑕佹嫾鎺ョ殑瀛楃涓� + string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "宸ュ簭娲惧伐鍗曞垪琛�"); + + sWhere += sql_splice; + } } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); @@ -153,6 +168,21 @@ // objJsonResult.data = null; // return objJsonResult; //} + + //鑾峰彇绯荤粺鍙傛暟 + string Ret = ""; + if (oSystemParameter.ShowBill(ref Ret)) + { + //鍒ゆ柇瀹㈡埛涓洪緳灞辨苯閰� + if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤") + { + //鑾峰彇闇�瑕佹嫾鎺ョ殑瀛楃涓� + string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "宸ュ簭娲惧伐鍗曟槑缁嗗垪琛�"); + + sWhere += sql_splice; + } + } + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeIssueBillQuery where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeIssueBillQuery"); objJsonResult.code = "1"; @@ -374,14 +404,33 @@ return objJsonResult; } + //鑾峰彇绯荤粺鍙傛暟 + string Ret = ""; + if (oSystemParameter.ShowBill(ref Ret)) + { + //鍒ゆ柇瀹㈡埛涓洪緳灞辨苯閰� + if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤") + { + //鑾峰彇闇�瑕佹嫾鎺ョ殑瀛楃涓� + string sql_splice = DBUtility.ClsPub.SpliceSQL(user,"宸ヨ壓璺嚎鍒楄〃"); + + sWhere += sql_splice; + } + } + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select top 1000 * from h_v_Gy_RoutingBillList order by hmainid desc", "h_v_Gy_RoutingBillList"); + ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where 1 = 1" + sWhere + " order by hmainid desc", "h_v_Gy_RoutingBillList"); } else { - string sql1 = "select top 1000 * from h_v_Gy_RoutingBillList where 1 = 1 "; + string sql1 = "select * from h_v_Gy_RoutingBillList where 1 = 1 "; + //瀹㈡埛鑷畾涔� + if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�") + { + sql1 = "select top 1000 * from h_v_Gy_RoutingBillList where 1 = 1 "; + } string sql = sql1 + sWhere + " order by hmainid desc,cast(宸ュ簭鍙� as int)"; ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList"); } @@ -397,6 +446,100 @@ return GetObjectJson(ds); } + #endregion + + #region 鏌ョ湅宸ヨ壓璺嚎鍒楄〃宸ヤ环鏉冮檺 + /// <summary> + /// 鍒ゆ柇鏈夋棤鏌ョ湅宸ヤ环鏉冮檺 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Web/CheckProcPrice")] + [HttpGet] + public object CheckProcPrice(string UserName) + { + try + { + //鑾峰彇绯荤粺鍙傛暟 + string Ret = ""; + if (oSystemParameter.ShowBill(ref Ret)) + { + //鍒ゆ柇瀹㈡埛涓洪緳灞辨苯閰� + if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤") + { + //鍒ゆ柇鏄惁鏈夋煡璇㈠伐浠锋潈闄� + if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_CheckProcPrice", 1, false, UserName)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬪伐浠锋潈闄�!"; + objJsonResult.data = null; + return objJsonResult; + } + } + } + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鏌ョ湅鎴愬姛锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "寮傚父锛�" + e.Message; + objJsonResult.data = null; + return objJsonResult; ; + } + } + #endregion + + #region 淇敼宸ヨ壓璺嚎宸ヤ环鏉冮檺 + /// <summary> + /// 鍒ゆ柇鏈夋棤淇敼宸ヤ环鏉冮檺 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Web/EditProcPrice")] + [HttpGet] + public object EditProcPrice(string UserName) + { + try + { + //鑾峰彇绯荤粺鍙傛暟 + string Ret = ""; + if (oSystemParameter.ShowBill(ref Ret)) + { + //鍒ゆ柇瀹㈡埛涓洪緳灞辨苯閰� + if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤") + { + //鍒ゆ柇鏄惁鏈夋煡璇㈠伐浠锋潈闄� + if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_EditProcPrice", 1, false, UserName)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犱慨鏀瑰伐浠锋潈闄�!"; + objJsonResult.data = null; + return objJsonResult; + } + } + } + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "淇敼鎴愬姛锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "寮傚父锛�" + e.Message; + objJsonResult.data = null; + return objJsonResult; ; + } + } #endregion #region 宸ヨ壓璺嚎 鍒犻櫎 @@ -630,6 +773,20 @@ return objJsonResult; } + //鑾峰彇绯荤粺鍙傛暟 + string Ret = ""; + if (oSystemParameter.ShowBill(ref Ret)) + { + //鍒ゆ柇瀹㈡埛涓洪緳灞辨苯閰� + if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤") + { + //鑾峰彇闇�瑕佹嫾鎺ョ殑瀛楃涓� + string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "鐢熶骇璁㈠崟鍒楄〃"); + + sWhere += sql_splice; + } + } + ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by 鍒跺崟鏃ユ湡 desc,鍗曟嵁鍙� desc", "h_v_IF_ICMOBillList"); } catch (Exception e) -- Gitblit v1.9.1