From b96af6124ac752f85a6bbf17eee2287e059d249d Mon Sep 17 00:00:00 2001 From: wtt <1985833171@qq.com> Date: 星期六, 12 十月 2024 15:24:54 +0800 Subject: [PATCH] 1 --- WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 96 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 70 insertions(+), 26 deletions(-) diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs index 44ee0f8..997ba74 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs @@ -1721,31 +1721,74 @@ } #endregion - #region 宸ュ簭鍑虹珯姹囨姤鍗曞垪琛� - [Route("Cj_StationOutBill/page")] + #region 杩斿洖宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�-鍒嗛〉 + [Route("Cj_StationOutBill/get_Display_byPage")] [HttpGet] - public json page(string sWhere, string user, int page, int size) + public object get_Display_byPage(string sWhere, string user, string Organization, int page, int size, string HBillSubType) { - json res = new json(); try { List<object> columnNameList = new List<object>(); - //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� - if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user)) - { - res.code = "0"; - res.count = 0; - res.Message = "鍑虹珯鍗曟棤鏌ヨ鏉冮檺!"; - res.data = null; - return res; - } - if (sWhere == null || sWhere.Equals("")) + if (HBillSubType == "SUB") { - ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",''", "h_p_MES_StationOutBillList"); + //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� + if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Sub_Query", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹屽伐鍗曟棤鏌ヨ鏉冮檺!"; + objJsonResult.data = null; + return objJsonResult; + } } else { - ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_MES_StationOutBillList"); + //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� + if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + 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, "宸ュ簭姹囨姤鍗曞垪琛�"); + + if (sql_splice == "娌℃湁鏌ヨ鍒扮浉鍏崇敤鎴蜂俊鎭�") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁鏌ヨ鍒扮浉鍏崇敤鎴蜂俊鎭�!"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + sWhere += sql_splice; + } + } + } + + sWhere = sWhere.Replace("'", "''"); + + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_MES_StationOutBillList"); + } + else + { + ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_MES_StationOutBillList"); } //娣诲姞鍒楀悕 @@ -1756,23 +1799,24 @@ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 } - res.code = CodeConstant.SUCCEED; - res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); - res.Message = "Sucess锛�"; - res.list = columnNameList; - res.data = ds.Tables[0]; - return res; + objJsonResult.code = "1"; + objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); + objJsonResult.Message = "Sucess锛�"; + objJsonResult.list = columnNameList; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; } catch (Exception e) { - res.code = CodeConstant.FAIL; - res.count = CountConstant.FAIL; - res.Message = "Exception锛�" + e.ToString(); - res.data = null; + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; return objJsonResult; } } #endregion + #region 宸ュ簭鍑虹珯姹囨姤鍗� 瀛愯〃鏌ヨ [Route("Cj_StationOutBill/get_SubDisplay")] [HttpGet] -- Gitblit v1.9.1