From 096f0a528fc003ad60d50155af11a40d14b9f0d9 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 12 十二月 2023 13:34:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/DAL.csproj | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 3ef8b22..ee91c8b 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -75,15 +75,27 @@
</ItemGroup>
<ItemGroup>
<Compile Include="APS\ClsSc_WorkBillMonthSortBill.cs" />
+ <Compile Include="APS\ClsSc_ICMOChangeBill.cs" />
<Compile Include="ClsPay_AbsentBill.cs" />
<Compile Include="ClsPay_EarlyLateErrBill.cs" />
<Compile Include="ClsPay_RewardPunishBill.cs" />
<Compile Include="ClsPay_WorkErrTimesBill.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="浠撳簱绠＄悊\ClsKf_SellOutBillForLayUI.cs" />
<Compile Include="浠撳簱绠＄悊\鏉＄爜绠＄悊\ClsGy_BarCodeBill_ChaiMa.cs" />
+ <Compile Include="浠撳簱绠＄悊\鏉＄爜绠＄悊\ClsKF_BarCodeStatusChangeBill.cs" />
<Compile Include="鍩虹璧勬枡\InterFace鍩虹璧勬枡\ClsIF_ORGANIZATIONS_View.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_BadType_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_CustLocation_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_EquipStatus_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_MouldStatus_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Operator_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RateType_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Staff_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_TaxMIX_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_TaxRate_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RecCondition_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_FactoryDayOff_Ctl.cs" />
@@ -92,9 +104,11 @@
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_PaymentCondition_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_SupplierContact_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_StockStatus_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Work_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_MateMould_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_QCCheckProject_View.cs" />
<Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_StdWorkTimes_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏朵粬鍩虹璧勬枡\ClsGy_SupMaterial_Ctl.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" />
@@ -566,6 +580,7 @@
<Compile Include="婧愬崟\閲戣澏婧愬崟\Cls_S_Sc_ICMOBillList_K3.cs" />
<Compile Include="婧愬崟\閲戣澏婧愬崟\Cls_S_K3_EntrustInBillList.cs" />
<Compile Include="婧愬崟\閲戣澏婧愬崟\Cls_S_KF_ChangeBoxBillList.cs" />
+ <Compile Include="鐢熶骇绠＄悊\ClsGy_SourceWorkStationSet.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_ChangeNoteBill.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_WIPStockChangeBill.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_WIPStockCheckBill.cs" />
@@ -588,12 +603,24 @@
<Compile Include="鐢熶骇绠＄悊\妫�鍏风鐞哱ClsSc_CheckToolsOutBill.cs" />
<Compile Include="鐢熶骇绠＄悊\妫�鍏风鐞哱ClsSc_CheckToolsRepairCheckBill.cs" />
<Compile Include="鐢熶骇绠＄悊\妫�鍏风鐞哱ClsSc_CheckToolsRepairWorkBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldLifeUseBill.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldPOContractBill.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsGy_MouldProdBillofMaterBill.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsGy_MouldProdBOMChangeBill.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldProdOutInBill.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldRepairInBill.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldRepairOutBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldStatusChangeBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsGy_EquipFileMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsGy_EquipTypeBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipWorkBeforeCheckBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipStockInCheckBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipSparepartsBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipSparepartsChangeBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\璁惧鎶曚骇\ClsSb_EquipStockInCheckBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipStatusChangeBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\璁惧鎶曚骇\ClsSb_EquipWorkBeforeCheckBill.cs" />
+ <Compile Include="绯荤粺鍏敤\ClsXt_BillSubType_Ctl.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_FirstPieceCheckBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_LastPieceCheckBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_NoPassProdCheckBill.cs" />
@@ -602,6 +629,10 @@
<Compile Include="璐ㄦ绠＄悊\ClsQC_POStockInCheckBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_ProcessCheckBill.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_ProdReportCheckBill.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsCrm_CustomerAppealBill.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchRecordBackBill.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchSendWorkBill.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchWorkBackBill.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_CutMaterProcExchBill.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_MaterBackBill.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_MaterDownBill.cs" />
@@ -715,6 +746,8 @@
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcessPlanChangeSec.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchQualityReport.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ProcExchReport.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_SeOrderChangeBill.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_ExceptiveCheckRequestBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_ContractBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_CreditChangeBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_CusStatusChangeBill.cs" />
@@ -725,6 +758,7 @@
<Compile Include="閿�鍞鐞哱ClsXs_SeDownStockBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SellPlanBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SellPlanExecuteBill.cs" />
+ <Compile Include="閿�鍞鐞哱ClsXs_SeOutStockBackBillForLayUI.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SeProdPlanBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SeQuotationBill.cs" />
<Compile Include="閿�鍞鐞哱ClsXs_SeQuotation_ccjgBill.cs" />
@@ -739,6 +773,7 @@
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_CustomsSplitPackBill.cs" />
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_LadingBill.cs" />
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_ShippingAdviceBill.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsPM_WorkTaskWeekBill.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPro_DesignBlueRequestBill.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPro_ProjectCheckBill.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPro_ProjectRequestBill.cs" />
--
Gitblit v1.9.1