Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

wtt

2025-04-30 871cffb8bf30f1cf2c3103ef34406039696bb133

 WebTM/WebTM.csproj

@@ -172,7 +172,9 @@
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ConveyCompList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ConveyTypeList.html" />
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestItem.html" />
    <Content Include="views\Baseset\基础资料\Gy_ErrMsgBackType.html" />
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestSchemeBillList.html" />
    <Content Include="views\Baseset\基础资料\Gy_Shifts.html" />
    <Content Include="views\Baseset\基础资料\Gy_GroupList.html" />
    <Content Include="views\Baseset\基础资料\Gy_Source.html" />
@@ -413,6 +415,10 @@
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBillList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CheckNoteItem.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_EnvironmentTestItem.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_PiPe.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_PiPeMaterial.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Sb_EqiupMaterWorkTime.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ProjectMoneyClass.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_TechnologyParameterType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_MaintainLev.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_CheckItem_Excel.html" />
@@ -424,6 +430,11 @@
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QCCheckClass_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QualityStd_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BadPhenomena_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Sb_EqiupMaterWorkTime.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PiPe.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PiPeMaterial.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ProjectMoney_ClassTree.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ProjectMoneyClass.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_SupType_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EquipType_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CheckNoteItem_Excel.html" />
@@ -516,6 +527,7 @@
    <Content Include="views\应收管理\报表分析\Xs_OutDoorBillReport.html" />
    <Content Include="views\应收管理\报表分析\Xs_SellOutCompareToProductReport.html" />
    <Content Include="views\应收管理\报表分析\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
    <Content Include="views\应收管理\报表分析\YS_CusShouldIncomeMaterEntryReport.html" />
    <Content Include="views\条码明细\Kf_MateOutBillList_CodeDetail.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldLifeUsePicReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldDotCheckTaskReport.html" />
@@ -557,6 +569,8 @@
    <Content Include="views\模治具管理\模具调拨\Sc_MouldProdMoveBill_PDA.html" />
    <Content Include="views\模治具管理\模具采购入库单\Sc_MouldProdInBillList_PDA.html" />
    <Content Include="views\模治具管理\模具采购入库单\Sc_MouldProdInBill_PDA_old.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_Add_MouldLifeChangeBillList_PDA.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldLifeChangeBillList_PDA.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldDotCheckBill_PDA.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldDotCheckBill_PDA_OLD.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldMaintainBill_PDA.html" />
@@ -564,6 +578,10 @@
    <Content Include="views\模治具管理\模治具管理\Sc_MouldMaintainRuleBill_Excel.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_MouldMaintainRuleBillList_PDA.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatForm.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatFormImport_SS.html" />
    <Content Include="views\生产管理\宝工排产\Cg_PODemandPlanConfigBillReportForLack.html" />
    <Content Include="views\生产管理\宝工排产\Gy_RoutingBillReportForLack.html" />
    <Content Include="views\生产管理\宝工排产\JIT_NeedMaterPlanConfigBillReportForLack.html" />
    <Content Include="views\生产管理\宝工排产\JIT_PickUpCalculate_BaoGong.html" />
    <Content Include="views\生产管理\宝工排产\JIT_UnLockRequestBillList.html" />
    <Content Include="views\生产管理\宝工排产\JIT_UnLockRequestBill.html" />
@@ -656,10 +674,14 @@
    <Content Include="views\质量管理\基础建模\Gy_ErrType_Excel.html" />
    <Content Include="views\质量管理\基础建模\QC_SpcCenterlineList.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackSelfQuery_BGT.html" />
    <Content Include="views\质量管理\环境检测单\QC_EnvironmentTestDotCheckBillList_PDA.html" />
    <Content Include="views\质量管理\检验取样还样单\QC_Add_BackSampleCheckBill_PDA.html" />
    <Content Include="views\质量管理\检验取样还样单\QC_Add_TakeSampleCheckBill_PDA.html" />
    <Content Include="views\质量管理\检验取样还样单\QC_BackSampleCheckBillMainList_PDA.html" />
    <Content Include="views\质量管理\检验取样还样单\QC_TakeSampleCheckBillMainList_PDA.html" />
    <Content Include="views\质量管理\环境检测单\QC_EnvironmentTestDotCheckBillEdit.html" />
    <Content Include="views\质量管理\环境检测单\QC_EnvironmentTestDotCheckBillList.html" />
    <Content Include="views\质量管理\环境检测单\QC_EnvironmentTestDotCheckBillEdit_PDA.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityDailyReprot_Sum.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityDailyReprot.html" />
    <Content Include="views\质量管理\质量报表\QC_FiveMenOneRingList.html" />
@@ -2297,6 +2319,7 @@
    <Content Include="views\领料发货\委外补料\Kf_EntrustReplenishOutBill_Check_New.html" />
    <Content Include="views\领料发货\委外补料\Kf_EntrustReplenishOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Check.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast_XiaBao.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast_AR.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast_TK.html" />