From 30d8a77f99ab5b9b2296cedad7a3d9e3aef7da48 Mon Sep 17 00:00:00 2001
From: ouyangqing <ouyangqing@DESKTOP-B85SG1D>
Date: 星期三, 27 一月 2021 17:24:41 +0800
Subject: [PATCH] 工序相关功能
---
WebAPI/Models/M_ProcMul.cs | 14 ++
WebAPI/Service/YqnQbService.cs | 62 ++++++++-
WebAPI/Service/ProcessDal.cs | 48 +++++--
WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user | 166 +++++++++++++-------------
WebAPI/Models/M_Process.cs | 4
WebAPI/Web.config | 3
WebAPI/WebAPI.csproj | 2
WebAPI/Controllers/NewApiController.cs | 37 ++++++
WebAPI/Models/M_Department.cs | 14 ++
WebAPI/Models/M_StationBillMail.cs | 1
WebAPI/Properties/PublishProfiles/PDAWeb.pubxml | 2
11 files changed, 244 insertions(+), 109 deletions(-)
diff --git a/WebAPI/Controllers/NewApiController.cs b/WebAPI/Controllers/NewApiController.cs
index 333d6b7..6686d48 100644
--- a/WebAPI/Controllers/NewApiController.cs
+++ b/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);
}
}
}
diff --git a/WebAPI/Models/M_Department.cs b/WebAPI/Models/M_Department.cs
new file mode 100644
index 0000000..de0bc59
--- /dev/null
+++ b/WebAPI/Models/M_Department.cs
@@ -0,0 +1,14 @@
+锘縰sing 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; }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/M_ProcMul.cs b/WebAPI/Models/M_ProcMul.cs
new file mode 100644
index 0000000..11da9ad
--- /dev/null
+++ b/WebAPI/Models/M_ProcMul.cs
@@ -0,0 +1,14 @@
+锘縰sing 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; }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/M_Process.cs b/WebAPI/Models/M_Process.cs
index 11bae50..04da69a 100644
--- a/WebAPI/Models/M_Process.cs
+++ b/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; }
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/M_StationBillMail.cs b/WebAPI/Models/M_StationBillMail.cs
index eab8a75..4772f14 100644
--- a/WebAPI/Models/M_StationBillMail.cs
+++ b/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; }
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml b/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml
index 4a67376..fb0a584 100644
--- a/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml
+++ b/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>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user b/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user
index a163a84..0b92574 100644
--- a/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user
+++ b/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>
\ No newline at end of file
diff --git a/WebAPI/Service/ProcessDal.cs b/WebAPI/Service/ProcessDal.cs
index cfb4099..9d29638 100644
--- a/WebAPI/Service/ProcessDal.cs
+++ b/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;
}
}
diff --git a/WebAPI/Service/YqnQbService.cs b/WebAPI/Service/YqnQbService.cs
index 79b7383..b35aa2f 100644
--- a/WebAPI/Service/YqnQbService.cs
+++ b/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)
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 718499e..9febd30 100644
--- a/WebAPI/Web.config
+++ b/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>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 8221842..a95421d 100644
--- a/WebAPI/WebAPI.csproj
+++ b/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" />
--
Gitblit v1.9.1