From 3ab8acb38e1e853d7002836f681a8b7a3ee96b5a Mon Sep 17 00:00:00 2001 From: wyb <1qaz@123> Date: 星期二, 25 五月 2021 17:43:58 +0800 Subject: [PATCH] 不良原因设置增删改 --- WebAPI/ListModels.cs | 11 + WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs | 4 WebAPI/Controllers/WebAPIController.cs | 278 +++++++++++++++++++++++++++ WebAPI/DLL/ClsGy_BadReason_Ctl.cs | 102 ++++++++++ WebAPI/Properties/PublishProfiles/API.pubxml.user | 132 ++++++------ WebAPI/Service/LuBaoSevice.cs | 21 ++ WebAPI/WebAPI.csproj | 1 7 files changed, 481 insertions(+), 68 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs index c8fe01b..aeba8ab 100644 --- a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs @@ -31,11 +31,11 @@ { if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_IF_BadReasonList " + sWhere, "h_v_IF_BadReasonList"); + ds = oCN.RunProcReturn("select * from h_v_IF_BadReasonList where 绂佺敤鏍囪='' " + sWhere, "h_v_IF_BadReasonList"); } else { - string sql1 = "select * from h_v_IF_BadReasonList where 1 = 1 "; + string sql1 = "select * from h_v_IF_BadReasonList where 绂佺敤鏍囪='' "; string sql = sql1 + sWhere; ds = oCN.RunProcReturn(sql, "h_v_IF_BadReasonList"); } diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs index 0ed6fa9..ac2b276 100644 --- a/WebAPI/Controllers/WebAPIController.cs +++ b/WebAPI/Controllers/WebAPIController.cs @@ -12,6 +12,7 @@ using System.Web.Http; using WebAPI; using WebAPI.Models; +using WebAPI.Service; namespace WebAPI.Controllers { @@ -934,6 +935,7 @@ } } + #region 涓嶈壇鍘熷洜璁剧疆鍒楄〃/淇濆瓨/缂栬緫/鍒犻櫎鏂规硶 /// <summary> /// 鑾峰彇涓嶈壇鍘熷洜鍒楄〃 /// </summary> @@ -996,6 +998,282 @@ /// <summary> + /// 淇濆瓨涓嶈壇鍘熷洜 + /// </summary> + /// <param name="msg"></param> + /// <returns></returns> + [Route("SaveGy_BadReasonList")] + [HttpPost] + public object SaveGy_BadReasonList([FromBody] JObject msg) + { + DataSet ds; + var _value = msg["msg"].ToString(); + string msg1 = _value.ToString(); + //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + //string msg2 = sArray[0].ToString(); + //string msg3 = sArray[1].ToString(); + Int64 HItemID = 0; + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + //鑾峰彇鏈�澶D鍊艰祴鍊� + DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_BadReason ", "Gy_BadReason"); + if (Maxds!=null||Maxds.Tables[0].Rows.Count > 0) + { + //HItemID= Maxds.Tables[0].Rows[0]["HItemID"] + var maxid=Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]); + maxid += 1; + HItemID = maxid; + } + ListModels oListModels = new ListModels(); + try + { + WebAPI.DLL.ClsGy_BadReason_Ctl oBill = new WebAPI.DLL.ClsGy_BadReason_Ctl(); + List<Model.ClsGy_BadReason_Model> lsmain = new List<Model.ClsGy_BadReason_Model>(); + msg1 = msg1.Replace("\\", ""); + msg1 = msg1.Replace("\n", ""); //\n + lsmain = oListModels.getObjectByJson_Gy_BadReason(msg1); + foreach (Model.ClsGy_BadReason_Model oItem in lsmain) + { + if (oItem.HNumber.Trim() == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒"; + objJsonResult.data = 1; + return objJsonResult; + } + if (oItem.HName.Trim() == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒"; + objJsonResult.data = 1; + return objJsonResult; + } + if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()) ) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒"; + objJsonResult.data = 1; + return objJsonResult; + } + //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮� + + ds = oCN.RunProcReturn("select * from Gy_BadReason where 绂佺敤鏍囪='' and HNumber='" + oItem.HNumber.Trim()+"'", "Gy_BadReason"); + if ( oItem.HNumber.Trim()=="" ) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷负绌猴紒"; + objJsonResult.data = 1; + return objJsonResult; + } + //鏂板鏃跺垽鏂� + if (oItem.HItemID==0) + { + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒"; + objJsonResult.data = 1; + return objJsonResult; + } + //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦� + string sParent; + sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim()); + if (sParent.Trim() == "") + { + oBill.oModel.HParentID = 0; + } + else + { + if (oBill.HavParentCode(sParent.Trim(), HItemID)) + { + oBill.oModel.HParentID = oBill.oModel.HItemID; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + } + } + else//缂栬緫鏃跺垽鏂� + { + //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦� + string sParent; + sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim()); + if (sParent.Trim() == "") + { + oBill.oModel.HParentID = 0; + } + else + { + if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID)) + { + oBill.oModel.HParentID = oBill.oModel.HItemID; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + } + } + //寰楀埌鐭唬鐮� + string sShortNumber; + sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim()); + if (sShortNumber.Trim() == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠g爜涓虹┖锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + oItem.HShortNumber = sShortNumber;//鐭唬鐮� + oItem.HEndFlag = true;//鏈骇鏍囧織 + oItem.HLevel= DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇 + + oBill.oModel = oItem; + } + + //淇濆瓨 + //淇濆瓨瀹屾瘯鍚庡鐞� + bool bResult; + if (oBill.oModel.HItemID == 0) + { + // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); + bResult = oBill.AddNew(); + } + else + { + bResult = oBill.ModifyByID(oBill.oModel.HItemID); + } + if (bResult) + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "淇濆瓨鎴愬姛锛�"; + //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�"); + objJsonResult.data = 1; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = 1; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString(); + objJsonResult.data = 1; + return objJsonResult; + } + } + + /// <summary> + /// 涓嶈壇鍘熷洜鑾峰彇淇℃伅 + /// </summary> + /// <returns></returns> + [Route("GetGy_BadReasonDetail")] + [HttpGet] + public ApiResult<DataSet> GetGy_BadReasonDetail(string HID) + { + var model = LuBaoSevice.GetGy_BadReasonBillDetail(HID); + return model; + } + + /// <summary> + /// 涓嶈壇鍘熷洜鍒犻櫎鍔熻兘 + /// </summary> + /// <returns></returns> + [Route("DeltetGy_BadReason")] + [HttpGet] + public object DeltetGy_BadReason(string HItemID) + { + DataSet ds; + //string ModRightNameCheck = "Sc_ProcessReport_check"; + try + { + //鍒犻櫎鏉冮檺 + //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName)) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�"; + // objJsonResult.data = null; + // return objJsonResult; + //} + + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (string.IsNullOrWhiteSpace(HItemID)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "HItemID涓虹┖锛�"; + objJsonResult.data = null; + return objJsonResult; + } + oCN.BeginTran();//寮�濮嬩簨鍔� + ds = oCN.RunProcReturn("select * from Gy_BadReason where HItemID=" + HItemID, "Gy_BadReason"); + if (ds == null || ds.Tables[0].Rows.Count == 0 ) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒"; + objJsonResult.data = null; + return objJsonResult; ; + } + var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]); + if (HStopflag) + { + oCN.RollBack();//鍥炴粴浜嬪姟 + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒"; + objJsonResult.data = null; + return objJsonResult; + } + + oCN.RunProc("update Gy_BadReason set HStopflag=1 where HItemID=" + HItemID); + oCN.Commit();//鎻愪氦浜嬪姟 + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�"; + objJsonResult.data = null; + return objJsonResult; ; + + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + #endregion + /// <summary> /// 鑾峰彇宸ュ簭璁″垝鍗曞垪琛� /// </summary> /// <returns></returns> diff --git a/WebAPI/DLL/ClsGy_BadReason_Ctl.cs b/WebAPI/DLL/ClsGy_BadReason_Ctl.cs new file mode 100644 index 0000000..13d9431 --- /dev/null +++ b/WebAPI/DLL/ClsGy_BadReason_Ctl.cs @@ -0,0 +1,102 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Text; +using System.Data; + +namespace WebAPI.DLL +{ + public class ClsGy_BadReason_Ctl : DBUtility.ClsGy_Base_Ctl + { + SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); + //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩� + public string HOldNumber; + public Model.ClsGy_BadReason_Model oModel = new Model.ClsGy_BadReason_Model(); + //鏂板 + public override bool AddNew() + { + + try + { + oCn.BeginTran(); + oCn.RunProc("Insert into " + MvarItemKey + " " + + " (HNumber,HName,HHelpCode,HShortNumber,HParentID" + + ",HDeptID,HProcID" + + ",HLevel,HEndFlag,HStopflag,HRemark) " + + " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() + + "," + oModel.HDeptID.ToString() + "," + oModel.HProcID.ToString() + + "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo); + //淇敼涓婄骇涓洪潪鏈骇浠g爜 + oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo); + oCn.Commit(); + return true; + } + catch (Exception e) + { + oCn.RollBack(); + throw (e); + } + } + + //淇敼 + public override bool ModifyByID(Int64 sItemID) + { + try + { + oCn.BeginTran(); + oCn.RunProc("Update " + MvarItemKey + " set " + + " HNumber='" + oModel.HNumber + "'" + + ",HName='" + oModel.HName + "'" + + ",HShortNumber='" + oModel.HShortNumber + "'" + + ",HHelpCode='" + oModel.HHelpCode + "'" + + ",HLevel=" + oModel.HLevel.ToString() + + ",HDeptID=" + oModel.HDeptID.ToString() + + ",HProcID=" + oModel.HProcID.ToString() + + ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) + + ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) + + ",HRemark= '" + oModel.HRemark + "' Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo); + //淇敼瀛愰」鐩唬鐮� + oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo); + //灏嗕笂绾� 涓洪潪鏈骇 + oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo); + // + oCn.Commit(); + return true; + } + catch (Exception e) + { + oCn.RollBack(); + throw (e); + } + } + //鏍规嵁浠g爜鍒ゆ柇淇℃伅 + public override bool HavParentCode(string sCode, Int64 sItemID) + { + DataSet DS; + try + { + DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo); + if (DS.Tables[0].Rows.Count == 0) + return false; + else + { + oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]); + return true; + } + } + catch (Exception e) + { + throw (e); + } + } + //鏋勯�犲嚱鏁� + public ClsGy_BadReason_Ctl() + { + MvarItemKey = "Gy_BadReason"; + MvarReportTitle = "涓嶈壇鍘熷洜璁剧疆"; + oModel = new Model.ClsGy_BadReason_Model(); + } + + + + } +} diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index 7457a5a..82b0de4 100644 --- a/WebAPI/ListModels.cs +++ b/WebAPI/ListModels.cs @@ -508,6 +508,17 @@ return list; } + /// <summary> + /// 澶勭悊鏂板涓嶈壇鍘熷洜琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsGy_BadReason_Model> getObjectByJson_Gy_BadReason(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsGy_BadReason_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_BadReason_Model>>(jsonString); + return list; + } //getObjectByJson_Gy_MouldMaintainPlanBillMain diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user index 3fa4e06..7de29a3 100644 --- a/WebAPI/Properties/PublishProfiles/API.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user @@ -7,12 +7,12 @@ <PropertyGroup> <TimeStampOfAssociatedLegacyPublishXmlFile /> <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl> - <History>True|2021-05-23T15:05:37.3855541Z;True|2021-05-22T05:45:13.7439233+08:00;True|2021-05-22T05:42:35.4852011+08:00;True|2021-05-22T05:25:16.8821260+08:00;True|2021-05-21T15:58:20.5625475+08:00;True|2021-05-21T15:55:21.1943961+08:00;True|2021-05-21T15:53:35.6852027+08:00;True|2021-05-21T15:46:56.7370418+08:00;True|2021-05-21T15:32:49.2494690+08:00;True|2021-05-21T15:19:19.8145510+08:00;True|2021-05-21T10:16:44.9563480+08:00;True|2021-05-20T19:21:19.8572280+08:00;True|2021-05-20T19:15:57.2506092+08:00;True|2021-05-20T15:58:09.0123323+08:00;True|2021-05-20T15:54:54.6251445+08:00;True|2021-05-20T15:32:04.9783034+08:00;True|2021-05-20T15:31:58.9418248+08:00;True|2021-05-20T15:31:53.2904235+08:00;True|2021-05-20T15:31:48.5385850+08:00;True|2021-05-20T13:31:35.5777988+08:00;True|2021-05-20T10:46:01.6559203+08:00;True|2021-05-20T10:40:53.2131788+08:00;True|2021-05-20T08:58:49.3511837+08:00;True|2021-05-19T16:15:22.7730518+08:00;True|2021-05-19T16:13:03.2756422+08:00;True|2021-05-19T16:11:16.3163692+08:00;True|2021-05-19T15:31:19.7575868+08:00;True|2021-05-19T14:49:47.6104541+08:00;True|2021-05-19T10:46:17.6515193+08:00;True|2021-05-19T10:45:23.6466498+08:00;True|2021-05-18T17:19:36.9591198+08:00;True|2021-05-18T17:16:38.1513255+08:00;True|2021-05-18T10:31:35.2246444+08:00;True|2021-05-17T16:36:00.1226059+08:00;True|2021-05-17T16:31:05.1414358+08:00;True|2021-05-17T16:22:57.4215158+08:00;True|2021-05-17T16:22:52.6941933+08:00;True|2021-05-17T16:22:49.0033372+08:00;True|2021-05-17T16:18:03.8629751+08:00;True|2021-05-17T15:50:27.6196340+08:00;True|2021-05-17T13:22:15.7308548+08:00;True|2021-05-12T09:19:36.0666124+08:00;True|2021-05-12T09:17:40.0887602+08:00;True|2021-05-12T09:06:24.5508601+08:00;True|2021-05-12T08:39:56.6657894+08:00;True|2021-05-11T17:42:28.6508833+08:00;True|2021-05-11T15:22:03.4937062+08:00;True|2021-05-10T16:45:56.1282466+08:00;True|2021-05-08T19:04:07.1084339+08:00;True|2021-05-08T18:04:40.2166839+08:00;True|2021-05-08T18:04:32.5635574+08:00;True|2021-05-08T18:01:24.5206432+08:00;True|2021-05-08T17:38:05.5582200+08:00;True|2021-05-08T15:26:55.2861241+08:00;True|2021-05-08T14:52:13.1682476+08:00;True|2021-05-08T14:50:30.5356438+08:00;True|2021-05-08T14:38:40.3445313+08:00;True|2021-05-08T14:38:37.9504757+08:00;True|2021-05-08T14:30:31.9762236+08:00;True|2021-05-08T14:21:37.4496495+08:00;True|2021-05-07T20:47:46.1401919+08:00;True|2021-05-07T20:31:45.7777162+08:00;True|2021-05-07T20:31:35.2882424+08:00;True|2021-05-07T20:31:21.5616729+08:00;False|2021-05-07T20:29:33.8855457+08:00;False|2021-05-07T20:28:43.1845420+08:00;False|2021-05-07T20:28:13.1335411+08:00;True|2021-05-07T20:10:01.7346568+08:00;True|2021-05-07T20:03:17.0005596+08:00;True|2021-05-07T09:05:04.3102029+08:00;True|2021-05-06T18:11:36.9078607+08:00;True|2021-05-06T18:08:40.5403791+08:00;True|2021-05-06T18:07:04.1929681+08:00;True|2021-05-06T18:06:54.5987264+08:00;True|2021-05-06T18:05:46.1791578+08:00;True|2021-05-06T17:18:58.8131464+08:00;True|2021-05-06T17:18:37.9969968+08:00;True|2021-05-06T14:47:33.5704679+08:00;True|2021-05-06T10:03:28.7226576+08:00;True|2021-04-28T10:18:54.1336497+08:00;True|2021-04-27T16:34:19.0789205+08:00;True|2021-04-27T14:48:28.8138232+08:00;True|2021-04-27T10:34:03.6370089+08:00;True|2021-04-26T16:18:32.0260755+08:00;True|2021-04-26T15:00:58.6773071+08:00;True|2021-04-26T13:23:50.3968646+08:00;True|2021-04-16T08:50:41.5499248+08:00;True|2021-04-16T08:32:59.1701708+08:00;True|2021-04-16T08:27:36.9176335+08:00;True|2021-04-15T15:56:26.8485667+08:00;True|2021-04-15T15:21:23.2875671+08:00;True|2021-04-15T14:41:16.9980034+08:00;True|2021-04-15T14:36:34.8570017+08:00;True|2021-04-13T16:15:00.7668503+08:00;</History> + <History>True|2021-05-25T09:35:35.9642868Z;True|2021-05-25T17:06:01.1192559+08:00;True|2021-05-25T16:52:15.2304370+08:00;True|2021-05-25T16:12:13.5664530+08:00;True|2021-05-25T16:08:27.7007589+08:00;True|2021-05-25T15:58:36.5187538+08:00;True|2021-05-25T15:58:01.0527811+08:00;True|2021-05-25T15:54:45.0576223+08:00;True|2021-05-25T14:18:51.3134586+08:00;True|2021-05-25T11:28:15.6460627+08:00;True|2021-05-25T11:27:17.4884199+08:00;True|2021-05-25T11:26:04.5332872+08:00;True|2021-05-25T09:39:11.8882456+08:00;True|2021-05-23T23:05:37.3855541+08:00;True|2021-05-22T05:45:13.7439233+08:00;True|2021-05-22T05:42:35.4852011+08:00;True|2021-05-22T05:25:16.8821260+08:00;True|2021-05-21T15:58:20.5625475+08:00;True|2021-05-21T15:55:21.1943961+08:00;True|2021-05-21T15:53:35.6852027+08:00;True|2021-05-21T15:46:56.7370418+08:00;True|2021-05-21T15:32:49.2494690+08:00;True|2021-05-21T15:19:19.8145510+08:00;True|2021-05-21T10:16:44.9563480+08:00;True|2021-05-20T19:21:19.8572280+08:00;True|2021-05-20T19:15:57.2506092+08:00;True|2021-05-20T15:58:09.0123323+08:00;True|2021-05-20T15:54:54.6251445+08:00;True|2021-05-20T15:32:04.9783034+08:00;True|2021-05-20T15:31:58.9418248+08:00;True|2021-05-20T15:31:53.2904235+08:00;True|2021-05-20T15:31:48.5385850+08:00;True|2021-05-20T13:31:35.5777988+08:00;True|2021-05-20T10:46:01.6559203+08:00;True|2021-05-20T10:40:53.2131788+08:00;True|2021-05-20T08:58:49.3511837+08:00;True|2021-05-19T16:15:22.7730518+08:00;True|2021-05-19T16:13:03.2756422+08:00;True|2021-05-19T16:11:16.3163692+08:00;True|2021-05-19T15:31:19.7575868+08:00;True|2021-05-19T14:49:47.6104541+08:00;True|2021-05-19T10:46:17.6515193+08:00;True|2021-05-19T10:45:23.6466498+08:00;True|2021-05-18T17:19:36.9591198+08:00;True|2021-05-18T17:16:38.1513255+08:00;True|2021-05-18T10:31:35.2246444+08:00;True|2021-05-17T16:36:00.1226059+08:00;True|2021-05-17T16:31:05.1414358+08:00;True|2021-05-17T16:22:57.4215158+08:00;True|2021-05-17T16:22:52.6941933+08:00;True|2021-05-17T16:22:49.0033372+08:00;True|2021-05-17T16:18:03.8629751+08:00;True|2021-05-17T15:50:27.6196340+08:00;True|2021-05-17T13:22:15.7308548+08:00;True|2021-05-12T09:19:36.0666124+08:00;True|2021-05-12T09:17:40.0887602+08:00;True|2021-05-12T09:06:24.5508601+08:00;True|2021-05-12T08:39:56.6657894+08:00;True|2021-05-11T17:42:28.6508833+08:00;True|2021-05-11T15:22:03.4937062+08:00;True|2021-05-10T16:45:56.1282466+08:00;True|2021-05-08T19:04:07.1084339+08:00;True|2021-05-08T18:04:40.2166839+08:00;True|2021-05-08T18:04:32.5635574+08:00;True|2021-05-08T18:01:24.5206432+08:00;True|2021-05-08T17:38:05.5582200+08:00;True|2021-05-08T15:26:55.2861241+08:00;True|2021-05-08T14:52:13.1682476+08:00;True|2021-05-08T14:50:30.5356438+08:00;True|2021-05-08T14:38:40.3445313+08:00;True|2021-05-08T14:38:37.9504757+08:00;True|2021-05-08T14:30:31.9762236+08:00;True|2021-05-08T14:21:37.4496495+08:00;True|2021-05-07T20:47:46.1401919+08:00;True|2021-05-07T20:31:45.7777162+08:00;True|2021-05-07T20:31:35.2882424+08:00;True|2021-05-07T20:31:21.5616729+08:00;False|2021-05-07T20:29:33.8855457+08:00;False|2021-05-07T20:28:43.1845420+08:00;False|2021-05-07T20:28:13.1335411+08:00;True|2021-05-07T20:10:01.7346568+08:00;True|2021-05-07T20:03:17.0005596+08:00;True|2021-05-07T09:05:04.3102029+08:00;True|2021-05-06T18:11:36.9078607+08:00;True|2021-05-06T18:08:40.5403791+08:00;True|2021-05-06T18:07:04.1929681+08:00;True|2021-05-06T18:06:54.5987264+08:00;True|2021-05-06T18:05:46.1791578+08:00;True|2021-05-06T17:18:58.8131464+08:00;True|2021-05-06T17:18:37.9969968+08:00;True|2021-05-06T14:47:33.5704679+08:00;True|2021-05-06T10:03:28.7226576+08:00;True|2021-04-28T10:18:54.1336497+08:00;True|2021-04-27T16:34:19.0789205+08:00;True|2021-04-27T14:48:28.8138232+08:00;True|2021-04-27T10:34:03.6370089+08:00;True|2021-04-26T16:18:32.0260755+08:00;True|2021-04-26T15:00:58.6773071+08:00;True|2021-04-26T13:23:50.3968646+08:00;True|2021-04-16T08:50:41.5499248+08:00;True|2021-04-16T08:32:59.1701708+08:00;True|2021-04-16T08:27:36.9176335+08:00;True|2021-04-15T15:56:26.8485667+08:00;True|2021-04-15T15:21:23.2875671+08:00;True|2021-04-15T14:41:16.9980034+08:00;True|2021-04-15T14:36:34.8570017+08:00;True|2021-04-13T16:15:00.7668503+08:00;</History> </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> <publishTime>04/12/2021 11:33:15</publishTime> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> <publishTime>02/22/2013 08:43:40</publishTime> @@ -27,19 +27,19 @@ <publishTime>05/07/2021 20:31:20</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 14:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.FormService.dll"> <publishTime>09/20/2018 19:23:20</publishTime> @@ -57,7 +57,7 @@ <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>08/03/2014 20:33:56</publishTime> @@ -66,13 +66,13 @@ <publishTime>01/04/2011 13:48:18</publishTime> </File> <File Include="bin/Pub_Class.dll"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/15/2015 17:57:08</publishTime> @@ -138,7 +138,7 @@ <publishTime>11/28/2018 13:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> <publishTime>01/28/2015 04:02:18</publishTime> @@ -171,10 +171,10 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>05/23/2021 23:05:31</publishTime> + <publishTime>05/25/2021 17:35:09</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>05/23/2021 23:05:31</publishTime> + <publishTime>05/25/2021 17:35:09</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>02/04/2021 21:35:21</publishTime> @@ -192,166 +192,166 @@ <publishTime>03/26/2019 14:23:20</publishTime> </File> <File Include="Content/bootstrap.css"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:16</publishTime> </File> <File Include="Content/bootstrap.min.css"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:16</publishTime> </File> <File Include="Content/Site.css"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:16</publishTime> </File> <File Include="DLL/BLL.dll"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="DLL/DAL.dll"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="DLL/DBUtility.dll"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="DLL/Model.dll"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="DLL/Pub_Class.dll"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="DLL/Pub_Control.dll"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="DLL/SQLHelper.dll"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Global.asax"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Index.html"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="packages.config"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="PrecompiledApp.config"> <publishTime>05/07/2021 20:31:19</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Views/web.config"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> - <publishTime>05/21/2021 18:05:12</publishTime> + <publishTime>05/17/2021 18:30:17</publishTime> </File> <File Include="Web.config"> - <publishTime>05/23/2021 23:05:36</publishTime> + <publishTime>05/25/2021 17:35:35</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/Service/LuBaoSevice.cs b/WebAPI/Service/LuBaoSevice.cs index 2be8d64..57fc797 100644 --- a/WebAPI/Service/LuBaoSevice.cs +++ b/WebAPI/Service/LuBaoSevice.cs @@ -175,5 +175,26 @@ return dataSet; } + + /// <summary> + /// 涓嶈壇鍘熷洜鏍规嵁id鑾峰彇淇℃伅 + /// </summary> + public static ApiResult<DataSet> GetGy_BadReasonBillDetail(string HID) + { + if (string.IsNullOrEmpty(HID)) + return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" }; + var dataSet = GetGy_BadReasonDb(HID); + if (dataSet == null || dataSet.Tables[0].Rows.Count == 0) + return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄤ笉鑹師鍥犳暟鎹�" }; + return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet }; + } + + public static DataSet GetGy_BadReasonDb(string HID) + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + var dataSet = oCN.RunProcReturn("select top 1 * from h_v_IF_Edit_BadReasonList where HItemID= " + HID + " ", "h_v_IF_Edit_BadReasonList"); + return dataSet; + } + } } \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 8cde993..0805045 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -363,6 +363,7 @@ <Compile Include="Dapper\SqlHelper.cs" /> <Compile Include="Dapper\SqlPools.cs" /> <Compile Include="DbUntil\DataFormatUntil.cs" /> + <Compile Include="DLL\ClsGy_BadReason_Ctl.cs" /> <Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" /> <Compile Include="DLL\ClsQC_PatrolProcCheckBill.cs" /> <Compile Include="DLL\ClsSc_ProcessReport.cs" /> -- Gitblit v1.9.1