From dee77e8628733aba33e290bdcd70606f248e30eb Mon Sep 17 00:00:00 2001 From: YL <YL@LAPTOP-SE03PLUR> Date: 星期六, 24 七月 2021 00:35:37 +0800 Subject: [PATCH] 制作通用的单据编辑样例模块(生产汇报单列表/编辑),以方便其他开发人员可以借鉴。 --- WebAPI/ListModels.cs | 13 + WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 134 ++++++------ WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 285 +++++++++++++++++++++++++ WebAPI/WebAPI.csproj.user | 2 WebAPI/Models/ClsGy_Material_Model.cs | 44 ++++ WebAPI/Service/LuBaoSevice.cs | 21 + WebAPI/WebAPI.csproj | 2 WebAPI/Controllers/BaseSet/Gy_SourceController.cs | 4 WebAPI/DLL/ClsGy_Material_Ctl.cs | 135 ++++++++++++ 9 files changed, 570 insertions(+), 70 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs index 04b5522..9d103f0 100644 --- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs @@ -7,6 +7,8 @@ using System.Data.SqlClient; using System.Web.Http; using WebAPI.Models; +using WebAPI.Service; + namespace WebAPI.Controllers { public class Gy_MaterialController : ApiController @@ -66,6 +68,289 @@ } } + /// <summary> + /// 鐗╂枡璁剧疆鑾峰彇淇℃伅 + /// </summary> + /// <returns></returns> + [Route("Gy_Material/GetGy_MaterialDetail")] + [HttpGet] + public ApiResult<DataSet> GetGy_MaterialDetail(string HID) + { + var model = LuBaoSevice.GetGy_MaterialBillDetail(HID); + return model; + } + /// <summary> + /// 淇濆瓨鐗╂枡 + /// </summary> + /// <param name="msg"></param> + /// <returns></returns> + [Route("Gy_Material/SaveGy_MaterialList")] + [HttpPost] + public object SaveGy_MaterialList([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_Material ", "Gy_Material"); + 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 + { + DLL.ClsGy_Material_Ctl oBill = new DLL.ClsGy_Material_Ctl(); + List<Models.ClsGy_Material_Model> lsmain = new List<Models.ClsGy_Material_Model>(); + msg1 = msg1.Replace("\\", ""); + msg1 = msg1.Replace("\n", ""); //\n + lsmain = oListModels.getObjectByJson_Gy_Material(msg1); + foreach (ClsGy_Material_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 (oItem.HMaterTypeID == 0) + { + 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_Material where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_Material"); + 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("Gy_Material/Delete")] + [HttpGet] + public object DeltetGy_Material(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_Material where HItemID=" + HItemID, "Gy_Material"); + 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_Material 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; + } + } + /// <summary> /// 杩斿洖妯″叿鍒楄〃 diff --git a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs index c61d537..a4ee1b4 100644 --- a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs @@ -34,11 +34,11 @@ { if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_IF_SourceList where 绂佺敤鏍囪='' ", "h_v_IF_SourceList"); + ds = oCN.RunProcReturn("select * from h_v_IF_SourceList where 1=1 ", "h_v_IF_SourceList"); } else { - string sql1 = "select * from h_v_IF_SourceList where 绂佺敤鏍囪='' "; + string sql1 = "select * from h_v_IF_SourceList where 1=1 "; string sql = sql1 + sWhere; ds = oCN.RunProcReturn(sql, "h_v_IF_SourceList"); } diff --git a/WebAPI/DLL/ClsGy_Material_Ctl.cs b/WebAPI/DLL/ClsGy_Material_Ctl.cs new file mode 100644 index 0000000..687305e --- /dev/null +++ b/WebAPI/DLL/ClsGy_Material_Ctl.cs @@ -0,0 +1,135 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Text; +using System.Data; + +namespace WebAPI.DLL +{ + public class ClsGy_Material_Ctl : DBUtility.ClsGy_Base_Ctl + { + SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); + //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩� + public string HOldNumber; + public Models.ClsGy_Material_Model oModel = new Models.ClsGy_Material_Model(); + //鏂板 + public override bool AddNew() + { + try + { + oCn.BeginTran(); + oCn.RunProc("Insert into Gy_Material (" + + "HNumber,HName,HHelpCode,HShortNumber,HParentID" + + ",HLevel,HEndFlag,HStopflag,HRemark" + + ",HModel,HUnitID,HMaterClsID,HMaterTypeID,HUnitGroupID" + + ",HWhID,HRoutingID,HBomID,HSecUnitID,HSecUnitRate" + + ",HHighStock,HLowStock,HSafeStock,HOrderPrice,HSalePrice" + + ",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax" + + ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty) " + + " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() + + ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" + + ",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() + + ", " + oModel.HWhID.ToString() + "," + oModel.HRoutingID.ToString() + "," + oModel.HBomID.ToString() + "," + oModel.HSecUnitID.ToString() + "," + oModel.HSecUnitRate.ToString() + + ", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" + + ", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() + + ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + ")", 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 + "'" + + ",HParentID=" + oModel.HParentID.ToString() + + ",HLevel=" + oModel.HLevel.ToString() + + ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) + + ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) + + ",HRemark= '" + oModel.HRemark + "'" + + ",HHelpCode='" + oModel.HHelpCode + "'" + + ",HModel='" + oModel.HModel + "'" + + ",HUnitID=" + oModel.HUnitID.ToString() + + ",HMaterClsID=" + oModel.HMaterClsID.ToString() + + ",HMaterTypeID=" + oModel.HMaterTypeID.ToString() + + ",HUnitGroupID=" + oModel.HUnitGroupID.ToString() + + ",HWhID=" + oModel.HWhID.ToString() + + ",HRoutingID=" + oModel.HRoutingID.ToString() + + ",HBomID=" + oModel.HBomID.ToString() + + ",HSecUnitID=" + oModel.HSecUnitID.ToString() + + ",HSecUnitRate=" + oModel.HSecUnitRate.ToString() + + ",HHighStock=" + oModel.HHighStock.ToString() + + ",HLowStock=" + oModel.HLowStock.ToString() + + ",HSafeStock=" + oModel.HSafeStock.ToString() + + ",HOrderPrice=" + oModel.HOrderPrice.ToString() + + ",HSalePrice=" + oModel.HSalePrice.ToString() + + ",HKeepDays=" + oModel.HKeepDays.ToString() + + ",HPlanPrice=" + oModel.HPlanPrice.ToString() + + ",HstdPrice=" + oModel.HstdPrice.ToString() + + ",HQtyMin=" + oModel.HQtyMin.ToString() + + ",HQtyMax=" + oModel.HQtyMax.ToString() + + ",HVersion='" + oModel.HVersion + "'" + + ",HEngName='" + oModel.HEngName + "'" + + ",HEngModel='" + oModel.HEngModel + "'" + + ",HSubjoin='" + oModel.HSubjoin + "'" + + ",HSubjoin2='" + oModel.HSubjoin2 + "'" + + ",HColor='" + oModel.HColor + "'" + + ",HSPGroupID=" + oModel.HSPGroupID.ToString() + + ",HSPID=" + oModel.HSPID.ToString() + + ",HMinPickQty=" + oModel.HMinPickQty.ToString() + + ",HPropertyTypeID=" + oModel.HPropertyTypeID.ToString() + "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_Material_Ctl() + { + MvarItemKey = "Gy_Material"; + MvarReportTitle = "鐗╂枡璁剧疆"; + oModel = new Models.ClsGy_Material_Model(); + } + } +} diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index 69a413a..17d63b3 100644 --- a/WebAPI/ListModels.cs +++ b/WebAPI/ListModels.cs @@ -668,6 +668,19 @@ return list; } + + /// <summary> + /// 澶勭悊鏂板鐗╂枡琛ㄧ殑json + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Models.ClsGy_Material_Model> getObjectByJson_Gy_Material(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Models.ClsGy_Material_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_Material_Model>>(jsonString); + return list; + } + /// <summary> /// 澶勭悊鏂板璁惧缁翠慨涓昏〃鐨刯son /// </summary> diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs new file mode 100644 index 0000000..889a61a --- /dev/null +++ b/WebAPI/Models/ClsGy_Material_Model.cs @@ -0,0 +1,44 @@ +锘縰sing DBUtility; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace WebAPI.Models +{ + public class ClsGy_Material_Model : ClsGy_Base_Model + { + public long HMaterClsID; + public string HPicNo; + public long HErpclsID; + public string HColor; + public string HSubjoin2; + public string HSubjoin; + public long HSPID; + public long HSPGroupID; + public long HPropertyTypeID; + public string HEngModel; + public string HEngName; + public string HVersion; + public double HQtyMax; + public double HQtyMin; + public double HMinPickQty; + public string HBarCode; + public double HstdPrice; + public double HKeepDays; + public double HSalePrice; + public double HOrderPrice; + public double HSafeStock; + public double HLowStock; + public double HHighStock; + public double HSecUnitRate; + public long HSecUnitID; + public long HBomID; + public long HRoutingID; + public long HWhID; + public long HUnitGroupID; + public long HMaterTypeID; + public double HPlanPrice; + + } +} \ No newline at end of file diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index 5be70d0..8edc52f 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -9,7 +9,7 @@ </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> <publishTime>02/22/2013 08:43:40</publishTime> @@ -18,19 +18,19 @@ <publishTime>02/22/2013 08:43:40</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>07/21/2021 19:55:31</publishTime> + <publishTime>07/21/2021 17:35:30</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 14:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.FormService.dll"> <publishTime>09/20/2018 19:23:20</publishTime> @@ -48,22 +48,22 @@ <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>07/21/2021 09:18:44</publishTime> + <publishTime>07/20/2021 23:27:38</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> - <publishTime>07/12/2021 18:14:19</publishTime> + <publishTime>07/12/2021 16:12:20</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>08/03/2014 20:33:56</publishTime> </File> <File Include="bin/Pub_Class.dll"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>05/21/2020 10:51:50</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/15/2015 17:57:08</publishTime> @@ -129,7 +129,7 @@ <publishTime>11/28/2018 13:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> <publishTime>01/28/2015 04:02:18</publishTime> @@ -162,10 +162,10 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>07/24/2021 00:11:41</publishTime> + <publishTime>07/23/2021 15:18:37</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>07/24/2021 00:11:41</publishTime> + <publishTime>07/23/2021 15:18:37</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/17/2013 17:03:52</publishTime> @@ -177,166 +177,166 @@ <publishTime>11/29/2018 13:26:30</publishTime> </File> <File Include="Content/bootstrap.css"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Content/bootstrap.min.css"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Content/Site.css"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/BLL.dll"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/DAL.dll"> - <publishTime>07/21/2021 19:55:31</publishTime> + <publishTime>07/21/2021 17:35:30</publishTime> </File> <File Include="DLL/DBUtility.dll"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/Model.dll"> - <publishTime>07/21/2021 09:18:44</publishTime> + <publishTime>07/20/2021 23:27:38</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/Pub_Class.dll"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>05/21/2020 10:51:50</publishTime> </File> <File Include="DLL/Pub_Control.dll"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="DLL/SQLHelper.dll"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Global.asax"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Index.html"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> - <publishTime>05/25/2021 14:18:15</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="packages.config"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/21/2021 13:19:40</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/web.config"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> - <publishTime>05/25/2021 14:18:16</publishTime> + <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> - <publishTime>07/21/2021 21:02:11</publishTime> + <publishTime>07/21/2021 20:02:07</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> - <publishTime>07/21/2021 21:02:10</publishTime> + <publishTime>07/21/2021 20:02:07</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> - <publishTime>07/21/2021 21:02:11</publishTime> + <publishTime>07/21/2021 20:02:07</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> - <publishTime>07/21/2021 21:02:11</publishTime> + <publishTime>07/21/2021 20:02:07</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> - <publishTime>07/21/2021 21:02:11</publishTime> + <publishTime>07/21/2021 20:02:07</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> - <publishTime>07/21/2021 21:02:10</publishTime> + <publishTime>07/21/2021 20:02:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> - <publishTime>07/21/2021 21:02:11</publishTime> + <publishTime>07/21/2021 20:02:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> - <publishTime>07/21/2021 21:02:12</publishTime> + <publishTime>07/21/2021 20:02:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> - <publishTime>07/21/2021 21:02:12</publishTime> + <publishTime>07/21/2021 20:02:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> - <publishTime>07/21/2021 21:02:11</publishTime> + <publishTime>07/21/2021 20:02:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> - <publishTime>07/21/2021 21:02:12</publishTime> + <publishTime>07/21/2021 20:02:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> - <publishTime>07/21/2021 21:02:11</publishTime> + <publishTime>07/21/2021 20:02:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> - <publishTime>07/21/2021 21:02:11</publishTime> + <publishTime>07/21/2021 20:02:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> - <publishTime>07/21/2021 21:02:12</publishTime> + <publishTime>07/21/2021 20:02:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> - <publishTime>07/21/2021 21:02:12</publishTime> + <publishTime>07/21/2021 20:02:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> - <publishTime>07/21/2021 21:02:12</publishTime> + <publishTime>07/21/2021 20:02:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> - <publishTime>07/21/2021 21:02:11</publishTime> + <publishTime>07/21/2021 20:02:07</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> - <publishTime>07/21/2021 21:02:12</publishTime> + <publishTime>07/21/2021 20:02:07</publishTime> </File> <File Include="Web References/WebS/Reference.map"> - <publishTime>07/21/2021 21:02:08</publishTime> + <publishTime>07/16/2021 17:42:03</publishTime> </File> <File Include="Web.config"> - <publishTime>07/24/2021 00:11:47</publishTime> + <publishTime>07/23/2021 15:19:01</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/Service/LuBaoSevice.cs b/WebAPI/Service/LuBaoSevice.cs index 0a1eea8..a9a261b 100644 --- a/WebAPI/Service/LuBaoSevice.cs +++ b/WebAPI/Service/LuBaoSevice.cs @@ -277,5 +277,26 @@ return dataSet; } + + /// <summary> + /// 鐗╂枡璁剧疆鏍规嵁id鑾峰彇淇℃伅 + /// </summary> + public static ApiResult<DataSet> GetGy_MaterialBillDetail(string HID) + { + if (string.IsNullOrEmpty(HID)) + return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" }; + var dataSet = Gy_MaterialDb(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 Gy_MaterialDb(string HID) + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Edit_Gy_MaterialList where HItemID= " + HID + " ", "h_v_Edit_Gy_MaterialList"); + return dataSet; + } + } } \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 93e6fb5..68265bd 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -393,6 +393,7 @@ <Compile Include="Dapper\SqlPools.cs" /> <Compile Include="DbUntil\DataFormatUntil.cs" /> <Compile Include="DLL\ClsGy_BadReason_Ctl.cs" /> + <Compile Include="DLL\ClsGy_Material_Ctl.cs" /> <Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" /> <Compile Include="DLL\ClsQC_PatrolProcCheckBill.cs" /> <Compile Include="DLL\ClsSb_EquipConkBookBill.cs" /> @@ -421,6 +422,7 @@ <Compile Include="Models\ApiConfig.cs" /> <Compile Include="Models\ApiResult.cs" /> <Compile Include="Models\CheckItem.cs" /> + <Compile Include="Models\ClsGy_Material_Model.cs" /> <Compile Include="Models\ClsSb_EquipDotCheckBillMain.cs" /> <Compile Include="Models\ClsSb_EquipDotCheckBillSub.cs" /> <Compile Include="Models\ClsSb_EquipMaintainBillMain.cs" /> diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user index c934955..e7403e8 100644 --- a/WebAPI/WebAPI.csproj.user +++ b/WebAPI/WebAPI.csproj.user @@ -7,7 +7,7 @@ <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected> <WebStackScaffolding_LayoutPageFile /> <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> - <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> + <NameOfLastUsedPublishProfile>D:\椤圭洰\MESWMS-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>false</UseIISExpress> <Use64BitIISExpress /> -- Gitblit v1.9.1