From cd1c62ccfd8cf9c582686b6aec02d394a9f4528e Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期日, 29 六月 2025 19:00:15 +0800
Subject: [PATCH] 保存送货单方法外取消事务；生成送货单前校验完善实物回滚；验证采购订单方法添加防死锁；采购订单列表分页查询；物料标准包装模块；
---
WebAPI/WebAPI.csproj | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 02aa62a..99907d7 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -43,13 +43,19 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <Reference Include="DAL, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
+ <HintPath>..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
+ </Reference>
+ <Reference Include="DAL, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\SRM-MES\SRM-MES\DAL\bin\Debug\DAL.dll</HintPath>
+ <HintPath>..\..\..\SRM-MES\SRM-MES\DAL\bin\Debug\DAL.dll</HintPath>
</Reference>
<Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\SRM-MES\SRM-MES\DAL\bin\Debug\DBUtility.dll</HintPath>
+ </Reference>
+ <Reference Include="ICSharpCode.SharpZipLib, Version=1.3.3.11, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+ <HintPath>..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="Kingdee.BOS.WebApi.Client, Version=7.2.904.6, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -80,8 +86,8 @@
<Reference Include="Microsoft.Owin.Cors, Version=4.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.Cors.4.2.0\lib\net45\Microsoft.Owin.Cors.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.2.1.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
+ <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.4.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin.Security, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.Security.2.1.0\lib\net45\Microsoft.Owin.Security.dll</HintPath>
@@ -94,9 +100,21 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\SRM-MES\SRM-MES\DAL\bin\Debug\Model.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <Reference Include="Newtonsoft.Json, Version=13.0.1.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\WeChat Files\shenjie1112005\FileStorage\File\2019-12\webapi鎺ュ彛\FurjaFlatFormAPI\packages\Newtonsoft.Json.5.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\Newtonsoft鏂囦欢\Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ <Reference Include="NPOI, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+ <HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.dll</HintPath>
+ </Reference>
+ <Reference Include="NPOI.OOXML, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+ <HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.OOXML.dll</HintPath>
+ </Reference>
+ <Reference Include="NPOI.OpenXml4Net, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+ <HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.OpenXml4Net.dll</HintPath>
+ </Reference>
+ <Reference Include="NPOI.OpenXmlFormats, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+ <HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
</Reference>
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
@@ -136,7 +154,9 @@
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.ComponentModel.DataAnnotations" />
- <Reference Include="System" />
+ <Reference Include="System">
+ <Private>True</Private>
+ </Reference>
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
@@ -175,6 +195,7 @@
<Content Include="HtmlPage.html" />
<Content Include="HtmlPage1.html" />
<Content Include="Index.html" />
+ <Content Include="Config\kdapi.config" />
<None Include="Scripts\jquery-1.6.4-vsdoc.js" />
<Content Include="Scripts\jquery-1.6.4.js" />
<Content Include="Scripts\jquery-1.6.4.min.js" />
@@ -189,19 +210,30 @@
<Compile Include="App_Start\WebApiConfig.cs" />
<Compile Include="BLL\WebServer.cs" />
<Compile Include="Code\Common.cs" />
- <Compile Include="Code\LogService.cs" />
<Compile Include="Code\Test2.cs" />
<Compile Include="Code\TestDAL.cs" />
+ <Compile Include="Controllers\BasicInfoController.cs" />
+ <Compile Include="Controllers\POStockOutBillController.cs" />
+ <Compile Include="Controllers\POStockInBillController.cs" />
+ <Compile Include="Controllers\QuotePriceBilController.cs" />
<Compile Include="Controllers\BarCodeController.cs" />
+ <Compile Include="Controllers\NpoiHelper.cs" />
<Compile Include="Controllers\POInStockBackController.cs" />
<Compile Include="Controllers\POInStockController.cs" />
<Compile Include="Controllers\PODemandPlanController.cs" />
<Compile Include="Controllers\EntrustOrderController.cs" />
+ <Compile Include="Controllers\POOrderBillExcelController.cs" />
+ <Compile Include="Controllers\AskPriceBillController.cs" />
<Compile Include="Controllers\POOrderController.cs" />
<Compile Include="Controllers\PublicPageMethodController.cs" />
<Compile Include="Controllers\ReportController.cs" />
+ <Compile Include="Controllers\SupMaterPackController.cs" />
+ <Compile Include="Controllers\Xt_grdAlignment_WMESController.cs" />
<Compile Include="DLL\ClsCg_POInStockBills.cs" />
+ <Compile Include="HttpClient.cs" />
+ <Compile Include="InvokeHelper.cs" />
<Compile Include="ListModels.cs" />
+ <Compile Include="LogService.cs" />
<Compile Include="Models\ClsCg_POInStockBill.cs" />
<Compile Include="Models\ClsCg_POInStockBillMains.cs" />
<Compile Include="Models\ClsCg_POInStockBillSubs.cs" />
@@ -216,6 +248,8 @@
<Compile Include="MyHub.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Startup.cs" />
+ <Compile Include="Utility\HttpHelper.cs" />
+ <Compile Include="Utility\Util.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="packages.config" />
--
Gitblit v1.9.1