From 92809cc9640ebe60a8dda1ad7ad10229206c3894 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 09 八月 2022 16:06:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 2aeedcf..49aabbb 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -306,6 +306,7 @@
</Content>
<None Include="Web References\WebS\Reference.map">
<Generator>MSDiscoCodeGenerator</Generator>
+ <LastGenOutput>Reference1.cs</LastGenOutput>
</None>
<None Include="Web References\WebS\WebService1.disco" />
<Content Include="Web.config">
@@ -377,6 +378,7 @@
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
<Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_CallGoodsBackRequestBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_ComplementGoodBillController.cs" />
@@ -384,6 +386,7 @@
<Compile Include="Controllers\SCGL\Sc_ICBomBillController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormBillController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormImportController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_ICMOSortBillController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱NpoiHelper.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_JIT_ComplementGoodBillController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_CompleteController..cs" />
@@ -426,6 +429,8 @@
<Compile Include="Controllers\浠撳瓨绠＄悊\楠屾敹鍏ュ簱\Kf_StepFoldinBillController.cs" />
<Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_MonthlySalaryReportController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PieceRateWageReportController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjSubController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OtherBalBillController.cs" />
@@ -533,6 +538,7 @@
<Compile Include="DLL\ClsSc_MouldOtherInBill.cs" />
<Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
<Compile Include="DLL\ClsSc_PackUnionBill.cs" />
+ <Compile Include="DLL\ClsSc_PHPCruxBillBill.cs" />
<Compile Include="DLL\ClsSc_ProcessPlan.cs" />
<Compile Include="DLL\ClsWW_PPBomBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_GroupBalBill.cs" />
@@ -541,6 +547,8 @@
<Compile Include="HttpClient.cs" />
<Compile Include="InvokeHelper.cs" />
<Compile Include="Log.cs" />
+ <Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
+ <Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
<Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" />
<Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" />
<Compile Include="Models\Cg_PODemandPlanConfigBillSub.cs" />
@@ -570,6 +578,7 @@
<Compile Include="Models\Sc_WorkBillSortBillSub.cs" />
<Compile Include="Models\Sc_WorkDemandPlanBillMain.cs" />
<Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" />
+ <Compile Include="Models\鍔ㄦ�佸垪\OptionListModel.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_ClassTimePrj_Model.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillEmp.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillMain.cs" />
@@ -828,6 +837,7 @@
<Folder Include="Views\Gy_RoutingGroup\" />
<Folder Include="Views\JIT_DayPlanPlatFormBill\" />
<Folder Include="Views\JIT_DayPlanPlatFormImport\" />
+ <Folder Include="Views\JIT_ICMOSortBillList\" />
<Folder Include="Views\KF_ICInventoryList_WMSBill\" />
<Folder Include="Views\Kf_ICStockBillMain\" />
<Folder Include="Views\Kf_ICStockInOutBill\" />
--
Gitblit v1.9.1