From efa57c53b1b4c94e188a52f5a35d0a4ca8a82cb5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 29 六月 2023 14:55:30 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/Model/Model.csproj b/Model/Model.csproj
index b073d2c..b21ec65 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -303,6 +303,7 @@
     <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_QCCheckProjectSub.cs" />
     <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_SourceShift_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_StdWorkTimes_Model.cs" />
+    <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_SupMaterial_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_TechParamByProc_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_UserCustomerRelation_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_UserDeptRelation_Model.cs" />
@@ -579,6 +580,16 @@
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldStockBillSub.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipConkBookBillMain.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipConkBookBillSub.cs" />
+    <Compile Include="杞﹂棿绠$悊\ClsSc_ProcExchRecordBackBillMain.cs" />
+    <Compile Include="杞﹂棿绠$悊\ClsSc_ProcExchRecordBackBillSub.cs" />
+    <Compile Include="杞﹂棿绠$悊\ClsSc_ProcExchSendWorkBillMain.cs" />
+    <Compile Include="杞﹂棿绠$悊\ClsSc_ProcExchSendWorkBillSub.cs" />
+    <Compile Include="杞﹂棿绠$悊\ClsSc_ProcExchWorkBackBillSub.cs" />
+    <Compile Include="杞﹂棿绠$悊\ClsSc_ProcExchWorkBackBillMain.cs" />
+    <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipWorkBeforeCheckBillMain.cs" />
+    <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipWorkBeforeCheckBillSub.cs" />
+    <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipStockInCheckBillSub.cs" />
+    <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipStockInCheckBillMain.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipDotCheckBillMain.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipDotCheckBillSub.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipDotCheckPlanBillMain.cs" />
@@ -604,6 +615,10 @@
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipSparepartsChangeBillSub.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipStatusChangeBillMain.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipStatusChangeBillSub.cs" />
+    <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipStockInCheckBillMain.cs" />
+    <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipStockInCheckBillSub.cs" />
+    <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipWorkBeforeCheckBillMain.cs" />
+    <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipWorkBeforeCheckBillSub.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSc_EquipMaintainBillSub_Item.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSc_EquipMaintainPlanBillSub_Item.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSc_ICMOBillMain.cs" />
@@ -611,6 +626,7 @@
     <Compile Include="绯荤粺鍏敤\ClsOA_EmpMessageBillModSub.cs" />
     <Compile Include="绯荤粺鍏敤\ClsOA_FieldToChangeMain.cs" />
     <Compile Include="绯荤粺鍏敤\ClsOA_FieldToChangeSub.cs" />
+    <Compile Include="绯荤粺鍏敤\ClsXt_BillSubType_Model.cs" />
     <Compile Include="绯荤粺鍏敤\ClsXt_BillType_Model.cs" />
     <Compile Include="绯荤粺鍏敤\ClsXt_ModuleParameterMain.cs" />
     <Compile Include="绯荤粺鍏敤\ClsXt_ModuleParameterSub.cs" />
@@ -700,6 +716,7 @@
     <Compile Include="杞﹂棿绠$悊\ClsSc_StationInBillSub.cs" />
     <Compile Include="杞﹂棿绠$悊\ClsSc_StationOutBillMain.cs" />
     <Compile Include="杞﹂棿绠$悊\ClsSc_StationOutBillSub.cs" />
+    <Compile Include="杞﹂棿绠$悊\ClsSc_StationOutBillSub_Emp.cs" />
     <Compile Include="杞﹂棿绠$悊\ClsSc_StationOutBillSub_Item.cs" />
     <Compile Include="杞﹂棿绠$悊\ClsSc_ABJJDMain.cs" />
     <Compile Include="杞﹂棿绠$悊\ClsWW_EntrustWorkOrderBillMain.cs" />

--
Gitblit v1.9.1