From a91fdba94705dd25cecccc7a4a5dcc2b3f2c09a6 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 22 十二月 2025 16:16:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Model/Model.csproj | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 0a8a4e4..8a91ad2 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -97,15 +97,22 @@
<Compile Include="APS\ClsSc_ICMOChangeBillMain.cs" />
<Compile Include="APS\ClsSc_ICMOChangeBillSub.cs" />
<Compile Include="ClsGy_PatrolCheckItemMethod_Model.cs" />
+ <Compile Include="ClsGy_SteppedPriceCoefficientBillMain.cs">
+ <Generator>ClsGy_SteppedPriceCoefficientBillMain</Generator>
+ </Compile>
<Compile Include="MES\ClsSc_MESStopRestoreWorkBillMain.cs" />
<Compile Include="MES\ClsSc_MESStopRestoreWorkBillSub.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_TrolleyPositionBillMain.cs" />
<Compile Include="浠撳簱绠＄悊\ClsKf_TrolleyPositionBillSub.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_PurPrice_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_MatePrice_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsCg_ContractTransportBillSub.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_AssistantData.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_AssistantDataEntry.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Car_Model_2.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Driver_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_DiscountList.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsCg_ContractTransportBillMain.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_OperatorGroup.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsSc_PackUnionBillBarCode_temp_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_PatrolCheckItemClass_Model.cs" />
@@ -179,8 +186,14 @@
<Compile Include="鐢熶骇绠＄悊\鎺掍骇瑙ｉ攣鐢宠鍗昞ClsJIT_UnLockRequestBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\鎺掍骇閿佸畾鐢宠鍗昞ClsJIT_LockRequestBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\鎺掍骇閿佸畾鐢宠鍗昞ClsJIT_LockRequestBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldOutRequestBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldOutRequestBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainPlanBillSub_Plan.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsGy_QCVerificationBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsGy_QCVerificationBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldInRequestBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMoveStockRequestBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldInRequestBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMoveStockRequestBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\鐢熶骇棰嗘枡\ClsKf_ProductReceiveMaterialBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\鐢熶骇棰嗘枡\ClsKf_ProductReceiveMaterialBillSub.cs" />
@@ -200,6 +213,9 @@
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipRepairSignBillSub.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_LastPieceCheckBillSub_ValueGrid.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_OutCompCheckBillSub_ValueGrid.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_LastPieceCheckBillSub_BadReason.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_OutCompCheckBillSub_BadReason.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_POStockInCheckBillSub_BadReason.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_POStockInCheckBillSub_ValueGrid.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_TakeSampleCheckBillMain.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_TakeSampleCheckBillSub.cs" />
@@ -933,6 +949,9 @@
<Compile Include="閲囪喘绠＄悊\ClsCg_InvoiceSpecBillSub.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="閲囪喘绠＄悊\ClsCg_OrderTransportBillSub_Model.cs" />
+ <Compile Include="閲囪喘绠＄悊\ClsCg_OrderTransportBillSub_Money_Model.cs" />
+ <Compile Include="閲囪喘绠＄悊\ClsCg_OrderTransportBill_Model.cs" />
<Compile Include="閲囪喘绠＄悊\ClsCg_POInStockBackBillMain.cs">
<SubType>Code</SubType>
</Compile>
@@ -1143,8 +1162,10 @@
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_LadingBillSub.cs" />
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_ShippingAdviceBillMain.cs" />
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_ShippingAdviceBillSub.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsGy_MaterialPackingRelationSub.cs" />
<Compile Include="椤圭洰绠＄悊\ClsGy_ProjectMoneyBOMBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsGy_ProjectMoneyBOMBillSub.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsGy_MaterialPackingRelationMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_ProjectEndBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_ProjectBeginBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_ProjectEndBillSub.cs" />
--
Gitblit v1.9.1