From 7c6dbc2da5bea1fa7b45a4c1fdaa26fc1be16be8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 18 九月 2023 08:41:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 4485d58..02540f7 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -141,6 +141,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_TechParameterUnitList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_StockPlaceListNew.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_UnitGroup.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_CustomerListNew.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WarehouseListNew.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WasterWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_WHList.html" />
@@ -205,6 +206,7 @@
<Content Include="views\video\1.wav" />
<Content Include="views\video\jingbao.wav" />
<Content Include="views\video\success.wav" />
+ <Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鍒犳墭鍗昞Sc_DeletePackUnionBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBill_PDA.html" />
@@ -222,11 +224,15 @@
<Content Include="views\浜轰簨绠＄悊\绂昏亴鐢宠\HR_EmpDimissionBillList.html" />
<Content Include="views\浜轰簨绠＄悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBill.html" />
<Content Include="views\浜轰簨绠＄悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBillList.html" />
+ <Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
+ <Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_TemporaryArea.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterTypeEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TemporaryArea.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint_GXPG.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeArrangement.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_MateOutBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_OtherOutBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_WarehouseList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_EmployeeList.aspx" />
@@ -235,6 +241,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPrice.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceList.html" />
+ <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Souce_Excel.html" />
<Content Include="views\宸ヨ祫绠＄悊\鍔犵彮鐢宠\Pay_OverApplyBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鍔犵彮鐢宠\Pay_OverApplyBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\瀹氶鐢宠\Pay_ProcPriceRequestBill.html" />
@@ -271,6 +278,7 @@
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillListQuery.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillList_His.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillSubList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_BrushingOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎缁勮杩芥函\Cj_AssemblyTraceability.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎缁勮杩芥函\Cj_AssemblyTraceabilityList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillSubList.html" />
@@ -286,9 +294,22 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗WW_EntrustWorkOrderBillEdit.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗WW_EntrustWorkOrderBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBillSubList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ColorBlankLustringOutReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_FinalizeOutReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_FinalizeTheDesignOutReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_LustringOutReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_LustringReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ShrinkBrushOutReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ShrinkBrushReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_DigitalSprayPaintingReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_DryFinalizeOutReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_HairtipReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessEntryReport_DyeColor.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessSumReport_DyeColor.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessSumReport_DyeColor_third.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ShrinkBrushTeReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_SizingFinalizeOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\SC_DayRkReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_ICOMProBarCodeReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\sc_ICOMReport.html" />
@@ -438,6 +459,8 @@
<Content Include="views\grf\鍑哄簱鐮佸崟.grf" />
<Content Include="views\grf\娴佽浆鍗�.grf" />
<Content Include="views\grf\cs10.grf" />
+ <Content Include="views\grf\鎸囧紩鍗�1.grf" />
+ <Content Include="views\grf\鐢熶骇棰嗘枡鍗�.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -1329,6 +1352,9 @@
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBill.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBill.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBillList.html" />
+ <Content Include="views\椤圭洰绠＄悊\鎶ヨ〃鍒嗘瀽\PM_WorkTaskReportMonthSumReport.html" />
+ <Content Include="views\椤圭洰绠＄悊\鎶ヨ〃鍒嗘瀽\PM_ProjectWorkDaysSumReport.html" />
+ <Content Include="views\椤圭洰绠＄悊\鎶ヨ〃鍒嗘瀽\PM_ProjectWorkDaysEntryReport.html" />
<Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\Add_Edit_Gy_ProjectStage.html" />
<Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\Gy_ProjectStage.html" />
<Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\PM_ProjectReportBillList.html" />
@@ -1493,6 +1519,20 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx.designer.cs">
<DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeArrangement.aspx.cs">
+ <DependentUpon>xmlLBM_Sc_ProcessExchangeArrangement.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeArrangement.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Sc_ProcessExchangeArrangement.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_MateOutBillList.aspx.cs">
+ <DependentUpon>xmlLBM_Kf_MateOutBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_MateOutBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Kf_MateOutBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_OtherOutBillList.aspx.cs">
<DependentUpon>xmlLBM_Kf_OtherOutBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1