From 9700fa5f390e5b31ff966ce63f5f91ca46eedb72 Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期一, 01 十一月 2021 13:31:56 +0800 Subject: [PATCH] nothing --- WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs index 3bfffd6..0bdeb9f 100644 --- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs @@ -27,18 +27,18 @@ /// </summary> [Route("Gy_Material/list")] [HttpGet] - public object list(string sWhere) + public object list(string sWhere,string Organization) { try { + string sql1 = string.Format(@"select * from h_v_Gy_MaterialList where 缁勭粐鍚嶇О='" + Organization + "'"); if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_Gy_MaterialList " + sWhere, "h_v_Gy_MaterialList"); + ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_Gy_MaterialList"); } else { - string sql1 = "select * from h_v_Gy_MaterialList where 1 = 1 "; - string sql = sql1 + sWhere; + string sql = sql1 + sWhere + "order by HItemID desc"; ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterialList"); } if (ds == null || ds.Tables[0].Rows.Count == 0) @@ -373,12 +373,12 @@ } if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere, "h_v_Gy_MouldFileList"); + ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere+ "order by 鏃ユ湡 desc", "h_v_Gy_MouldFileList"); } else { string sql1 = "select * from h_v_Gy_MouldFileList where 1 = 1 "; - string sql = sql1 + sWhere; + string sql = sql1 + sWhere + "order by 鏃ユ湡 desc"; ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList"); } if (ds == null || ds.Tables[0].Rows.Count == 0) @@ -425,12 +425,12 @@ { if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_Gy_CheckToolsFileMainList " + sWhere, "h_v_Gy_CheckToolsFileMainList"); + ds = oCN.RunProcReturn("select * from h_v_Gy_CheckToolsFileMainList " + sWhere+ "order by 鏃ユ湡 desc", "h_v_Gy_CheckToolsFileMainList"); } else { string sql1 = "select * from h_v_Gy_CheckToolsFileMainList where 1 = 1 "; - string sql = sql1 + sWhere; + string sql = sql1 + sWhere + "order by 鏃ユ湡 desc"; ds = oCN.RunProcReturn(sql, "h_v_Gy_CheckToolsFileMainList"); } if (ds == null || ds.Tables[0].Rows.Count == 0) @@ -473,12 +473,12 @@ { if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList " + sWhere, "h_v_IF_BarCodeBillList"); + ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList " + sWhere+ "order by 鏃ユ湡 desc", "h_v_IF_BarCodeBillList"); } else { string sql1 = "select * from h_v_IF_BarCodeBillList where 1 = 1 "; - string sql = sql1 + sWhere; + string sql = sql1 + sWhere + "order by 鏃ユ湡 desc"; ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList"); } if (ds == null || ds.Tables[0].Rows.Count == 0) @@ -516,18 +516,18 @@ ///杩斿洖鍊硷細object銆� /// </summary> [Route("Gy_Mould_Edit/AddBill")] - [HttpGet] + [HttpPost] public object AddBill([FromBody] JObject oMain) { var _value = oMain["oMain"].ToString(); string msg1 = _value.ToString(); string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); - string msg3 = sArray[1].ToString();//褰撳墠浜� - string msg4 = sArray[2].ToString();//妯″潡鏉冮檺 + string msg3 = sArray[1].ToString();//妯″潡鏉冮檺 + string msg4 = sArray[2].ToString();//褰撳墠浜� oCN.BeginTran(); - if (!DBUtility.ClsPub.Security_Log(msg4, 1, true, msg3)) + if (!DBUtility.ClsPub.Security_Log(msg3, 1, true, msg4)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -600,7 +600,7 @@ string HSupNumber = mainList[0].HSupNumber; long HPrintQty = mainList[0].HPrintQty; - + //涓昏〃 oCN.RunProc("Insert Into Gy_MouldFileMain " + "(HBillType,HBillSubType,HInterID,HBillNo,HDate" + @@ -616,7 +616,7 @@ " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" + "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" + ",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" + - "," + HSubjoin + ",'" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" + + ",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" + "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID + ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" + "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + @@ -673,11 +673,11 @@ string msg1 = _value.ToString(); string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); - string msg3 = sArray[1].ToString();//褰撳墠浜� - string msg4 = sArray[2].ToString();//妯″潡鏉冮檺 + string msg3 = sArray[1].ToString();//妯″潡鏉冮檺 + string msg4 = sArray[2].ToString();//褰撳墠浜� try { - if (!DBUtility.ClsPub.Security_Log(msg4, 1, true, msg3)) + if (!DBUtility.ClsPub.Security_Log(msg3, 1, true, msg4)) { objJsonResult.code = "0"; objJsonResult.count = 0; -- Gitblit v1.9.1