From 0cbc2bca2eac01cf0985f8c8019782e4ddbbefff Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 01 七月 2024 17:23:43 +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 05b83cd..b2b2d6f 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -647,12 +647,17 @@
     <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsGy_FixCardBillMain.cs" />
     <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsGy_FixCardBillSub_Emp.cs" />
     <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipBeginBillMain.cs" />
+    <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSB_EquipICMOTechParamBillMain.cs" />
+    <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSB_EquipICMOTechParamBillSub.cs" />
     <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipStopBillMain.cs" />
     <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipBeginBillSub.cs" />
     <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipStopBillSub.cs" />
     <Compile Include="绯荤粺鍏敤\ClsXt_SystemParameter_Model.cs" />
     <Compile Include="璁″垝绠＄悊\ClsGy_MaterialTechParamBillSub.cs" />
     <Compile Include="璁″垝绠＄悊\ClsGy_MaterialTechParamBillMain.cs" />
+    <Compile Include="璐ㄦ绠＄悊\ClsQC_PatrolProcCheckOtherBillMain.cs" />
+    <Compile Include="璐ㄦ绠＄悊\ClsQC_PatrolProcCheckOtherBillSub.cs" />
+    <Compile Include="璐ㄦ绠＄悊\ClsQC_PatrolProcCheckOtherBillSub_ValueGrid.cs" />
     <Compile Include="璐ㄦ绠＄悊\ClsQC_WorkSelfCheckBillMain.cs" />
     <Compile Include="璐ㄦ绠＄悊\ClsQC_StockCheckBillMain.cs" />
     <Compile Include="璐ㄦ绠＄悊\ClsQC_WorkSelfCheckBillSub.cs" />
@@ -675,9 +680,11 @@
     <Compile Include="璐ㄦ绠＄悊\ClsCrm_CustomerAppealBillMain.cs" />
     <Compile Include="杞﹂棿绠＄悊\ClsGy_MaterPreventErrMouldBillMain.cs" />
     <Compile Include="杞﹂棿绠＄悊\ClsQc_PreventErrMouldCheckBillMain.cs" />
+    <Compile Include="杞﹂棿绠＄悊\ClsGy_WorkBeginDotCheckListBillMain.cs" />
     <Compile Include="杞﹂棿绠＄悊\ClsSc_WorkBeginDotCheckBillMain.cs" />
     <Compile Include="杞﹂棿绠＄悊\ClsGy_MaterPreventErrMouldBillSub.cs" />
     <Compile Include="杞﹂棿绠＄悊\ClsQc_PreventErrMouldCheckBillSub.cs" />
+    <Compile Include="杞﹂棿绠＄悊\ClsGy_WorkBeginDotCheckListBillSub.cs" />
     <Compile Include="杞﹂棿绠＄悊\ClsSc_WorkBeginDotCheckBillSub.cs" />
     <Compile Include="杞﹂棿绠＄悊\Sc_AssemblyBill_BindSourceTemp.cs" />
     <Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchRecordBackBillMain.cs" />
@@ -1051,10 +1058,14 @@
     <Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_LadingBillSub.cs" />
     <Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_ShippingAdviceBillMain.cs" />
     <Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_ShippingAdviceBillSub.cs" />
+    <Compile Include="椤圭洰绠＄悊\ClsGy_ProjectMoneyBOMBillMain.cs" />
+    <Compile Include="椤圭洰绠＄悊\ClsGy_ProjectMoneyBOMBillSub.cs" />
     <Compile Include="椤圭洰绠＄悊\ClsPM_ProjectEndBillMain.cs" />
     <Compile Include="椤圭洰绠＄悊\ClsPM_ProjectBeginBillMain.cs" />
     <Compile Include="椤圭洰绠＄悊\ClsPM_ProjectEndBillSub.cs" />
     <Compile Include="椤圭洰绠＄悊\ClsPM_ProjectBeginBillSub.cs" />
+    <Compile Include="椤圭洰绠＄悊\ClsGy_WorkTaskMoneyBOMBillMain.cs" />
+    <Compile Include="椤圭洰绠＄悊\ClsGy_WorkTaskMoneyBOMBillSub.cs" />
     <Compile Include="椤圭洰绠＄悊\Cls锘縋M_WorkTaskMoneyBillMain.cs" />
     <Compile Include="椤圭洰绠＄悊\ClsPM_WorkTaskMoneyBillSub.cs" />
     <Compile Include="椤圭洰绠＄悊\ClsPM_ProjectMoneyBillSub.cs" />

--
Gitblit v1.9.1