From 1cf37e52dcefd6bbf567818b50e16f36c7fae84c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 30 六月 2022 08:42:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 Model/Model.csproj |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/Model/Model.csproj b/Model/Model.csproj
index 142d606..0088b91 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -214,8 +214,10 @@
     <Compile Include="浠撳簱绠$悊\ClsKf_MateOutRequestBillSub.cs" />
     <Compile Include="浠撳簱绠$悊\ClsKF_ChangeBoxBillMain.cs" />
     <Compile Include="浠撳簱绠$悊\ClsKF_ChangeBoxBillSub.cs" />
+    <Compile Include="浠撳簱绠$悊\ClsKf_MoveStockStepOutBillMain.cs" />
     <Compile Include="浠撳簱绠$悊\ClsKf_MoveStockBillMain.cs" />
     <Compile Include="浠撳簱绠$悊\ClsKf_MoveStockBillScheme.cs" />
+    <Compile Include="浠撳簱绠$悊\ClsKf_MoveStockStepOutBillSub.cs" />
     <Compile Include="浠撳簱绠$悊\ClsKf_MoveStockBillSub.cs" />
     <Compile Include="浠撳簱绠$悊\ClsKf_OtherInBillMain.cs" />
     <Compile Include="浠撳簱绠$悊\ClsKf_OtherInBillScheme.cs" />
@@ -280,6 +282,7 @@
     <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_QCCheckProjectMain.cs" />
     <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_QCCheckProjectSub.cs" />
     <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_SourceShift_Model.cs" />
+    <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_StdWorkTimes_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_TechParamByProc_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_UserCustomerRelation_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_UserDeptRelation_Model.cs" />
@@ -501,7 +504,13 @@
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldMaintainRuleBillSub_Item.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldMoveStockStepOutBillSub.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldMoveStockStepOutBillMain.cs" />
+    <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldScrapInBillMain.cs" />
+    <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldScrapInBillSub.cs" />
+    <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldRepairOutBillMain.cs" />
+    <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldRepairInBillMain.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldOtherInBillMain.cs" />
+    <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldRepairOutBillSub.cs" />
+    <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldRepairInBillSub.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldOtherInBillSub.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldOtherOutBillMain.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldOtherOutBillSub.cs" />
@@ -706,6 +715,8 @@
     <Compile Include="閲囪喘绠$悊\ClsWW_EntrustOrderBillSub.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="閲囪喘绠$悊\ClsWW_PPBomBillMain.cs" />
+    <Compile Include="閲囪喘绠$悊\ClsWW_PPBomBillSub.cs" />
     <Compile Include="閲囪喘绠$悊\Sup_SendGoodsBillMain.cs" />
     <Compile Include="閲囪喘绠$悊\Sup_SendGoodsBillSub.cs" />
     <Compile Include="閲戣澏CLOUD鍗曟嵁\浠撳簱绠$悊\ClsKf_EntrustInBackBillMain_CLD.cs" />

--
Gitblit v1.9.1