From 4ec68e6c86410cc5b932e6c964e8c88ba49a54da Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 30 十二月 2025 11:00:26 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 DAL/DAL.csproj |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index efd183c..ec5e9b6 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -80,8 +80,13 @@
   <ItemGroup>
     <Compile Include="APS\ClsSc_WorkBillMonthSortBill.cs" />
     <Compile Include="APS\ClsSc_ICMOChangeBill.cs" />
+    <Compile Include="ClsGy_MaterialPackingRelation.cs" />
     <Compile Include="MES\ClsSc_MESStopRestoreWorkBill.cs" />
+    <Compile Include="WLGL\ClsCg_CarTrajectoryBill.cs" />
     <Compile Include="浠撳簱绠$悊\灏忚溅閿佸畾\ClsKf_TrolleyPositionBill.cs" />
+    <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Driver_Ctl.cs" />
+    <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Car_Ctl_2.cs" />
+    <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsCg_ContractTransportBillList.cs" />
     <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_PatrolCheckItemMethod_Ctl.cs" />
     <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_PatrolCheckItemClass_Ctl.cs" />
     <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_MaintainClass_Ctl.cs" />
@@ -89,6 +94,7 @@
     <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RepairCheckClass_Ctl.cs" />
     <Compile Include="浠撳簱绠$悊\ClsKf_ProductReceiveMaterialBill.cs" />
     <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_MatePrice_Ctl.cs" />
+    <Compile Include="宸ヨ祫绠$悊\ClsGy_SteppedPriceCoefficientBill .cs" />
     <Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOBillList_CusBarCodeBill_KaiBei.cs" />
     <Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_MoveStockRequestBillList.cs" />
     <Compile Include="鐢熶骇绠$悊\ClsSc_ShiftsBeginInfoBill.cs" />
@@ -108,6 +114,10 @@
     <Compile Include="鐢熶骇绠$悊\瀹㈡埛鏍囩\ClsSc_CustomerTagInfo.cs" />
     <Compile Include="鐢熶骇绠$悊\鎺掍骇瑙i攣鐢宠鍗昞ClsJIT_UnLockRequestBill.cs" />
     <Compile Include="鐢熶骇绠$悊\鎺掍骇閿佸畾鐢宠鍗昞ClsJIT_LockRequestBill.cs" />
+    <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldOutRequestBill.cs" />
+    <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldInRequestBill.cs" />
+    <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsGy_QCVerificationBillMain.cs" />
+    <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldMoveStockRequestBill.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipPatrolCheckPlanBill.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipPatrolCheckBill.cs" />
     <Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSet.cs" />
@@ -737,6 +747,7 @@
     <Compile Include="閲囪喘绠$悊\ClsCg_InvoiceSpecBill.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="閲囪喘绠$悊\ClsCg_OrderTransportBill_Ctl.cs" />
     <Compile Include="閲囪喘绠$悊\ClsCg_POInStockBackBill.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -1287,6 +1298,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="A3鍗曟嵁\" />
+    <Folder Include="Model\" />
     <Folder Include="鍩虹璧勬枡\A3鍩虹璧勬枡\" />
     <Folder Include="鍩虹璧勬枡\CLOUD鍩虹璧勬枡\" />
     <Folder Include="鍩虹璧勬枡\鐗规畩绯荤粺\" />

--
Gitblit v1.9.1