From 9bf9b1c4df6f49d770858410974fc3cbd960c5e5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 04 一月 2023 15:34:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 0f59573..30f6417 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -392,9 +392,16 @@
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
<Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
<Compile Include="Controllers\Gy_MateMouldController.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\Sb_EquipSparepartsBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipSparepartsChangeBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipStatusChangeBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipStockInCheckBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipWorkBeforeCheckBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
@@ -440,6 +447,7 @@
<Compile Include="Controllers\浠撳瓨绠＄悊\鎵爜寮傚父璁板綍\KF_PonderationBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鍑哄叆搴撹褰昞Kf_ICStockInOutBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜搴撳瓨\KF_ICInventoryList_WMSBillController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\Gy_BarCodeBill_OutController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\KF_BarCodeStatusChangeBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\Sc_BarCodeController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\璋冩嫧鐩樼偣\Kf_MoveStockRequestBillController.cs" />
@@ -451,7 +459,9 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DutyBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_EquipStatusController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceSupController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MouldStatusController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_OperatorController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionListBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RateTypeController.cs" />
@@ -896,14 +906,17 @@
<Folder Include="Views\Cj_CallGoodsBillMain\" />
<Folder Include="Views\Cj_ComplementGoodsBill\" />
<Folder Include="Views\Cj_SendGoodsBill\" />
+ <Folder Include="Views\Gy_BarCodeBill_Out\" />
<Folder Include="Views\Gy_COMMONCONTACTBill\" />
<Folder Include="Views\Gy_ConkType\" />
<Folder Include="Views\Gy_CustLocation\" />
<Folder Include="Views\Gy_DutyBill\" />
+ <Folder Include="Views\Gy_EquipStatus\" />
<Folder Include="Views\Gy_EquipType\" />
<Folder Include="Views\Gy_ICBomBill\" />
<Folder Include="Views\Gy_MateMould\" />
<Folder Include="Views\Gy_MatePriceSup\" />
+ <Folder Include="Views\Gy_MouldStatus\" />
<Folder Include="Views\Gy_Operator\" />
<Folder Include="Views\Gy_PackType\" />
<Folder Include="Views\Gy_PaymentConditionListBill\" />
@@ -940,13 +953,20 @@
<Folder Include="Views\Sb_EquipRepairSendWorkBill\" />
<Folder Include="Views\Sb_EquipSparepartsBill\" />
<Folder Include="Views\Sb_EquipSparepartsChangeBill\" />
+ <Folder Include="Views\Sb_EquipStatusChangeBill\" />
+ <Folder Include="Views\Sb_EquipStockInCheckBill\" />
+ <Folder Include="Views\Sb_EquipWorkBeforeCheckBill\" />
<Folder Include="Views\Sc_CallGoodsBackRequestBill\" />
<Folder Include="Views\Sc_ComplementGoodBill\" />
<Folder Include="Views\Sc_ComplementGoodBill_ZXBZ\" />
<Folder Include="Views\Sc_ComplementGoods\" />
<Folder Include="Views\Sc_JIT_ComplementGoodBill\" />
+ <Folder Include="Views\Sc_MouldDotCheckRuleBill\" />
+ <Folder Include="Views\Sc_MouldLifeUseBill\" />
<Folder Include="Views\Sc_MouldRepairOutBill\" />
<Folder Include="Views\Sc_MouldRepairSendWorkBill\" />
+ <Folder Include="Views\Sc_MouldScrapRequestBill\" />
+ <Folder Include="Views\Sc_MouldStatusChangeBill\" />
<Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
<Folder Include="Views\Sc_WorkBillSortBill\" />
<Folder Include="Views\Sc_WorkDemandPlanBill\" />
--
Gitblit v1.9.1