From 7f7c137e8c1d26bb777f3d5abd13866ad6fde28b Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 19 一月 2022 01:17:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 4e844c8..8b72bc5 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -197,6 +197,8 @@
</Reference>
</ItemGroup>
<ItemGroup>
+ <Content Include="bin\WebAPI.dll" />
+ <Content Include="bin\WebAPI.pdb" />
<Content Include="Content\bootstrap.css" />
<Content Include="Content\bootstrap.min.css" />
<Content Include="Content\Site.css" />
@@ -357,6 +359,7 @@
<Compile Include="Controllers\GZGL\Gy_WorkTypeBillController.cs" />
<Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" />
<Compile Include="Controllers\Kf_ICStockBillMainController.cs" />
+ <Compile Include="Controllers\MateOutController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldMaintainRuleBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldMoveStockStepInBillListController .cs" />
<Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillListController.cs" />
@@ -375,6 +378,7 @@
<Compile Include="Controllers\SCGL\Sc_PackUnionBillController.cs" />
<Compile Include="Controllers\Sc_MouldRepairSendWorkBillController.cs" />
<Compile Include="Controllers\Sc_ProcessMangementController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\濮斿鐢ㄦ枡\WW_PPBomBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鎵爜寮傚父璁板綍\KF_PonderationBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鍑哄叆搴撹褰昞Kf_ICStockInOutBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜搴撳瓨\KF_ICInventoryList_WMSBillController.cs" />
@@ -489,6 +493,7 @@
<Compile Include="DLL\ClsSc_MouldOtherInBill.cs" />
<Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
<Compile Include="DLL\ClsSc_PackUnionBill.cs" />
+ <Compile Include="DLL\ClsWW_PPBomBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_GroupBalBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsGy_GroupEmpBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_WorkTimesBill.cs" />
@@ -502,6 +507,8 @@
<Compile Include="Models\ClsSc_PackUnionBillSub.cs" />
<Compile Include="Models\ClsSc_ProcessReportMain.cs" />
<Compile Include="Models\ClsSc_ProcessReportSub.cs" />
+ <Compile Include="Models\ClsWW_PPBomBillMain.cs" />
+ <Compile Include="Models\ClsWW_PPBomBillSub.cs" />
<Compile Include="Models\GetWeekList.cs" />
<Compile Include="Models\jsonScanline.cs" />
<Compile Include="Models\ScanLineCode.cs" />
@@ -674,6 +681,7 @@
<Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_WorkTimesBillMain.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_WorkTimesBillSub.cs" />
+ <Compile Include="obj\Debug\.NETFramework,Version=v4.5.AssemblyAttributes.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -699,7 +707,6 @@
<Compile Include="Controllers\EntrustOutBackController.cs" />
<Compile Include="Controllers\EntrustOutController.cs" />
<Compile Include="Controllers\Kf_EntrustInBillController.cs" />
- <Compile Include="Controllers\MateOutController.cs" />
<Compile Include="Controllers\OtherOutBillController.cs" />
<Compile Include="Controllers\OtherInStockController.cs" />
<Compile Include="Controllers\POStockInBackBillController.cs" />
@@ -750,6 +757,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
+ <Folder Include="obj\x86\Debug\" />
<Folder Include="Views\Cg_PurchaseReturn\" />
<Folder Include="Views\Gy_EquipType\" />
<Folder Include="Views\Gy_RoutingGroup\" />
@@ -780,10 +788,10 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://localhost/WEBS-WMSTest/WebService1.asmx">
+ <WebReferenceUrl Include="http://localhost/WEBS-WMS/WebService1.asmx">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://localhost/WEBS-WMSTest/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://localhost/WEBS-WMS/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
--
Gitblit v1.9.1