From 146fa02f2ff92f9687fc9e099e2e812f785e04b1 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 25 四月 2022 13:32:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/WebAPI.csproj |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index fbd7ae6..4818f42 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -359,14 +359,14 @@
     <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\鏃ヨ鍒掔鐞哱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\鏃ヨ鍒掔鐞哱Sc_JIT_ComplementGoodBillController.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_CompleteController..cs" />
-    <Compile Include="Controllers\SCGL\Sc_WorkBillSortBillController.cs" />
+    <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_WorkBillSortBillController.cs" />
     <Compile Include="Controllers\Sc_PckSplitBillController.cs" />
     <Compile Include="Controllers\GZGL\Gy_DuSubsidyItemBillController.cs" />
     <Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" />
@@ -519,6 +519,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\Cg_PODemandPlanConfigBillSub.cs" />
     <Compile Include="Models\ClsGy_StockCheckItemBill.cs" />
     <Compile Include="Models\ClsQK_PackingBill.cs" />

--
Gitblit v1.9.1