From 1db1c64dc628d2053617ba2c3cc78fb94b518d2c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 27 二月 2023 08:57:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 85c001b..65e571c 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -65,6 +65,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="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>
+ </Reference>
<Reference Include="Microsoft.Azure.AppService.ApiApps.Service, Version=0.9.16.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.AppService.ApiApps.Service.0.9.16\lib\net45\Microsoft.Azure.AppService.ApiApps.Service.dll</HintPath>
<Private>True</Private>
@@ -365,6 +369,7 @@
<Compile Include="Controllers\BaseSet\Xt_grdAlignment_WMESController.cs" />
<Compile Include="Controllers\BaseSet\Xt_ORGANIZATIONSController.cs" />
<Compile Include="Controllers\BLL\Xt_AccountPeriodController.cs" />
+ <Compile Include="Controllers\BLL\Xt_BillSubTypeController.cs" />
<Compile Include="Controllers\BLL\Xt_BillTypeController.cs" />
<Compile Include="Controllers\BLL\Xt_UserGroupController.cs" />
<Compile Include="Controllers\BLL\Xt_XtgnbController.cs" />
@@ -390,20 +395,22 @@
<Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
+ <Compile Include="Controllers\CJGL\Sc_ProcExchWorkBackBillController.cs" />
<Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
<Compile Include="Controllers\Gy_MateMouldController.cs" />
+ <Compile Include="Controllers\Gy_StdMinPickQtyController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldDotCheckRuleBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldLifeUseBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldScrapRequestBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldStatusChangeBillController.cs" />
<Compile Include="Controllers\Pay_ReportController.cs" />
- <Compile Include="Controllers\SBGL\SBTC\Sb_EquipStockInCheckBillController.cs" />
- <Compile Include="Controllers\SBGL\SBTC\Sb_EquipWorkBeforeCheckBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipSparepartsBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipSparepartsChangeBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipStatusChangeBillController.cs" />
- <Compile Include="Controllers\SBGL\Sb_EquipWorkBeforeCheckBillController.cs" />
- <Compile Include="Controllers\SBGL\Sb_EquipStockInCheckBillController.cs" />
+ <Compile Include="Controllers\SBGL\SBTC\Sb_EquipStockInCheckBillController.cs" />
+ <Compile Include="Controllers\SBGL\SBTC\Sb_EquipWorkBeforeCheckBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipWorkBeforeCheckSBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipStockInCheckBillSController.cs" />
<Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
@@ -474,6 +481,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SOPBillListController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StaffController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockPlace_Controller.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockStatusBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SupplierContactBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TaxMIXController.cs" />
@@ -603,6 +611,7 @@
<Compile Include="InvokeHelper.cs" />
<Compile Include="Log.cs" />
<Compile Include="Models\ClsGy_MateMould.cs" />
+ <Compile Include="Models\ClsGy_SupMaterial.cs" />
<Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
<Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
<Compile Include="Models\Employee.cs" />
@@ -928,6 +937,8 @@
<Folder Include="Views\Gy_SettleStyle\" />
<Folder Include="Views\Gy_SOPBill\" />
<Folder Include="Views\Gy_Staff\" />
+ <Folder Include="Views\Gy_StdMinPickQty\" />
+ <Folder Include="Views\Gy_StockPlace_\" />
<Folder Include="Views\Gy_StockStatusBill\" />
<Folder Include="Views\Gy_SupplierContactBill\" />
<Folder Include="Views\Gy_TaxMIXMain\" />
@@ -969,9 +980,11 @@
<Folder Include="Views\Sc_MouldRepairSendWorkBill\" />
<Folder Include="Views\Sc_MouldScrapRequestBill\" />
<Folder Include="Views\Sc_MouldStatusChangeBill\" />
+ <Folder Include="Views\Sc_ProcessExchangeIssueBill\" />
<Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
<Folder Include="Views\Sc_WorkBillSortBill\" />
<Folder Include="Views\Sc_WorkDemandPlanBill\" />
+ <Folder Include="Views\Xt_BillSubType\" />
<Folder Include="Views\Xt_CheckFlowBill\" />
<Folder Include="Views\Xt_CheckItem\" />
<Folder Include="Views\Xt_grdAlignment_WMES\" />
@@ -1019,10 +1032,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://192.168.63.7/WEBS-WMS/WebService1.asmx">
+ <WebReferenceUrl Include="http://localhost:8098/WebService1.asmx">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://192.168.63.7/WEBS-WMS/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://localhost:8098/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
--
Gitblit v1.9.1