From 8b83671f3d3369e6313313a1b3fefdf5b6c0252f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 24 四月 2024 14:10:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/Model/Model.csproj b/Model/Model.csproj
index 91d23c7..feb8ba4 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -239,6 +239,8 @@
     <Compile Include="浠撳簱绠＄悊\ClsKf_MateOutRequestBillSub.cs" />
     <Compile Include="浠撳簱绠＄悊\ClsKF_ChangeBoxBillMain.cs" />
     <Compile Include="浠撳簱绠＄悊\ClsKF_ChangeBoxBillSub.cs" />
+    <Compile Include="浠撳簱绠＄悊\ClsSc_ProductionReturnBillSub.cs" />
+    <Compile Include="浠撳簱绠＄悊\ClsSc_ProductionReturnBillMain.cs" />
     <Compile Include="浠撳簱绠＄悊\ClsKf_StepFoldInBillMain.cs" />
     <Compile Include="浠撳簱绠＄悊\ClsKf_StepFoldInBillSub.cs" />
     <Compile Include="浠撳簱绠＄悊\ClsKf_StepFoldOutBillSub.cs" />
@@ -289,10 +291,12 @@
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackCheckBillMain.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackHandleBillMain.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackCheckBillSub.cs" />
+    <Compile Include="淇℃伅骞冲彴\ClsOA_AndengFlowRuleBillMain.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackSignBill.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackReceiveBillMain.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackBillMain.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackHandleBillSub.cs" />
+    <Compile Include="淇℃伅骞冲彴\ClsOA_AndengFlowRuleBillSub.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackSignBillSub.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackReceiveBillSub.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackBillSub.cs" />
@@ -351,12 +355,15 @@
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_AreaUser_Model.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_BadPhenomena_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_BadResult_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CardChangeType_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CardStatus_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CardAddress_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CardType_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_ErrMsgBackType_Model.cs" />
+    <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TaskClass_Model.cs" />
+    <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_ProjectClass_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_StockCheckItem_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_InspectInstruMent_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_InspectBasis_Model.cs" />
@@ -637,6 +644,14 @@
     <Compile Include="绯荤粺鍏敤\ClsXt_SystemParameter_Model.cs" />
     <Compile Include="璁″垝绠＄悊\ClsGy_MaterialTechParamBillSub.cs" />
     <Compile Include="璁″垝绠＄悊\ClsGy_MaterialTechParamBillMain.cs" />
+    <Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdConclusionBillMain.cs" />
+    <Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdConclusionBillSub.cs" />
+    <Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdDisposeCheckBillMain.cs" />
+    <Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdDisposeBillMain.cs" />
+    <Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdDisposeCheckBillSub.cs" />
+    <Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdRequestBillMain.cs" />
+    <Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdDisposeBillSub.cs" />
+    <Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdRequestBillSub.cs" />
     <Compile Include="璐ㄦ绠＄悊\ClsSc_ProcessExchangeBillMain_Note.cs" />
     <Compile Include="璐ㄦ绠＄悊\ClsQC_FirstPieceCheckBillSub_ValueGrid.cs" />
     <Compile Include="璐ㄦ绠＄悊\ClsQC_PatrolProcCheckBillSub_BadReason.cs" />

--
Gitblit v1.9.1