From abf59bc386d65013b4782eb0b3af463457dbe968 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 12 三月 2024 09:23:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Model/Model.csproj | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 64f0e80..7d5f886 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -104,6 +104,7 @@
<Compile Include="ClsPay_RewardPunishBillSub.cs" />
<Compile Include="ClsPay_WorkErrTimesBillMain.cs" />
<Compile Include="ClsPay_WorkErrTimesBillSub.cs" />
+ <Compile Include="ClsGy_MaterialMouldBillSub.cs" />
<Compile Include="ClsXt_PrintBill_Model.cs" />
<Compile Include="CRM\ClsCrm_ClueBillMain.cs" />
<Compile Include="CRM\ClsCrm_ClueBillSub.cs" />
@@ -339,6 +340,8 @@
<SubType>Code</SubType>
</Compile>
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_BadResult_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CardAddress_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CardType_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_StockCheckItem_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_InspectInstruMent_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_InspectBasis_Model.cs" />
@@ -460,6 +463,7 @@
<Compile Include="宸ヨ祫绠＄悊\ClsPay_SubsidyChangeBillSub.cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsPay_SumBalBillMain .cs" />
<Compile Include="宸ヨ祫绠＄悊\ClsPay_SumBalBillSub.cs" />
+ <Compile Include="搴旀敹绠＄悊\ClsYS_ReceiveOtherBillSub.cs" />
<Compile Include="鎴愭湰绠＄悊\ClsCB_ChangeMoneyBillMain.cs" />
<Compile Include="鎴愭湰绠＄悊\ClsCB_ChangeMoneyBillSub.cs" />
<Compile Include="鎴愭湰绠＄悊\ClsCB_EntrustMoneyCost_M.cs" />
@@ -609,6 +613,8 @@
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipConkBookBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipConkBookBillSub.cs" />
<Compile Include="绯荤粺鍏敤\ClsXt_SystemParameter_Model.cs" />
+ <Compile Include="璁″垝绠＄悊\ClsGy_MaterialTechParamBillSub.cs" />
+ <Compile Include="璁″垝绠＄悊\ClsGy_MaterialTechParamBillMain.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsSc_ProcessExchangeBillMain_Note.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_FirstPieceCheckBillSub_ValueGrid.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_PatrolProcCheckBillSub_BadReason.cs" />
@@ -939,6 +945,8 @@
<Compile Include="閲戣澏鍗曟嵁\閿�鍞鐞哱ClsXs_SeOutStockBackBillSub_K3.cs" />
<Compile Include="閲戣澏鍗曟嵁\閿�鍞鐞哱ClsXs_SeOutStockBillMain_K3.cs" />
<Compile Include="閲戣澏鍗曟嵁\閿�鍞鐞哱ClsXs_SeOutStockBillSub_K3.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_SellOutChangeBillSub.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_SellOutChangeBillMain.cs" />
<Compile Include="閿�鍞鐞哱ClsKf_ICStockBackBillMain.cs" />
<Compile Include="閿�鍞鐞哱ClsKf_ICStockBackBillSub.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_ReceivableBillSub.cs" />
@@ -991,6 +999,7 @@
<Compile Include="椤圭洰绠＄悊\ClsPM_ProjectMoneyBillSub.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_ProjectMoneyBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_CustomerTaskBillMain.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsGy_MaterialMouldBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_WorkPlanMonthBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_CustomerTaskBillSub.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_WorkReportWeekBillSub.cs" />
@@ -1219,7 +1228,6 @@
<Compile Include="搴旀敹绠＄悊\ClsYS_ReceiveBillMain.cs" />
<Compile Include="搴旀敹绠＄悊\ClsYS_ReceiveBillSub.cs" />
<Compile Include="搴旀敹绠＄悊\ClsYS_ReceiveOtherBillMain.cs" />
- <Compile Include="搴旀敹绠＄悊\ClsYS_ReceiveOtherBillSub.cs" />
<Compile Include="搴旀敹绠＄悊\ClsYS_ReceiveShouldBillMain.cs" />
<Compile Include="搴旀敹绠＄悊\ClsYS_ReceiveShouldBillSub.cs" />
<Compile Include="璁″垝绠＄悊\ClsGy_ICBomBillMain.cs" />
--
Gitblit v1.9.1