From 65253da4cbb0ff0dd4a4d69b8b36360e48428398 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 06 五月 2022 10:58:54 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/WebAPI.csproj |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index c644126..e0c7b1e 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -353,15 +353,21 @@
     <Compile Include="Controllers\CJGL\Cj_CallGoodsBillMainController.cs" />
     <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\Sc_ProcessExchangeBillController.cs" />
     <Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
     <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\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_CallGoodsBackRequestBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_ComplementGoodBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_ComplementGoodsController.cs" />
     <Compile Include="Controllers\SCGL\Sc_ICBomBillController.cs" />
+    <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_JIT_ComplementGoodBillController.cs" />
+    <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_CompleteController..cs" />
+    <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_WorkBillSortBillController.cs" />
+    <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_WorkDemandPlanBillController.cs" />
     <Compile Include="Controllers\Sc_PckSplitBillController.cs" />
     <Compile Include="Controllers\GZGL\Gy_DuSubsidyItemBillController.cs" />
     <Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" />
@@ -514,7 +520,11 @@
     <Compile Include="HttpClient.cs" />
     <Compile Include="InvokeHelper.cs" />
     <Compile Include="Log.cs" />
+    <Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" />
+    <Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" />
+    <Compile Include="Models\Cg_PODemandPlanConfigBillSub.cs" />
     <Compile Include="Models\ClsGy_StockCheckItemBill.cs" />
+    <Compile Include="Models\ClsQK_PackingBill.cs" />
     <Compile Include="Models\ClsSb_EquipRepairSendWorkBillMain.cs" />
     <Compile Include="Models\ClsSb_EquipRepairSendWorkBillSub.cs" />
     <Compile Include="Models\ClsSb_MouldRepairWorkBillMain.cs" />
@@ -529,10 +539,16 @@
     <Compile Include="Models\ClsWW_PPBomBillSub.cs" />
     <Compile Include="Models\Cls_InventoryAnalysisList.cs" />
     <Compile Include="Models\GetWeekList.cs" />
+    <Compile Include="Models\Gy_WorkWarehouseBillMainSub.cs" />
     <Compile Include="Models\HBarCodeList.cs" />
     <Compile Include="Models\HSouceOrderList.cs" />
+    <Compile Include="Models\JIT_NeedMaterPlanConfigBillSub.cs" />
     <Compile Include="Models\jsonScanline.cs" />
     <Compile Include="Models\ScanLineCode.cs" />
+    <Compile Include="Models\Sc_WorkBillSortBillMain.cs" />
+    <Compile Include="Models\Sc_WorkBillSortBillSub.cs" />
+    <Compile Include="Models\Sc_WorkDemandPlanBillMain.cs" />
+    <Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" />
     <Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_ClassTimePrj_Model.cs" />
     <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillEmp.cs" />
     <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillMain.cs" />
@@ -779,10 +795,12 @@
   <ItemGroup>
     <Folder Include="App_Data\" />
     <Folder Include="obj\x86\Debug\" />
+    <Folder Include="Views\Cg_PODemandPlanBill\" />
     <Folder Include="Views\Cg_PurchaseReturn\" />
     <Folder Include="Views\Cj_CallGoodsBillBack\" />
     <Folder Include="Views\Cj_CallGoodsBillMain\" />
     <Folder Include="Views\Cj_ComplementGoodsBill\" />
+    <Folder Include="Views\Cj_SendGoodsBill\" />
     <Folder Include="Views\Gy_EquipType\" />
     <Folder Include="Views\Gy_ICBomBill\" />
     <Folder Include="Views\Gy_RoutingGroup\" />
@@ -800,9 +818,12 @@
     <Folder Include="Views\Sc_CallGoodsBackRequestBill\" />
     <Folder Include="Views\Sc_ComplementGoodBill\" />
     <Folder Include="Views\Sc_ComplementGoods\" />
+    <Folder Include="Views\Sc_JIT_ComplementGoodBill\" />
     <Folder Include="Views\Sc_MouldRepairOutBill\" />
     <Folder Include="Views\Sc_MouldRepairSendWorkBill\" />
     <Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
+    <Folder Include="Views\Sc_WorkBillSortBill\" />
+    <Folder Include="Views\Sc_WorkDemandPlanBill\" />
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Service References\" />

--
Gitblit v1.9.1