From 8b83671f3d3369e6313313a1b3fefdf5b6c0252f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 24 四月 2024 14:10:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 4dd4aa4..b641838 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -80,18 +80,35 @@
     <Compile Include="ClsPay_EarlyLateErrBill.cs" />
     <Compile Include="ClsPay_RewardPunishBill.cs" />
     <Compile Include="ClsPay_WorkErrTimesBill.cs" />
+    <Compile Include="ClsPM_ProjectEndBillMain.cs" />
+    <Compile Include="ClsPM_ProjectBeginBillMain.cs" />
+    <Compile Include="ClsPM_ProjectMoneyBillMain.cs" />
+    <Compile Include="ClsPM_CustomerTaskBillMain.cs" />
+    <Compile Include="ClsGy_MaterialMouldBillMain.cs" />
     <Compile Include="ClsPM_WorkPlanMonthBillMain.cs" />
     <Compile Include="MES\ClsSc_SourceLineRepairBill.cs" />
     <Compile Include="MES\ClsSc_MESMaterToSourceBill .cs" />
     <Compile Include="浜轰簨绠$悊\ClsHR_EmpFosterBill.cs" />
     <Compile Include="浜轰簨绠$悊\ClsHR_EmpUpChangeBill.cs" />
+    <Compile Include="浠撳簱绠$悊\ClsSc_ProductionReturnBill.cs" />
+    <Compile Include="浠撳簱绠$悊\ClsKf_StepFoldInBill.cs" />
+    <Compile Include="浠撳簱绠$悊\ClsKf_StepFoldOutBill.cs" />
     <Compile Include="浠撳簱绠$悊\ClsKf_SellOutBillForLayUI.cs" />
     <Compile Include="浠撳簱绠$悊\鏉$爜绠$悊\ClsGy_BarCodeBill_ChaiMa.cs" />
     <Compile Include="浠撳簱绠$悊\鏉$爜绠$悊\ClsKF_BarCodeStatusChangeBill.cs" />
+    <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackCheckBill.cs" />
+    <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackHandleBill.cs" />
+    <Compile Include="淇℃伅骞冲彴\ClsOA_AndengFlowRuleBill.cs" />
+    <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackSignBill.cs" />
+    <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackReceiveBill.cs" />
     <Compile Include="鍩虹璧勬枡\InterFace鍩虹璧勬枡\ClsIF_ORGANIZATIONS_View.cs" />
     <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_BadType_Ctl.cs" />
+    <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_CardChangeType_Ctl.cs" />
+    <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_CardStatus_Ctl.cs" />
+    <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_CardAddress_Ctl.cs" />
     <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_CustLocation_Ctl.cs" />
     <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_EquipStatus_Ctl.cs" />
+    <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_CardType_Ctl.cs" />
     <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_MouldStatus_Ctl.cs" />
     <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Operator_Ctl.cs" />
     <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RateType_Ctl.cs" />
@@ -111,6 +128,8 @@
     <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_QCCheckProject_View.cs" />
     <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_StdWorkTimes_Ctl.cs" />
     <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_SupMaterial_Ctl.cs" />
+    <Compile Include="宸ヨ祫绠$悊\ClsHR_EmployeeSkillBill.cs" />
+    <Compile Include="宸ヨ祫绠$悊\ClsHR_PostSkillBill.cs" />
     <Compile Include="婧愬崟\ERP婧愬崟\Cls_S_Sc_ABJJD.cs" />
     <Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOBillList.cs" />
     <Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ProcessReportBillList.cs" />
@@ -615,6 +634,8 @@
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldStatusChangeBill.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsGy_EquipFileMain.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsGy_EquipTypeBill.cs" />
+    <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsGy_FixCardChangeBill.cs" />
+    <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsGy_FixCardBill.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipWorkBeforeCheckBill.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipStockInCheckBill.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipSparepartsBill.cs" />
@@ -624,6 +645,11 @@
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\璁惧鎶曚骇\ClsSb_EquipWorkBeforeCheckBill.cs" />
     <Compile Include="绯荤粺鍏敤\ClsXt_SystemParameter_Ctl.cs" />
     <Compile Include="绯荤粺鍏敤\ClsXt_BillSubType_Ctl.cs" />
+    <Compile Include="璁″垝绠$悊\ClsGy_MaterialTechParamBillMain.cs" />
+    <Compile Include="璐ㄦ绠$悊\ClsQC_NoPassProdConclusionBill.cs" />
+    <Compile Include="璐ㄦ绠$悊\ClsQC_NoPassProdDisposeCheckBill.cs" />
+    <Compile Include="璐ㄦ绠$悊\ClsQC_NoPassProdDisposeBill.cs" />
+    <Compile Include="璐ㄦ绠$悊\ClsQC_NoPassProdRequestBill.cs" />
     <Compile Include="璐ㄦ绠$悊\ClsQC_FirstPieceCheckBill.cs" />
     <Compile Include="璐ㄦ绠$悊\ClsQC_LastPieceCheckBill.cs" />
     <Compile Include="璐ㄦ绠$悊\ClsQC_NoPassProdCheckBill.cs" />
@@ -751,7 +777,9 @@
     <Compile Include="杞﹂棿绠$悊\ClsSc_ProcExchQualityReport.cs" />
     <Compile Include="杞﹂棿绠$悊\ClsSc_ProcExchReport.cs" />
     <Compile Include="閿�鍞鐞哱ClsKf_ICStockBackBill.cs" />
+    <Compile Include="閿�鍞鐞哱ClsXs_SellOutChangeBill.cs" />
     <Compile Include="閿�鍞鐞哱ClsXs_ReceivableBill.cs" />
+    <Compile Include="閿�鍞鐞哱ClsXs_OutDoorCheckBill.cs" />
     <Compile Include="閿�鍞鐞哱ClsXs_SeOrderChangeBill.cs" />
     <Compile Include="閿�鍞鐞哱ClsXs_ExceptiveCheckRequestBill.cs" />
     <Compile Include="閿�鍞鐞哱ClsXs_ContractBill.cs" />

--
Gitblit v1.9.1