From 28f99afc92f67b372df91f1205a3dd8c2ff7be6e Mon Sep 17 00:00:00 2001 From: YL <YL@LAPTOP-SE03PLUR> Date: 星期一, 06 九月 2021 16:38:15 +0800 Subject: [PATCH] nothing --- WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 56 ++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 34 insertions(+), 22 deletions(-) diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs index df0b009..dedfd6e 100644 --- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs +++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs @@ -443,22 +443,11 @@ { ds = Sc_MouldConkBookBillList_s(sWhere); - if (ds == null || ds.Tables[0].Rows.Count <= 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�"; - objJsonResult.data = null; - return objJsonResult; - } - else - { - objJsonResult.code = "1"; - objJsonResult.count = 1; - objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�"; - objJsonResult.data = ds.Tables[0]; - return objJsonResult; - } + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; } catch (Exception ex) { @@ -475,7 +464,18 @@ public static DataSet Sc_MouldConkBookBillList_s(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList ", "h_v_Sc_MouldConkBookBillList"); + DataSet ds; + if (sWhere == null || sWhere.Equals("")) + { + ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList " + sWhere, "h_v_Sc_MouldConkBookBillList"); + } + else + { + string sql1 = "select * from h_v_Sc_MouldConkBookBillList where 1 = 1 "; + string sql = sql1 + sWhere; + ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldConkBookBillList"); + } + return ds; } #endregion @@ -491,7 +491,6 @@ { try { - ds = Sc_MouldRepairCheckBillList_s(sWhere); objJsonResult.code = "1"; objJsonResult.count = 1; @@ -515,7 +514,18 @@ public static DataSet Sc_MouldRepairCheckBillList_s(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList ", "h_v_Sc_MouldRepairCheckBillList"); + DataSet ds; + if (sWhere == null || sWhere.Equals("")) + { + ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList_Edit " + sWhere, "h_v_Sc_MouldRepairCheckBillList_Edit"); + } + else + { + string sql1 = "select * from h_v_Sc_MouldRepairCheckBillList_Edit where 1 = 1 "; + string sql = sql1 + sWhere; + ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairCheckBillList_Edit"); + } + return ds; } #endregion @@ -1638,6 +1648,7 @@ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); + string msg4 = sArray[2].ToString(); string UserName = ""; @@ -1651,7 +1662,7 @@ lsmain = oListModels.getObjectByJson_Gy_MouldRepairCheckBillMain(msg2); foreach (Model.ClsSc_MouldRepairCheckBillMain oItem in lsmain) { - //oItem.HMaker = ""; + oItem.HMaker = msg4; UserName = oItem.HMaker; //鍒跺崟浜� oItem.HBillType = "3817"; oItem.HBillSubType = "3817"; @@ -1933,6 +1944,7 @@ { //oItem.HMaker = ""; UserName = oItem.HMaker; //鍒跺崟浜� + DBUtility.ClsPub.CurUserName = UserName; oItem.HBillType = "3815"; oItem.HBillSubType = "3815"; //oItem.HBillNo = ""; //鍗曟嵁鍙� @@ -2068,7 +2080,7 @@ { //ds = oCN.RunProcReturn("select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub", "Sc_MouldRepairCheckBillSub"); - ds = oCN.RunProcReturn("select HConkReasonID,鏁呴殰鍘熷洜浠g爜 HConkReasonCode,鏁呴殰鍘熷洜 HHConkReasonName,鏁呴殰鍘熷洜鎻忚堪 HConkExplanation,HManagerSonID HManagerID,瀛愯礋璐d汉浠g爜 HManagerCode,瀛愯礋璐d汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldConkBookBillList_Edit", "h_v_Sc_MouldConkBookBillList_Edit"); + ds = oCN.RunProcReturn("select HConkReasonID,鏁呴殰鍘熷洜浠g爜 HConkReasonCode,鏁呴殰鍘熷洜 HConkReasonName,鏁呴殰鍘熷洜鎻忚堪 HConkExplanation,HManagerSonID HManagerID,瀛愯礋璐d汉浠g爜 HManagerCode,瀛愯礋璐d汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldConkBookBillList_Edit", "h_v_Sc_MouldConkBookBillList_Edit"); objJsonResult.code = "0"; objJsonResult.count = 1; @@ -2079,7 +2091,7 @@ { //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 "; - string sql1 = "select HConkReasonID,鏁呴殰鍘熷洜浠g爜 HConkReasonCode,鏁呴殰鍘熷洜 HHConkReasonName,鏁呴殰鍘熷洜鎻忚堪 HConkExplanation,HManagerSonID HManagerID,瀛愯礋璐d汉浠g爜 HManagerCode,瀛愯礋璐d汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldConkBookBillList_Edit where 1 = 1 "; + string sql1 = "select HConkReasonID,鏁呴殰鍘熷洜浠g爜 HConkReasonCode,鏁呴殰鍘熷洜 HConkReasonName,鏁呴殰鍘熷洜鎻忚堪 HConkExplanation,HManagerSonID HManagerID,瀛愯礋璐d汉浠g爜 HManagerCode,瀛愯礋璐d汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldConkBookBillList_Edit where 1 = 1 "; string sql = sql1 + sqlWhere; ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldConkBookBillList_Edit"); -- Gitblit v1.9.1