From b746b8a650136392cc234212678097f50086e868 Mon Sep 17 00:00:00 2001 From: WYB <908761037@qq.com> Date: 星期一, 26 四月 2021 21:17:02 +0800 Subject: [PATCH] 1.工序汇报单基础打印完成模板待调试设计 2.增加委外工序派工单列表 3.增加委外工序计划转出单列表 4.增加委外工序汇单列表 --- WebAPI/Controllers/BLL/Xt_SystemLogController.cs | 73 ++++++++++++++ WebAPI/Properties/PublishProfiles/API.pubxml.user | 150 +++++++++++++++--------------- WebAPI/Controllers/BaseSet/Gy_PropertyController.cs | 73 ++++++++++++++ WebAPI/WebAPI.csproj | 2 4 files changed, 223 insertions(+), 75 deletions(-) diff --git a/WebAPI/Controllers/BLL/Xt_SystemLogController.cs b/WebAPI/Controllers/BLL/Xt_SystemLogController.cs new file mode 100644 index 0000000..830b6e8 --- /dev/null +++ b/WebAPI/Controllers/BLL/Xt_SystemLogController.cs @@ -0,0 +1,73 @@ +锘縰sing Newtonsoft.Json.Linq; +using Pub_Class; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Web.Http; +using WebAPI.Models; +namespace WebAPI.Controllers +{ + public class Xt_SystemLogController : ApiController + { + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + + private json objJsonResult = new json(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + + + /// <summary> + /// 杩斿洖绯荤粺鏃ュ織淇℃伅鍒楄〃 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Xt_SystemLog/list")] + [HttpGet] + public object list(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_Xt_SystemLogList " + sWhere + " order by 鏃ユ湡 desc", "h_v_Xt_SystemLogList"); + } + else + { + string sql1 = "select * from h_v_Xt_SystemLogList where 1 = 1 "; + string sql = sql1 + sWhere + " order by 鏃ユ湡 desc"; + ds = oCN.RunProcReturn(sql, "h_v_Xt_SystemLogList"); + } + 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 = "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; + } + } + + + + // + } +} \ No newline at end of file diff --git a/WebAPI/Controllers/BaseSet/Gy_PropertyController.cs b/WebAPI/Controllers/BaseSet/Gy_PropertyController.cs new file mode 100644 index 0000000..c1b6c78 --- /dev/null +++ b/WebAPI/Controllers/BaseSet/Gy_PropertyController.cs @@ -0,0 +1,73 @@ +锘縰sing Newtonsoft.Json.Linq; +using Pub_Class; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Web.Http; +using WebAPI.Models; +namespace WebAPI.Controllers +{ + public class Gy_PropertyController : ApiController + { + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + + private json objJsonResult = new json(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + + + /// <summary> + /// 杩斿洖杈呭姪灞炴�у垪琛� + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Gy_Property/list")] + [HttpGet] + public object list(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_IF_PropertyList " + sWhere, "h_v_IF_PropertyList"); + } + else + { + string sql1 = "select * from h_v_IF_PropertyList where 1 = 1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_IF_PropertyList"); + } + 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 = "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; + } + } + + + + // + } +} \ No newline at end of file diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user index d75f822..8e7e4cf 100644 --- a/WebAPI/Properties/PublishProfiles/API.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user @@ -7,38 +7,38 @@ <PropertyGroup> <TimeStampOfAssociatedLegacyPublishXmlFile /> <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl> - <History>True|2021-04-16T00:50:41.5499248Z;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-04-26T08:18:32.0260755Z;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>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> - <publishTime>02/22/2013 08:43:40</publishTime> + <publishTime>04/13/2021 13:28:28</publishTime> </File> <File Include="bin/Antlr3.Runtime.pdb"> - <publishTime>02/22/2013 08:43:40</publishTime> + <publishTime>04/13/2021 13:28:28</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/Dapper.dll"> - <publishTime>07/22/2016 14:52:40</publishTime> + <publishTime>04/13/2021 13:30:11</publishTime> </File> <File Include="bin/DBUtility.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.FormService.dll"> - <publishTime>09/20/2018 19:23:20</publishTime> + <publishTime>04/26/2020 09:57:16</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.ServicesStub.dll"> - <publishTime>09/20/2018 19:28:34</publishTime> + <publishTime>04/26/2020 09:57:16</publishTime> </File> <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll"> <publishTime>03/18/2015 17:02:50</publishTime> @@ -50,7 +50,7 @@ <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>08/03/2014 20:33:56</publishTime> @@ -59,13 +59,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>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/15/2015 17:57:08</publishTime> @@ -107,7 +107,7 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Cors.dll"> - <publishTime>11/28/2018 12:58:44</publishTime> + <publishTime>04/13/2021 13:30:39</publishTime> </File> <File Include="bin/System.Web.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -131,16 +131,16 @@ <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>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> - <publishTime>01/28/2015 04:02:18</publishTime> + <publishTime>04/13/2021 13:31:08</publishTime> </File> <File Include="bin/System.Web.Optimization.dll"> - <publishTime>02/11/2014 15:26:04</publishTime> + <publishTime>04/13/2021 13:31:24</publishTime> </File> <File Include="bin/System.Web.Razor.dll"> - <publishTime>01/28/2015 04:02:32</publishTime> + <publishTime>04/13/2021 13:31:12</publishTime> </File> <File Include="bin/System.Web.Services.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -164,10 +164,10 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>04/26/2021 18:23:05</publishTime> + <publishTime>04/22/2021 20:00:19</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>04/26/2021 18:23:05</publishTime> + <publishTime>04/22/2021 20:00:19</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>02/04/2021 21:35:21</publishTime> @@ -185,163 +185,163 @@ <publishTime>03/26/2019 14:23:20</publishTime> </File> <File Include="Content/bootstrap.css"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="Content/bootstrap.min.css"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="Content/Site.css"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="DLL/BLL.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="DLL/DAL.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="DLL/DBUtility.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="DLL/Model.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="DLL/Pub_Class.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="DLL/Pub_Control.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="DLL/SQLHelper.dll"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="Global.asax"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="Index.html"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="packages.config"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 13:27:57</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/web.config"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> - <publishTime>03/26/2021 14:35:48</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web.config"> - <publishTime>04/26/2021 18:23:12</publishTime> + <publishTime>04/22/2021 20:00:25</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 7e75c52..387a1ec 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -324,7 +324,9 @@ <Compile Include="Controllers\BaseSet\Gy_ProcessController.cs" /> <Compile Include="Controllers\BaseSet\Gy_SourceController.cs" /> <Compile Include="Controllers\BaseSet\Gy_SupplierController.cs" /> + <Compile Include="Controllers\BaseSet\Gy_PropertyController.cs" /> <Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" /> + <Compile Include="Controllers\BLL\Xt_SystemLogController.cs" /> <Compile Include="Controllers\CGGL\Cg_POOrderBillController.cs" /> <Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" /> <Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" /> -- Gitblit v1.9.1