From 99660c0a8a0532cbec865dbd86aff2d15ca80fdb Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 07 九月 2022 13:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index e3ea52f..0138426 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -373,6 +373,7 @@
<Compile Include="Controllers\CJGL\Cj_ComplementGoodsBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" />
<Compile Include="Controllers\CJGL\Cj_SendGoodsBillController.cs" />
+ <Compile Include="Controllers\CJGL\ProductionPlanReportController.cs" />
<Compile Include="Controllers\CJGL\Sc_ProcessExchangeBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
@@ -386,6 +387,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" />
@@ -428,6 +430,7 @@
<Compile Include="Controllers\浠撳瓨绠＄悊\楠屾敹鍏ュ簱\Kf_StepFoldinBillController.cs" />
<Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkStationBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_MonthlySalaryReportController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PieceRateWageReportController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjBillController.cs" />
@@ -537,6 +540,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" />
@@ -545,6 +549,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" />
@@ -575,6 +581,7 @@
<Compile Include="Models\Sc_WorkDemandPlanBillMain.cs" />
<Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" />
<Compile Include="Models\鍔ㄦ�佸垪\OptionListModel.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_ClassTimePrj_Model.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillEmp.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillMain.cs" />
@@ -737,10 +744,8 @@
<Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
<Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrjSub.cs" />
- <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_Employee.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" />
- <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
<Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_WorkTimesBillMain.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_WorkTimesBillSub.cs" />
@@ -831,8 +836,10 @@
<Folder Include="Views\Gy_EquipType\" />
<Folder Include="Views\Gy_ICBomBill\" />
<Folder Include="Views\Gy_RoutingGroup\" />
+ <Folder Include="Views\Gy_WorkStation\" />
<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\" />
@@ -841,6 +848,7 @@
<Folder Include="Views\kf_StepFoldinBill\" />
<Folder Include="Views\Kf_StepFoldOutBill\" />
<Folder Include="Views\MoveStockBill\" />
+ <Folder Include="Views\ProductionPlanReport\" />
<Folder Include="Views\ProductionReturnBill\" />
<Folder Include="Views\QC_Management\" />
<Folder Include="Views\Sb_EquipRepairSendWorkBill\" />
--
Gitblit v1.9.1