From 5e2bb4a7fbd4048f298da16d0ec64e9ad00670d1 Mon Sep 17 00:00:00 2001 From: zgq <519541279@qq.com> Date: 星期二, 19 一月 2021 22:17:46 +0800 Subject: [PATCH] nothing --- WebAPI/Models/StationOutBillView.cs | 44 ++++++++++++++++++++++ WebAPI/Service/YqnQbService.cs | 4 +- WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user | 26 ++++++++----- WebAPI/WebAPI.csproj | 1 WebAPI/Controllers/NewApiController.cs | 3 + 5 files changed, 65 insertions(+), 13 deletions(-) diff --git a/WebAPI/Controllers/NewApiController.cs b/WebAPI/Controllers/NewApiController.cs index 970c4f4..4bf5ce5 100644 --- a/WebAPI/Controllers/NewApiController.cs +++ b/WebAPI/Controllers/NewApiController.cs @@ -107,8 +107,9 @@ /// <returns></returns> [Route("api/newBill/setStationOutBill")] [HttpPost] - public ApiResult SetStationOutBill(Model.ClsSc_StationOutBillMain oMain) + public ApiResult SetStationOutBill(StationOutBillView oMain) { + return YqnQbService.SetStationOutBill(oMain); } } diff --git a/WebAPI/Models/StationOutBillView.cs b/WebAPI/Models/StationOutBillView.cs new file mode 100644 index 0000000..963cf48 --- /dev/null +++ b/WebAPI/Models/StationOutBillView.cs @@ -0,0 +1,44 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace WebAPI.Models +{ + public class StationOutBillView + { + public long HPrintQty { get; set; } + public double HPrice { get; set; } + public double HQty { get; set; } + public long HSupID { get; set; } + public DateTime HBarCodeMakeDate { get; set; } + public string HBarCodeMaker { get; set; } + public string HAddr { get; set; } + public string HBarCode { get; set; } + public string HReportType { get; set; } + public long HEmpID { get; set; } + public long HDeptID { get; set; } + public long HGroupID { get; set; } + public long HSourceID { get; set; } + public DateTime HStationOutTime { get; set; } + public double HPlanQty { get; set; } + public double HICMOQty { get; set; } + public long HProcID { get; set; } + public long HMaterID { get; set; } + public string HProcExchBillNo { get; set; } + public long HProcExchEntryID { get; set; } + public long HProcExchInterID { get; set; } + public string HProcPlanBillNo { get; set; } + public long HProcPlanEntryID { get; set; } + public long HProcPlanInterID { get; set; } + public string HICMOBillNo { get; set; } + public long HICMOInterID { get; set; } + public double HMoney { get; set; } + public int HYear { get; set; } + public int HPeriod { get; set; } + public long HInterID { get; set; } + public string HBillNo { get; set; } + public string HRemark { get; set; } + public int HBillStatus { get; set; } + } +} \ No newline at end of file diff --git a/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user b/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user index 91cb643..b6a3309 100644 --- a/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/PDAWeb.pubxml.user @@ -61,7 +61,7 @@ <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>08/03/2014 20:33:56</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>01/13/2021 21:47:30</publishTime> @@ -103,13 +103,16 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Net.Http.Formatting.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>11/28/2018 13:00:36</publishTime> </File> <File Include="bin/System.Runtime.Serialization.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.ApplicationServices.dll"> <publishTime>09/26/2012 03:16:08</publishTime> + </File> + <File Include="bin/System.Web.Cors.dll"> + <publishTime>11/28/2018 12:58:44</publishTime> </File> <File Include="bin/System.Web.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -126,8 +129,11 @@ <File Include="bin/System.Web.Helpers.dll"> <publishTime>01/28/2015 04:04:30</publishTime> </File> + <File Include="bin/System.Web.Http.Cors.dll"> + <publishTime>11/28/2018 13:01:26</publishTime> + </File> <File Include="bin/System.Web.Http.dll"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>11/28/2018 13:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> <publishTime>01/13/2021 21:47:30</publishTime> @@ -166,22 +172,22 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>01/19/2021 15:09:37</publishTime> + <publishTime>01/19/2021 20:14:17</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>01/19/2021 15:09:37</publishTime> + <publishTime>01/19/2021 20:14:17</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> - <publishTime>01/19/2021 15:09:40</publishTime> + <publishTime>01/19/2021 20:14:21</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/17/2013 17:03:52</publishTime> </File> <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll"> - <publishTime>03/26/2019 14:23:19</publishTime> + <publishTime>11/29/2018 13:26:02</publishTime> </File> <File Include="bin/zh-Hans/System.Web.Http.resources.dll"> - <publishTime>03/26/2019 14:23:19</publishTime> + <publishTime>11/29/2018 13:26:30</publishTime> </File> <File Include="bin/zh-Hans/System.Web.Http.WebHost.resources.dll"> <publishTime>03/26/2019 14:23:20</publishTime> @@ -244,7 +250,7 @@ <publishTime>01/13/2021 21:47:30</publishTime> </File> <File Include="packages.config"> - <publishTime>01/13/2021 21:47:30</publishTime> + <publishTime>01/19/2021 15:58:45</publishTime> </File> <File Include="Scripts/bootstrap.js"> <publishTime>03/16/2020 13:09:50</publishTime> @@ -376,7 +382,7 @@ <publishTime>11/16/2020 15:22:37</publishTime> </File> <File Include="Web.config"> - <publishTime>01/17/2021 21:15:55</publishTime> + <publishTime>01/19/2021 16:03:42</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/Service/YqnQbService.cs b/WebAPI/Service/YqnQbService.cs index 1d50ed2..61b1fc7 100644 --- a/WebAPI/Service/YqnQbService.cs +++ b/WebAPI/Service/YqnQbService.cs @@ -103,7 +103,7 @@ /// <summary> /// 鍑虹珯鎺ユ敹鍗� /// </summary> - public static ApiResult SetStationOutBill(Model.ClsSc_StationOutBillMain omodel) + public static ApiResult SetStationOutBill(StationOutBillView omodel) { WebS.WebService1 oWebs = new WebS.WebService1(); omodel.HYear = 2021; @@ -188,7 +188,7 @@ return dataSet; } private static ConcurrentDictionary<string,string> dicLock=new System.Collections.Concurrent.ConcurrentDictionary<string,string>();//骞跺彂閿� - public static ApiResult SetOutBill(Model.ClsSc_StationOutBillMain omodel) + public static ApiResult SetOutBill(StationOutBillView omodel) { try { diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 347967d..1dba599 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -316,6 +316,7 @@ <Compile Include="Models\ApiConfig.cs" /> <Compile Include="Models\ApiResult.cs" /> <Compile Include="Models\DocumentsView.cs" /> + <Compile Include="Models\StationOutBillView.cs" /> <Compile Include="Properties\Resources.Designer.cs"> <AutoGen>True</AutoGen> <DesignTime>True</DesignTime> -- Gitblit v1.9.1