From 175f31386e47b1ca2c751b8f87cd7a089c66e7ae Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 25 八月 2023 16:55:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/Model/Model.csproj b/Model/Model.csproj
index e169de9..db8e158 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" />
@@ -448,6 +449,7 @@
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TechnologyParameter_Model.cs" />
     <Compile Include="鎴愭湰绠$悊\ClsKf_ICBal.cs" />
     <Compile Include="鎴愭湰绠$悊\ClsKf_WIPBal.cs" />
+    <Compile Include="鐢熶骇绠$悊\ClsGy_SourceWorkStationSet.cs" />
     <Compile Include="鐢熶骇绠$悊\ClsSc_ChangeNoteBillMain.cs" />
     <Compile Include="鐢熶骇绠$悊\ClsSc_ChangeNoteBillSub.cs" />
     <Compile Include="鐢熶骇绠$悊\ClsSc_MateWasterRequestBillMain.cs" />
@@ -505,6 +507,7 @@
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsGy_MouldRoutingBillMain.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsGy_MouldRoutingBillSub.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSb_MouldRepairWorkBillMain.cs" />
+    <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSb_MouldRepairWorkBillSub_Item.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSb_MouldRepairWorkBillSub.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldBorrowInBillMain.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldBorrowInBillSub.cs" />
@@ -524,6 +527,8 @@
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldDotCheckBillMain.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldDotCheckBillSub.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldDotCheckPlanBillMain.cs" />
+    <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldDotCheckBillSub_Item.cs" />
+    <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldDotCheckPlanBillSub_Item.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldDotCheckPlanBillSub.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldDotCheckRuleBillMain.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldDotCheckRuleBillSub.cs" />
@@ -542,6 +547,7 @@
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldMaintainPlanBillSub.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldMaintainRuleBillMain.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldMaintainRuleBillSub.cs" />
+    <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldDotCheckRuleBillSub_Item.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldMaintainRuleBillSub_Item.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldMoveStockStepOutBillSub.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldMoveStockStepOutBillMain.cs" />
@@ -575,6 +581,18 @@
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldStockBillSub.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipConkBookBillMain.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipConkBookBillSub.cs" />
+    <Compile Include="璐ㄦ绠$悊\ClsQC_FirstPieceCheckBillSub_ValueGrid.cs" />
+    <Compile Include="璐ㄦ绠$悊\ClsQC_ProcessCheckBillSub_ValueGrid.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" />
@@ -600,6 +618,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" />
@@ -607,6 +629,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" />
@@ -696,6 +719,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