From 9d93f219367a57659c6641319922dee224e68d39 Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期二, 09 八月 2022 16:57:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index e3ea52f..49aabbb 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -386,6 +386,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" />
@@ -537,6 +538,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 +547,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" />
@@ -833,6 +837,7 @@
     <Folder Include="Views\Gy_RoutingGroup\" />
     <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\" />

--
Gitblit v1.9.1