WebAPI/Controllers/NewApiController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Models/M_Department.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Models/M_ProcMul.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Models/M_Process.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Models/M_StationBillMail.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Properties/PublishProfiles/PDAWeb.pubxml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Service/ProcessDal.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Service/YqnQbService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Web.config | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/WebAPI.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebAPI/Controllers/NewApiController.cs
@@ -131,7 +131,42 @@ public static ApiResult<DataSet> GetPorcessSubList(int hInterId) { return YqnQbService.GetPorcessSubList(hInterId); } /// <summary> /// 获取工序列表 /// </summary> /// <param name="hName"></param> /// <param name="hLevel"></param> /// <param name="hNumber"></param> /// <param name="hBillSubType"></param> /// <returns></returns> [Route("api/newBill/getProcessList")] [HttpGet] public ApiResult<List<Models.M_Process>> GetProcessList(string hName,string hNumber, string hBillSubType,int page,int limit,int hLevel=0) { return YqnQbService.GetProcessList(hName, hLevel, hNumber, hBillSubType , page, limit); } /// <summary> /// 获取单个工序详情 /// </summary> /// <param name="hItemId"></param> /// <returns></returns> [Route("api/newBill/getProcessDetail")] [HttpGet] public ApiResult<Models.M_Process> GetProcessDetail(int hItemId) { return YqnQbService.GetProcessDetail(hItemId); } /// <summary> /// 删除某个工序 /// </summary> /// <param name="hItemId"></param> /// <returns></returns> [Route("api/newBill/deleteProcess")] [HttpGet] public ApiResult DeleteProcess(int hItemId) { return YqnQbService.DeleteProcess(hItemId); } } } WebAPI/Models/M_Department.cs
New file @@ -0,0 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; using System.Web; namespace WebAPI.Models { public class M_Department { public string HName { get; set; } public string HNumber { get; set; } public int HItemID { get; set; } } } WebAPI/Models/M_ProcMul.cs
New file @@ -0,0 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; using System.Web; namespace WebAPI.Models { public class M_ProcMul { public int HItemID { get; set; } public string HNumber { get; set; } public string HName { get; set; } } } WebAPI/Models/M_Process.cs
@@ -68,5 +68,9 @@ /// 备注 /// </summary> public string HRemark { get; set; } public int HDeptID { get; set; } public int HProcMulID { get; set; } public M_Department DepartmentModel { get; set; } public M_ProcMul ProcMulModel { get; set; } } } WebAPI/Models/M_StationBillMail.cs
@@ -14,5 +14,6 @@ public string HICMOBillNo { get; set; } public int HEmpID { get; set; } public int HProcID { get; set; } public M_Department GetDepartment { get; set; } } } WebAPI/Properties/PublishProfiles/PDAWeb.pubxml
@@ -11,7 +11,7 @@ <SiteUrlToLaunchAfterPublish /> <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish> <ExcludeApp_Data>False</ExcludeApp_Data> <publishUrl>F:\网站发布\绍兴雅琪诺\WebAPI</publishUrl> <publishUrl>D:\备份\fabu</publishUrl> <DeleteExistingFiles>True</DeleteExistingFiles> </PropertyGroup> </Project> WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user
@@ -6,32 +6,32 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <TimeStampOfAssociatedLegacyPublishXmlFile /> <_PublishTargetUrl>F:\网站发布\绍兴雅琪诺\WebAPI</_PublishTargetUrl> <_PublishTargetUrl>D:\备份\fabu</_PublishTargetUrl> </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> <publishTime>01/24/2021 15:32:23</publishTime> <publishTime>12/12/2019 22:48:32</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> <publishTime>02/22/2013 08:43:40</publishTime> <publishTime>03/16/2020 13:10:04</publishTime> </File> <File Include="bin/Antlr3.Runtime.pdb"> <publishTime>02/22/2013 08:43:40</publishTime> <publishTime>03/16/2020 13:10:04</publishTime> </File> <File Include="bin/AxInterop.gregn6Lib.dll"> <publishTime>11/11/2020 11:01:12</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>12/23/2020 23:22:37</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>08/18/2020 13:09:08</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 14:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>07/15/2019 16:38:47</publishTime> </File> <File Include="bin/Interop.Excel.dll"> <publishTime>12/03/2012 22:08:24</publishTime> @@ -43,7 +43,7 @@ <publishTime>07/11/2013 21:48:44</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>09/20/2018 19:08:18</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.FormService.dll"> <publishTime>09/20/2018 19:23:20</publishTime> @@ -52,31 +52,31 @@ <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> <publishTime>12/12/2019 22:48:26</publishTime> </File> <File Include="bin/Microsoft.CSharp.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/Microsoft.Web.Infrastructure.dll"> <publishTime>07/25/2012 11:48:56</publishTime> <publishTime>12/12/2019 22:48:28</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>01/13/2021 18:41:32</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>08/03/2014 20:33:56</publishTime> <publishTime>12/12/2019 22:01:06</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>05/21/2020 10:51:50</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>07/15/2019 16:38:45</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>07/15/2019 16:38:46</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/15/2015 17:57:08</publishTime> <publishTime>12/12/2019 22:48:28</publishTime> </File> <File Include="bin/System.ComponentModel.DataAnnotations.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -100,7 +100,7 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.IdentityModel.Tokens.Jwt.dll"> <publishTime>08/19/2014 10:03:34</publishTime> <publishTime>12/12/2019 22:48:26</publishTime> </File> <File Include="bin/System.Net.Http.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -130,7 +130,7 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Helpers.dll"> <publishTime>01/28/2015 04:04:30</publishTime> <publishTime>03/16/2020 13:10:00</publishTime> </File> <File Include="bin/System.Web.Http.Cors.dll"> <publishTime>11/28/2018 13:01:26</publishTime> @@ -139,28 +139,28 @@ <publishTime>11/28/2018 13:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>03/26/2019 14:23:20</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> <publishTime>01/28/2015 04:02:18</publishTime> <publishTime>03/16/2020 13:10:02</publishTime> </File> <File Include="bin/System.Web.Optimization.dll"> <publishTime>02/11/2014 15:26:04</publishTime> <publishTime>03/16/2020 13:09:58</publishTime> </File> <File Include="bin/System.Web.Razor.dll"> <publishTime>01/28/2015 04:02:32</publishTime> <publishTime>03/16/2020 13:09:58</publishTime> </File> <File Include="bin/System.Web.Services.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.WebPages.Deployment.dll"> <publishTime>01/28/2015 04:04:30</publishTime> <publishTime>03/16/2020 13:10:00</publishTime> </File> <File Include="bin/System.Web.WebPages.dll"> <publishTime>01/28/2015 04:04:30</publishTime> <publishTime>03/16/2020 13:10:00</publishTime> </File> <File Include="bin/System.Web.WebPages.Razor.dll"> <publishTime>01/28/2015 04:04:30</publishTime> <publishTime>03/16/2020 13:10:00</publishTime> </File> <File Include="bin/System.Xml.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -172,19 +172,19 @@ <publishTime>05/24/2007 17:47:50</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 11:18:48</publishTime> <publishTime>12/12/2019 22:48:28</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>01/24/2021 19:02:36</publishTime> <publishTime>01/26/2021 22:01:53</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>01/24/2021 19:02:36</publishTime> <publishTime>01/26/2021 22:01:53</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>01/24/2021 19:02:39</publishTime> <publishTime>01/26/2021 22:01:55</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/17/2013 17:03:52</publishTime> <publishTime>03/16/2020 13:10:04</publishTime> </File> <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll"> <publishTime>11/29/2018 13:26:02</publishTime> @@ -196,64 +196,64 @@ <publishTime>03/26/2019 14:23:20</publishTime> </File> <File Include="Content/bootstrap.css"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>03/16/2020 13:09:50</publishTime> </File> <File Include="Content/bootstrap.min.css"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>03/16/2020 13:09:50</publishTime> </File> <File Include="Content/Site.css"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>03/16/2020 13:09:48</publishTime> </File> <File Include="DLL/BLL.dll"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>12/23/2020 23:22:37</publishTime> </File> <File Include="DLL/DAL.dll"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>08/18/2020 13:09:08</publishTime> </File> <File Include="DLL/DBUtility.dll"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>07/15/2019 16:38:47</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>09/20/2018 19:08:18</publishTime> </File> <File Include="DLL/Model.dll"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>01/13/2021 18:41:32</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>12/27/2019 13:55:48</publishTime> </File> <File Include="DLL/Pub_Class.dll"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>05/21/2020 10:51:50</publishTime> </File> <File Include="DLL/Pub_Control.dll"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>07/15/2019 16:38:45</publishTime> </File> <File Include="DLL/SQLHelper.dll"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>07/15/2019 16:38:46</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> <publishTime>01/24/2021 15:32:23</publishTime> <publishTime>03/16/2020 13:09:50</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> <publishTime>01/24/2021 15:32:23</publishTime> <publishTime>03/16/2020 13:09:50</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> <publishTime>01/24/2021 15:32:23</publishTime> <publishTime>03/16/2020 13:09:50</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> <publishTime>01/24/2021 15:32:23</publishTime> <publishTime>03/16/2020 13:09:50</publishTime> </File> <File Include="Global.asax"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>12/12/2019 22:01:04</publishTime> </File> <File Include="Index.html"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>12/24/2020 11:27:24</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>12/12/2019 22:48:32</publishTime> </File> <File Include="packages.config"> <publishTime>01/24/2021 15:32:23</publishTime> <publishTime>01/21/2021 10:16:57</publishTime> </File> <File Include="Scripts/bootstrap.js"> <publishTime>03/16/2020 13:09:50</publishTime> @@ -286,106 +286,106 @@ <publishTime>03/16/2020 13:10:04</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>03/16/2020 13:09:50</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>03/16/2020 13:09:50</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>03/16/2020 13:09:52</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>03/16/2020 13:09:52</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>03/16/2020 13:09:52</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>03/16/2020 13:09:58</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>03/16/2020 13:09:58</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>03/16/2020 13:09:58</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>03/16/2020 13:09:58</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>03/16/2020 13:10:04</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>03/16/2020 13:09:44</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>03/16/2020 13:09:48</publishTime> </File> <File Include="Views/web.config"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>03/16/2020 13:09:48</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> <publishTime>01/24/2021 15:32:22</publishTime> <publishTime>03/16/2020 13:09:48</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> <publishTime>01/24/2021 19:02:14</publishTime> <publishTime>01/26/2021 11:24:27</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> <publishTime>01/24/2021 19:02:14</publishTime> <publishTime>01/26/2021 11:24:27</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> <publishTime>01/24/2021 19:02:14</publishTime> <publishTime>01/26/2021 11:24:27</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> <publishTime>01/24/2021 19:02:14</publishTime> <publishTime>01/26/2021 11:24:27</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> <publishTime>01/24/2021 19:02:14</publishTime> <publishTime>01/26/2021 11:24:27</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> <publishTime>01/24/2021 19:02:14</publishTime> <publishTime>01/26/2021 11:24:27</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> <publishTime>01/24/2021 19:02:14</publishTime> <publishTime>01/26/2021 11:24:27</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> <publishTime>01/24/2021 19:02:14</publishTime> <publishTime>01/26/2021 11:24:27</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> <publishTime>01/24/2021 19:02:14</publishTime> <publishTime>01/26/2021 11:24:27</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> <publishTime>01/24/2021 19:02:14</publishTime> <publishTime>01/26/2021 11:24:27</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> <publishTime>01/24/2021 19:02:14</publishTime> <publishTime>01/26/2021 11:24:27</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> <publishTime>01/24/2021 19:02:14</publishTime> <publishTime>01/26/2021 11:24:27</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> <publishTime>01/24/2021 19:02:14</publishTime> <publishTime>01/26/2021 11:24:27</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> <publishTime>01/24/2021 19:02:14</publishTime> <publishTime>01/26/2021 11:24:27</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> <publishTime>01/24/2021 19:02:14</publishTime> <publishTime>01/26/2021 11:24:27</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> <publishTime>01/24/2021 19:02:14</publishTime> <publishTime>01/26/2021 11:24:27</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> <publishTime>01/24/2021 19:02:14</publishTime> <publishTime>01/26/2021 11:24:27</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> <publishTime>01/24/2021 19:02:14</publishTime> <publishTime>01/26/2021 11:24:27</publishTime> </File> <File Include="Web References/WebS/Reference.map"> <publishTime>11/16/2020 15:22:37</publishTime> </File> <File Include="Web.config"> <publishTime>01/24/2021 16:52:40</publishTime> <publishTime>01/26/2021 22:01:56</publishTime> </File> </ItemGroup> </Project> WebAPI/Service/ProcessDal.cs
@@ -9,28 +9,50 @@ { public class ProcessDal { public static List<Models.M_StationBillMail> GetProcessList(string hName,int hLevel,string hNumber,string hBillSubType) public static List<Models.M_Process> GetProcessList(string hName, int hLevel, string hNumber, string hBillSubType, int page, int limit,ref int pageCount) { var sqlBuilder = new StringBuilder(); sqlBuilder.Append("select a.HItemID,a.HNumber,a.HName ,a.HLevel,a.HTypeFlow ,a.HTypeCount ,a.HBillSubType "); sqlBuilder.Append(",a.HEndFlag,a.HStopFlag,b.hname,a.HSNo,a.HProcessID_K3,a.HFixPrice,a.HOverFixPrice "); sqlBuilder.Append(",a.HEndFlag,a.HStopFlag,b.hname,a.HSNo,a.HProcessID_K3,a.HFixPrice,a.HOverFixPrice "); sqlBuilder.Append(",a.HAutoTrunFlag,a.HRemark ,a.HProcessID_K3 from gy_Process a left join h_v_IF_Department b on a.HDeptID=b.hitemid where 1=1 "); var whereBuilder = new StringBuilder(); if (!string.IsNullOrEmpty(hName)) sqlBuilder.Append(" and a.HName like '%@hName%'"); whereBuilder.Append($" and a.HName like '%{hName}%'"); if(!string.IsNullOrEmpty(hNumber)) sqlBuilder.Append(" and a.HNumbe like '%@hNumber%'"); whereBuilder.Append($" and a.HNumber like '%{hNumber}%'"); if (!string.IsNullOrEmpty(hBillSubType)) sqlBuilder.Append(" and a.HBillSubType like '%@hBillSubType%'"); whereBuilder.Append($" and a.HBillSubType like '%{hBillSubType}%'"); if(hLevel!=0) sqlBuilder.Append(" and a.HLevel=@hLevel"); var list = SqlPools.GetInstance("YqnConn").GetModelList<Models.M_StationBillMail>(sqlBuilder.ToString(), new { hName, hLevel, hNumber, hBillSubType }); whereBuilder.Append($" and a.HLevel={hLevel}"); var sqlBuilder = new StringBuilder(); sqlBuilder.Append($"select top {limit} a.HItemID,a.HNumber,a.HName ,a.HLevel,a.HTypeFlow ,a.HTypeCount ,a.HBillSubType "); sqlBuilder.Append(",a.HEndFlag,a.HStopFlag,b.hname,a.HSNo,a.HProcessID_K3,a.HFixPrice,a.HOverFixPrice "); sqlBuilder.Append(",a.HEndFlag,a.HStopFlag,b.hname,a.HSNo,a.HProcessID_K3,a.HFixPrice,a.HOverFixPrice "); sqlBuilder.Append($",a.HAutoTrunFlag,a.HRemark ,a.HProcessID_K3 from gy_Process a left join h_v_IF_Department b on a.HDeptID=b.hitemid where a.HItemID not in (select top {(page-1)*limit} a.HItemID from gy_Process a left join h_v_IF_Department b on a.HDeptID=b.hitemid where 1=1 { whereBuilder }) {whereBuilder}"); var countSql = $"select count(*) from gy_Process a where 1=1 {whereBuilder}"; pageCount = SqlPools.GetInstance("YqnConn").GetExecuteScalar(countSql); var list = SqlPools.GetInstance("YqnConn").GetModelList<Models.M_Process>(sqlBuilder.ToString()); return list; } public static Models.M_StationBillMail GetProcessDetail(int hItemID) public static Models.M_Process GetProcessDetail(int hItemID) { var sql = "select HNumber,HHelpCode,HName,HNumber,HDeptID,HProcMulID,HRemark,HSNo,HFixPrice,HOverFixPrice,HBillSubType,HStopflag, HTypeFlow, HTypeCount, HAutoTrunFlag, HItemID from Gy_Process where HItemID=@hItemID"; var model = SqlPools.GetInstance("YqnConn").GetModel<Models.M_StationBillMail>(sql, new { hItemID }); var model = SqlPools.GetInstance("YqnConn").GetModel<Models.M_Process>(sql, new { hItemID }); return model; } public static int DeleteProcess(int hItemID) { var sql = "delete Gy_Process where HItemID=@hItemID"; var result = SqlPools.GetInstance("YqnConn").ExecuteCommand(sql, new { hItemID }); return result; } public static Models.M_Department GetDepartmentModel(int hItemID) { var sql = "select HName,HNumber,HItemID from h_v_IF_Department where HItemID=@hItemID"; var model = SqlPools.GetInstance("YqnConn").GetModel<Models.M_Department>(sql, new { hItemID }); return model; } public static Models.M_ProcMul GetProcMulModel(int hItemID) { var sql = "Select HItemID,HNumber,HName from Gy_ProcMul where HItemID=@hItemID"; var model = SqlPools.GetInstance("YqnConn").GetModel<Models.M_ProcMul>(sql, new { hItemID }); return model; } } WebAPI/Service/YqnQbService.cs
@@ -19,9 +19,9 @@ /// </summary> /// <returns></returns> public static ApiResult<DocumentsView> GetInterBillNo(string billType) { var hInterId= DBUtility.ClsPub.CreateBillID(billType, ref DBUtility.ClsPub.sExeReturnInfo); var hBillNo= DBUtility.ClsPub.CreateBillCode(billType, ref DBUtility.ClsPub.sExeReturnInfo, true); { var hInterId = DBUtility.ClsPub.CreateBillID(billType, ref DBUtility.ClsPub.sExeReturnInfo); var hBillNo = DBUtility.ClsPub.CreateBillCode(billType, ref DBUtility.ClsPub.sExeReturnInfo, true); if (hInterId == 0 || string.IsNullOrEmpty(hBillNo)) return new ApiResult<DocumentsView> { code = -1, msg = "获取失败" }; DocumentsView documentsView = new DocumentsView() @@ -42,14 +42,14 @@ var dataSet = GetBarCodeDb(sBillBarCode); 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 }; return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet }; } /// <summary> /// 流转卡回车方法 /// </summary> public static ApiResult<DataSet> GetProcDetail(string sBillNo, string sProcNo) { if (string.IsNullOrEmpty(sBillNo)||string.IsNullOrEmpty(sProcNo)) if (string.IsNullOrEmpty(sBillNo) || string.IsNullOrEmpty(sProcNo)) return new ApiResult<DataSet> { code = -1, msg = "条码和流转卡不能为空" }; var dataSet = GetProcDb(sBillNo, sProcNo); if (dataSet == null || dataSet.Tables[0].Rows.Count == 0) @@ -96,7 +96,7 @@ return new ApiResult { code = -1, msg = "服务器繁忙" }; try { if (oMain.HProcID == 0 || oMain.HQty == 0 ||string.IsNullOrEmpty(oMain.HProcExchBillNo)||oMain.HQty==0||string.IsNullOrEmpty(oMain.HBillNo)) if (oMain.HProcID == 0 || oMain.HQty == 0 || string.IsNullOrEmpty(oMain.HProcExchBillNo) || oMain.HQty == 0 || string.IsNullOrEmpty(oMain.HBillNo)) return new ApiResult { code = 1, msg = "参数不全" }; var stationInList = YqnDal.GetStationInBillMailList(oMain.HICMOBillNo);//获得该流转卡所有进站单 if (stationInList.Count > 0) @@ -126,7 +126,7 @@ } catch (Exception ex) { return new ApiResult { code = -1, msg = "请求错误"+ex.ToString() }; return new ApiResult { code = -1, msg = "请求错误" + ex.ToString() }; } finally { @@ -210,6 +210,48 @@ } } /// <summary> /// 获取工序详情 /// </summary> /// <param name="hItemId"></param> /// <returns></returns> public static ApiResult<Models.M_Process> GetProcessDetail(int hItemId) { var processModel = ProcessDal.GetProcessDetail(hItemId); if (processModel == null) return new ApiResult<M_Process> { code = -1, msg = "查询为空" }; processModel.DepartmentModel = ProcessDal.GetDepartmentModel(processModel.HDeptID); processModel.ProcMulModel = ProcessDal.GetProcMulModel(processModel.HProcMulID); return new ApiResult<M_Process> { code = 1, msg = "查询成功", data = processModel }; } /// <summary> /// 获取工序列表 /// </summary> /// <param name="hName"></param> /// <param name="hLevel"></param> /// <param name="hNumber"></param> /// <param name="hBillSubType"></param> /// <returns></returns> public static ApiResult<List<Models.M_Process>> GetProcessList(string hName, int hLevel, string hNumber, string hBillSubType, int page, int limit) { int pageCount = 0; var list = ProcessDal.GetProcessList(hName, hLevel, hNumber, hBillSubType, page, limit, ref pageCount); if (list?.Count == 0) return new ApiResult<List<M_Process>> { code = -1, msg = "查询为空" }; return new ApiResult<List<M_Process>> { code = 0, msg = "查询成功", data = list, count = pageCount }; } /// <summary> /// 删除一条工序 /// </summary> /// <param name="hItemID"></param> /// <returns></returns> public static ApiResult DeleteProcess(int hItemID) { var result = ProcessDal.DeleteProcess(hItemID); if (result > 0) return new ApiResult { code = 1, msg = "删除成功" }; return new ApiResult { code = -1, msg = "删除数据不存在" }; } #region sql语句 public static DataSet GetStationOutBill(string strWhere) { @@ -282,7 +324,7 @@ { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); omodel.HInterID = DBUtility.ClsPub.CreateBillID("3791", ref DBUtility.ClsPub.sExeReturnInfo); //oCN.BeginTran(); oCN.BeginTran(); var sql = "Insert Into Sc_StationOutBillMain " + "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" + ",HYear,HPeriod,HRemark" + @@ -296,7 +338,7 @@ "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HProcPlanInterID.ToString() + "," + omodel.HProcPlanEntryID.ToString() + ",'" + omodel.HProcPlanBillNo + "'," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() + ",'" + omodel.HProcExchBillNo + "'," + omodel.HMaterID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HICMOQty.ToString() + "," + omodel.HPlanQty.ToString() + ",getdate()," + omodel.HSourceID.ToString() + "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate()" + "," + omodel.HSupID.ToString() + "," + omodel.HQty.ToString() + "," + omodel.HPrice.ToString() + "," + omodel.HMoney.ToString() +"," + omodel.HProcNo + ") "; "," + omodel.HSupID.ToString() + "," + omodel.HQty.ToString() + "," + omodel.HPrice.ToString() + "," + omodel.HMoney.ToString() + "," + omodel.HProcNo + ") "; //var result= SqlPools.GetInstance("YqnConn").ExecuteCommand(sql); oCN.RunProc(sql); oCN.Commit(); @@ -304,7 +346,7 @@ } catch (Exception ex) { return new ApiResult { code = -1, msg = "保存错误/"+ex.ToString() }; return new ApiResult { code = -1, msg = "保存错误/" + ex.ToString() }; } } public static ApiResult SetInBill(ClsSc_StationInBillMain omodel) WebAPI/Web.config
@@ -11,7 +11,8 @@ </configSections> <connectionStrings> <add name="YqnConn" connectionString="Data Source=192.168.0.175;Initial Catalog=HX_LimsSys_Test;UserId=HX_USER,Password=lc@841022;Integrated Security=True" /> <!--<add name="YqnConn" connectionString="Data Source=192.168.0.175;Initial Catalog=HX_LimsSys_Test;User Id=HX_USER,Password=lc@841022;Integrated Security=True" />--> <add name="YqnConn" connectionString="Data Source=.;Initial Catalog=HX_LimsSys_Test;Integrated Security=True" /> </connectionStrings> <appSettings> WebAPI/WebAPI.csproj
@@ -322,6 +322,8 @@ <Compile Include="Models\ApiConfig.cs" /> <Compile Include="Models\ApiResult.cs" /> <Compile Include="Models\DocumentsView.cs" /> <Compile Include="Models\M_Department.cs" /> <Compile Include="Models\M_ProcMul.cs" /> <Compile Include="Models\M_StationBillMail.cs" /> <Compile Include="Models\M_Process.cs" /> <Compile Include="Models\StationOutBillView.cs" />