From 2a31b5e797d098575d66adc62c4837e61e131a0a Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期四, 08 四月 2021 09:05:11 +0800 Subject: [PATCH] 新增模具控制器基础资料方法 --- WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 99 ++++++++++++++ WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 156 ++++++++++++++++++++++ WebAPI/Web.config | 4 WebAPI/Properties/PublishProfiles/API.pubxml.user | 136 ++++++++++--------- 4 files changed, 328 insertions(+), 67 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs index 48f6407..bf6b618 100644 --- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs @@ -67,6 +67,105 @@ } + /// <summary> + /// 杩斿洖妯″叿鍒楄〃 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Gy_Mould/list1")] + [HttpGet] + public object list1(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere, "h_v_Gy_MouldFileList"); + } + else + { + string sql1 = "select * from h_v_Gy_MouldFileList where 1 = 1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList"); + } + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "false锛�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + + + /// <summary> + /// 杩斿洖妫�鍏锋。妗堝垪琛� + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Gy_CheckToolsFileMainList/list2")] + [HttpGet] + public object list2(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_Gy_CheckToolsFileMainList " + sWhere, "h_v_Gy_CheckToolsFileMainList"); + } + else + { + string sql1 = "select * from h_v_Gy_CheckToolsFileMainList where 1 = 1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_Gy_CheckToolsFileMainList"); + } + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "false锛�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + // } diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs index e0e865e..8971041 100644 --- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs +++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs @@ -556,6 +556,162 @@ #endregion + #region sql璇彞 + + + //public static DataSet Sc_MouldRepairCheckBillList_s(string sWhere) + //{ + // return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList ", "h_v_Sc_MouldRepairCheckBillList"); + //} + #endregion + + /// <summary> + /// 妯″叿缁翠慨宸ュ崟琛ㄥ垪琛� + /// </summary> + /// <returns></returns> + [Route("Sb_MouldRepairWorkBill/GetMouldRepairWorkBillList")] + [HttpGet] + public object GetMouldRepairWorkBillList(string sWhere) + { + try + { + + ds = Sc_MouldRepairWorkBillList_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; + } + } + catch (Exception ex) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + #region sql璇彞 + + + public static DataSet Sc_MouldRepairWorkBillList_s(string sWhere) + { + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairWorkBillList ", "h_v_Sc_MouldRepairWorkBillList"); + } + #endregion + + + /// <summary> + /// 妫�鍏锋晠闅滅櫥璁拌〃鍒楄〃 + /// </summary> + /// <returns></returns> + [Route("Sc_CheckToolsConkBookBill/GetCheckToolsConkBookBillList")] + [HttpGet] + public object GetCheckToolsConkBookBillList(string sWhere) + { + try + { + + ds = Sc_CheckToolsConkBookBillList_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; + } + } + catch (Exception ex) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + #region sql璇彞 + + + public static DataSet Sc_CheckToolsConkBookBillList_s(string sWhere) + { + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsConkBookBillList ", "h_v_Sc_CheckToolsConkBookBillList"); + } + #endregion + + + /// <summary> + /// 妫�鍏风偣妫�璁板綍琛ㄥ垪琛� + /// </summary> + /// <returns></returns> + [Route("Sc_CheckToolsDotCheckBill/GetCheckToolsDotCheckBillList")] + [HttpGet] + public object GetCheckToolsDotCheckBillList(string sWhere) + { + try + { + + ds = Sc_CheckToolsDotCheckBillList_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; + } + } + catch (Exception ex) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + #region sql璇彞 + + + public static DataSet Sc_CheckToolsDotCheckBillList_s(string sWhere) + { + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsDotCheckBillList ", "h_v_Sc_CheckToolsDotCheckBillList"); + } + #endregion + + //娴嬭瘯涓撶敤鎺ュ彛 [Route("LookingFor/Test")] [HttpGet] diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user index f048383..2380bac 100644 --- a/WebAPI/Properties/PublishProfiles/API.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user @@ -10,7 +10,7 @@ </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> <publishTime>02/22/2013 08:43:40</publishTime> @@ -19,19 +19,25 @@ <publishTime>02/22/2013 08:43:40</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 14:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> + </File> + <File Include="bin/Kingdee.BOS.WebApi.FormService.dll"> + <publishTime>09/20/2018 19:23:20</publishTime> + </File> + <File Include="bin/Kingdee.BOS.WebApi.ServicesStub.dll"> + <publishTime>09/20/2018 19:28:34</publishTime> </File> <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll"> <publishTime>03/18/2015 17:02:50</publishTime> @@ -43,7 +49,7 @@ <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>08/03/2014 20:33:56</publishTime> @@ -52,13 +58,13 @@ <publishTime>01/04/2011 13:48:18</publishTime> </File> <File Include="bin/Pub_Class.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/15/2015 17:57:08</publishTime> @@ -124,7 +130,7 @@ <publishTime>11/28/2018 13:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> <publishTime>01/28/2015 04:02:18</publishTime> @@ -157,10 +163,10 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>03/26/2021 15:25:38</publishTime> + <publishTime>04/02/2021 14:59:29</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>03/26/2021 15:25:38</publishTime> + <publishTime>04/02/2021 14:59:29</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>02/04/2021 21:35:21</publishTime> @@ -178,163 +184,163 @@ <publishTime>03/26/2019 14:23:20</publishTime> </File> <File Include="Content/bootstrap.css"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="Content/bootstrap.min.css"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="Content/Site.css"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="DLL/BLL.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="DLL/DAL.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="DLL/DBUtility.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="DLL/Model.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="DLL/Pub_Class.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="DLL/Pub_Control.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="DLL/SQLHelper.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Global.asax"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="Index.html"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:06</publishTime> </File> <File Include="packages.config"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Views/web.config"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>03/29/2021 17:09:07</publishTime> </File> <File Include="Web.config"> - <publishTime>03/26/2021 15:25:58</publishTime> + <publishTime>04/02/2021 14:59:40</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/Web.config b/WebAPI/Web.config index fcdb48a..ca930f5 100644 --- a/WebAPI/Web.config +++ b/WebAPI/Web.config @@ -11,8 +11,8 @@ </configSections> <connectionStrings> - <!--<add name="YqnConn" connectionString="Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />--> - <add name="YqnConn" connectionString="Data Source=.;Initial Catalog=HX_LimsSys;Integrated Security=True" /> + <!--<add name="YqnConn" connectionString="Data Source=101.37.171.70;Initial Catalog=HX_LMESsys;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />--> + <add name="YqnConn" connectionString="Data Source=.;Initial Catalog=HX_LimsSys;Integrated Security=True" /> </connectionStrings> <appSettings> -- Gitblit v1.9.1