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 | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index e2d02bb..99907d7 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -46,9 +46,9 @@
<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=x86">
+ <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>
@@ -100,9 +100,9 @@
<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>
@@ -154,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" />
@@ -210,6 +212,10 @@
<Compile Include="Code\Common.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" />
@@ -217,9 +223,12 @@
<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" />
@@ -239,6 +248,7 @@
<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>
--
Gitblit v1.9.1