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 | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 4818f42..e0c7b1e 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -359,7 +359,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\鏃ヨ鍒掔鐞哱Cg_PODemandPlanBillController.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" />
@@ -367,6 +367,7 @@
<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" />
@@ -519,8 +520,8 @@
<Compile Include="HttpClient.cs" />
<Compile Include="InvokeHelper.cs" />
<Compile Include="Log.cs" />
- <Compile Include="Models\Cg_PODemandPlanBillMain.cs" />
- <Compile Include="Models\Cg_PODemandPlanBillSub.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" />
@@ -546,6 +547,8 @@
<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" />
@@ -820,6 +823,7 @@
<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