From 524d09e52b7bbe183595c289ec93ca8f2b26a4e8 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 26 一月 2022 00:13:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 5d819cc..7e1867a 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" />
@@ -281,6 +283,9 @@
<Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
<DependentUpon>Reference.map</DependentUpon>
</Content>
+ <Content Include="Web References\WebS\ClsKf_ICStockBill_Mould.datasource">
+ <DependentUpon>Reference.map</DependentUpon>
+ </Content>
<None Include="Web References\WebS\Reference.map">
<Generator>MSDiscoCodeGenerator</Generator>
<LastGenOutput>Reference.cs</LastGenOutput>
@@ -349,11 +354,13 @@
<Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
+ <Compile Include="Controllers\Sc_PckSplitBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_DuSubsidyItemBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" />
<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" />
@@ -372,6 +379,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" />
@@ -471,10 +479,12 @@
<Compile Include="DLL\ClsSb_EquipMaintainBill.cs" />
<Compile Include="DLL\ClsSb_EquipMaintainRuleBill.cs" />
<Compile Include="DLL\ClsSb_EquipRepairCheckBill.cs" />
+ <Compile Include="DLL\ClsSb_EquipRepairSendWorkBill.cs" />
<Compile Include="DLL\ClsSb_EquipRepairWorkBill.cs" />
<Compile Include="DLL\ClsSb_MouldRepairWorkBill.cs" />
<Compile Include="DLL\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" />
<Compile Include="DLL\ClsSc_ICMOReportBill.cs" />
+ <Compile Include="DLL\ClsSc_ICMOStepBillWorkQtyStatus_Tmp.cs" />
<Compile Include="DLL\ClsSc_MESBeginWorkBill.cs" />
<Compile Include="DLL\ClsSc_MESEndWorkBill.cs" />
<Compile Include="DLL\ClsSc_MESReturnStepWorkBill.cs" />
@@ -486,6 +496,8 @@
<Compile Include="DLL\ClsSc_MouldOtherInBill.cs" />
<Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
<Compile Include="DLL\ClsSc_PackUnionBill.cs" />
+ <Compile Include="DLL\ClsSc_ProcessPlan.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" />
@@ -493,12 +505,18 @@
<Compile Include="InvokeHelper.cs" />
<Compile Include="Log.cs" />
<Compile Include="Models\ClsGy_StockCheckItemBill.cs" />
+ <Compile Include="Models\ClsSb_EquipRepairSendWorkBillMain.cs" />
+ <Compile Include="Models\ClsSb_EquipRepairSendWorkBillSub.cs" />
<Compile Include="Models\ClsSb_MouldRepairWorkBillMain.cs" />
<Compile Include="Models\ClsSb_MouldRepairWorkBillSub.cs" />
<Compile Include="Models\ClsSc_PackUnionBillMain.cs" />
<Compile Include="Models\ClsSc_PackUnionBillSub.cs" />
+ <Compile Include="Models\ClsSc_ProcessPlanMain.cs" />
+ <Compile Include="Models\ClsSc_ProcessPlanSub.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" />
@@ -671,6 +689,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>
@@ -696,7 +715,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" />
@@ -747,6 +765,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\" />
@@ -777,10 +796,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