From a91fdba94705dd25cecccc7a4a5dcc2b3f2c09a6 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 22 十二月 2025 16:16:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index b409f6d..ec812df 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -93,6 +93,10 @@
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
+ <Reference Include="Interop.grsvr6Lib">
+ <HintPath>DLL\Interop.grsvr6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
<Reference Include="Kingdee.BOS.WebApi.Client, Version=7.2.904.6, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Users\37327\Desktop\Kingdee.BOS.WebApi.Client.dll</HintPath>
@@ -268,6 +272,7 @@
<Content Include="DLL\BLL.dll" />
<Content Include="DLL\DAL.dll" />
<Content Include="DLL\DBUtility.dll" />
+ <Content Include="DLL\Interop.grsvr6Lib.dll" />
<Content Include="DLL\Kingdee.BOS.WebApi.Client.dll" />
<Content Include="DLL\Model.dll" />
<Content Include="DLL\Newtonsoft.Json.Net35.dll" />
@@ -277,16 +282,19 @@
<Content Include="fonts\glyphicons-halflings-regular.svg" />
<Content Include="Global.asax" />
<Content Include="Index.html" />
+ <Content Include="Properties\PublishProfiles\JFAPI.pubxml.user" />
<Content Include="Views\Scripts\bootstrap.js" />
<Content Include="Views\Scripts\bootstrap.min.js" />
<Content Include="Config\kdapi.config" />
<Content Include="libman.json" />
<Content Include="Template\barCodeTemplateStorage.json" />
<None Include="Properties\PublishProfiles\FolderProfilewtt.pubxml" />
+ <None Include="Properties\PublishProfiles\JFAPI.pubxml" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
+ <Content Include="Utility\Barcode.ashx" />
<None Include="Views\Scripts\jquery-1.10.2.intellisense.js" />
<Content Include="Views\Scripts\jquery-1.10.2.js" />
<Content Include="Views\Scripts\jquery-1.10.2.min.js" />
@@ -374,6 +382,7 @@
<Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ConkTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ColorClassController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_DriverController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ICBomBillController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WorkDayController.cs" />
<Compile Include="Controllers\BaseSet\Gy_PackTypeController.cs" />
@@ -421,6 +430,7 @@
<Compile Include="Controllers\BLL\Xt_SystemLogController.cs" />
<Compile Include="Controllers\CellWidthController.cs" />
<Compile Include="Controllers\CGGL\Cg_ContractBillController.cs" />
+ <Compile Include="Controllers\CGGL\Cg_OrderTransportBillListController.cs" />
<Compile Include="Controllers\CGGL\Cg_PORequestBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_PurchaseReturnController.cs" />
<Compile Include="Controllers\CGGL\Kf_POStockInBackBillController.cs" />
@@ -435,6 +445,7 @@
<Compile Include="Controllers\CGGL\Cg_POStockInChangeBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POOrderChangeBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POStockInBillList_SecController.cs" />
+ <Compile Include="Controllers\Cg_ContractTransportBillListController.cs" />
<Compile Include="Controllers\CJGL\Cj_CallGoodsBillBackController.cs" />
<Compile Include="Controllers\CJGL\Cj_CallGoodsBillMainController.cs" />
<Compile Include="Controllers\CJGL\Cj_CenterCheckBillController.cs" />
@@ -448,7 +459,10 @@
<Compile Include="Controllers\CJGL\Sc_KeyElementBindingController.cs" />
<Compile Include="Controllers\CJGL\Sc_OEEReportController.cs" />
<Compile Include="Controllers\CKGL\TMZD\Gy_BarCodeBillListController.cs" />
+ <Compile Include="Controllers\GZGL\Gy_SteppedPriceCoefficientController .cs" />
<Compile Include="Controllers\JHGL\Gy_SourceMouldBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldProdBackBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldProdOutBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldOutRequestBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldInRequestBillController.cs" />
@@ -624,10 +638,12 @@
<Compile Include="Controllers\鍗庤繙datamapping\Gy_BarCodeBill_Set_TempController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_AssistantDataEntryController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_BilloriginController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CarController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardChangeTypeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardStatusController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardAddressController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardTypeController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CarTypeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DiscountListController.cs" />
@@ -652,7 +668,9 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MultipleCode_ReportController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PlanImplementation_ReportController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PNLInfoTypeLevelController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ShelfLifeNearExpiryController.cs" />
<Compile Include="Controllers\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBill_WorkController.cs" />
+ <Compile Include="DLL\ClsGy_ItemMoney_Ctl.cs" />
<Compile Include="DLL\ClsSc_MESStopRestoreWorkBill.cs" />
<Compile Include="DLL\ClsSc_PackUnionBillBarCode_temp_Ctl.cs" />
<Compile Include="Models\ClsGy_Billorigin.cs" />
@@ -662,6 +680,7 @@
<Compile Include="Models\ClsWW_EntrustOrderBillMainSub.cs" />
<Compile Include="Models\ClsWW_PPBomBill.cs" />
<Compile Include="Models\ClsWW_EntrustOrderBillMain_1.cs" />
+ <Compile Include="Models\Driver.cs" />
<Compile Include="Models\GroupOrderBill.cs" />
<Compile Include="Models\ClsGy_PNLInfoSub.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ProcMulController.cs" />
@@ -971,6 +990,7 @@
<Compile Include="Models\鍩虹璧勬枡\Gy_Duty.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_TemporaryArea.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_StockPlace.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_CarType.cs" />
<Compile Include="Models\鍩虹璧勬枡\WorkDay.cs" />
<Compile Include="Models\鍩虹璧勬枡\PackType.cs" />
<Compile Include="Models\鍩虹璧勬枡\WorkStation.cs" />
@@ -1160,6 +1180,10 @@
<Compile Include="Service\ProcessDal.cs" />
<Compile Include="Service\YqnDal.cs" />
<Compile Include="Service\YqnQbService.cs" />
+ <Compile Include="Utility\Barcode.ashx.cs">
+ <DependentUpon>Barcode.ashx</DependentUpon>
+ </Compile>
+ <Compile Include="Utility\ServerTools.cs" />
<Compile Include="Utility\Util.cs" />
<Compile Include="Code\Common.cs" />
<Compile Include="Code\Test2.cs" />
@@ -1224,6 +1248,7 @@
<Folder Include="bin\" />
<Folder Include="Controllers\椤圭洰绠＄悊\鍩虹寤烘ā\" />
<Folder Include="obj\x86\Debug\" />
+ <Folder Include="Views\Cg_ContractTransportBillList\" />
<Folder Include="Views\Cg_PODemandPlanBill\" />
<Folder Include="Views\Cg_PurchaseReturn\" />
<Folder Include="Views\Cj_CallGoodsBillBack\" />
@@ -1237,6 +1262,7 @@
<Folder Include="Views\Gy_COMMONCONTACTBill\" />
<Folder Include="Views\Gy_ConkType\" />
<Folder Include="Views\Gy_CustLocation\" />
+ <Folder Include="Views\Gy_Driver\" />
<Folder Include="Views\Gy_DutyBill\" />
<Folder Include="Views\Gy_EquipStatus\" />
<Folder Include="Views\Gy_EquipType\" />
--
Gitblit v1.9.1