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

zrg

2024-08-13 ba1fb184917b1651221a6decf1144911ff489f86

 WebTM/WebTM.csproj

@@ -252,6 +252,7 @@
    <Content Include="views\video\1.wav" />
    <Content Include="views\video\jingbao.wav" />
    <Content Include="views\video\success.wav" />
    <Content Include="views\WMS扫码模块\三点照合扫码记录单\WMS_CusBarCodeCheckBill_PDA.html" />
    <Content Include="views\WMS扫码模块\上料防错单\Sc_MaterToSourceBill_PDA.html" />
    <Content Include="views\WMS扫码模块\上料防错单\Sc_MaterToSourceBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBackBillList_PDA.html" />
@@ -310,6 +311,7 @@
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_QiaoYi_PDA.html" />
    <Content Include="views\人事管理\异常反馈单\OA_ErrMsgBackBillList_PDA.html" />
    <Content Include="views\人事管理\异常反馈单\OA_ErrMsgBackBill_PDA.html" />
    <Content Include="views\仓存管理\三点照合扫码记录单\WMS_CusBarCodeCheckBillList.html" />
    <Content Include="views\仓存管理\仓库调拨\Add_Edit_Kf_MoveStockBill.html" />
    <Content Include="views\仓存管理\分步式调入单\Fb_StepFoldinBillEdit.html" />
    <Content Include="views\仓存管理\条码库存\KF_PonderationBillMain_Temp.html" />
@@ -372,6 +374,7 @@
    <Content Include="views\基础资料\隐藏列设置\Gy_GridView_Hide_New.html" />
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBill.html" />
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBillList.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldLifeUsePicReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldDotCheckTaskReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldMaintainTaskReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldRepairCheckTaskReport.html" />
@@ -411,6 +414,8 @@
    <Content Include="views\生产管理\异常反馈单\Sc_MESExecptFeedBackBillType.html" />
    <Content Include="views\生产管理\报工台工序\开工\Sc_SwipeCardStart.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillOrProcessExchangeResumeList.html" />
    <Content Include="views\生产管理\生产报表\Sc_ProductionInProgressReport.html" />
    <Content Include="views\生产管理\生产报表\Sc_NutInspectionCCDPassRate.html" />
    <Content Include="views\生产管理\生产报表\Sc_QualityReportBillMonth.html" />
    <Content Include="views\生产管理\生产报表\Sc_QualityReportBillDay.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm_BCP.html" />
@@ -429,11 +434,15 @@
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBillList_PDA.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBill_PDA.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipDotCheckTaskReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairMonthSumReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipMaintainTaskReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairCheckTaskReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipMaintainMonthSumReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairTaskReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipResumeCheckQuery.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairReport.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRule_Excel.html" />
    <Content Include="views\质量管理\巡检记录单\MES_QC_PatrolProcCheckOtherBillList_PDA.html" />
    <Content Include="views\质量管理\工作联系单\OA_WorkLinkSelfQuery.html" />
    <Content Include="views\质量管理\工作联系单\OA_Add_Edit_WorkLinkBill.html" />
    <Content Include="views\质量管理\工作联系单\OA_WorkLinkBillList.html" />
@@ -447,7 +456,27 @@
    <Content Include="views\质量管理\检验取样还样单\QC_BackSampleCheckBillMainList.html" />
    <Content Include="views\质量管理\检验取样还样单\QC_TakeSampleCheckBillMainList.html" />
    <Content Include="views\质量管理\检验取样还样单\QC_Add_TakeSampleCheckBill.html" />
    <Content Include="views\质量管理\质量报表\QC_ErrManagerLedgerReport_EquipTop3Issue.html" />
    <Content Include="views\质量管理\质量报表\QC_ErrManagerLedgerReport_Issue.html" />
    <Content Include="views\质量管理\质量报表\QC_ErrManagerLedgerReport_SourceOfTheProblem.html" />
    <Content Include="views\质量管理\质量报表\QC_ErrManagerLedgerReport_Source.html" />
    <Content Include="views\质量管理\质量报表\QC_ErrMsgBackBillList.html" />
    <Content Include="views\质量管理\质量报表\QC_BadProductsReport.html" />
    <Content Include="views\质量管理\质量报表\QC_InspectionFormReport.html" />
    <Content Include="views\质量管理\质量报表\QC_MoistureContentDataLedger.html" />
    <Content Include="views\质量管理\质量报表\QC_PerformanceScrapLedger.html" />
    <Content Include="views\质量管理\质量报表\QC_ProcessPerformancePass.html" />
    <Content Include="views\质量管理\质量报表\QC_ErrManagerLedgerReport.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityStatisticsDailyReport.html" />
    <Content Include="views\质量管理\质量报表\QC_RegistrationForTestingReport.html" />
    <Content Include="views\质量管理\质量报表\QC_MoistureContentDataLedger.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityStatisticsDailyReport.html" />
    <Content Include="views\质量管理\质量报表\QC_TechnologyParameterClass.html" />
    <Content Include="views\质量管理\质量报表\SB_TechnologyParameterList.html" />
    <Content Include="views\质量管理\质量报表\QC_ProcessPerformanceFirstPass.html" />
    <Content Include="views\质量管理\质量报表\Sc_StationOutBil_HProc.html" />
    <Content Include="views\质量管理\质量月度目标单\QC_MonthTarGetBill.html" />
    <Content Include="views\质量管理\质量月度目标单\QC_MonthTarGetBillList.html" />
    <Content Include="views\质量管理\车间自检单\QC_Add_Edit_WorkSelfCheckBill.html" />
    <Content Include="views\质量管理\车间自检单\QC_WorkSelfCheckBillList.html" />
    <Content Include="views\车间管理\产线\222.jpg" />
@@ -472,6 +501,7 @@
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBillList.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBill.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBillList.html" />
    <Content Include="views\质量管理\巡检记录单\MES_QC_PatrolProcCheckOtherBill_PDA.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillList_Source.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeArrangement_PG.html" />
    <Content Include="views\车间管理\报表分析\Cj_SPCOscillationCurve.html" />
@@ -483,6 +513,8 @@
    <Content Include="views\车间管理\报表分析\Sc_ProductedRateReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_HMaterYieldStatisticsList.html" />
    <Content Include="views\车间管理\报表分析\Sc_RetentionTimeReport.html" />
    <Content Include="views\车间管理\车间在制品期初单\CJ_WIPBeginStockBill.html" />
    <Content Include="views\车间管理\车间在制品期初单\CJ_WIPBeginStockBillList.html" />
    <Content Include="views\车间管理\防错验证\Gy_MaterPreventErrMouldBill.html" />
    <Content Include="views\车间管理\防错验证\Gy_MaterPreventErrMouldBillList.html" />
    <Content Include="views\车间管理\防错验证\Qc_PreventErrMouldCheckBill.html" />