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

yusijie

2025-06-29 48af8ea4941dbc482b5b50c6141494d8aa603afd

 WebTM/WebTM.csproj

@@ -173,6 +173,7 @@
    <Content Include="layuiadmin\PubCustom.js" />
    <Content Include="layuiadmin\PubJs\PubCheck.js" />
    <Content Include="layuiadmin\HideButton_New.js" />
    <Content Include="layuiadmin\zy_dropdown.js" />
    <Content Include="views\Baseset\HBarPlanPrint.html" />
    <Content Include="views\Baseset\SRM_OpenTmpList_GXPG.html" />
    <Content Include="views\Baseset\基础资料\Gy_BadCountDevelopWHList.html" />
@@ -403,6 +404,7 @@
    <Content Include="views\仓存管理\仓库调拨\Add_Edit_Kf_MoveStockBill.html" />
    <Content Include="views\仓存管理\分步式调入单\Fb_StepFoldinBillEdit.html" />
    <Content Include="views\仓存管理\条码库存\KF_PonderationBillMain_Temp.html" />
    <Content Include="views\仓存管理\条码报表\Kf_StockInOutEntryByPageReport.html" />
    <Content Include="views\仓存管理\条码报表\KF_StockInOutEntryReport.html" />
    <Content Include="views\仓存管理\条码报表\KF_StockInOutRecordReport.html" />
    <Content Include="views\仓存管理\条码报表\Kf_SellOutBarTraceReport.html" />
@@ -449,6 +451,12 @@
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QualityStd_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_AreaSet_ExtendDoubleClickReturn.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BadPhenomena_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PNLInfoEdit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BarCodeBill_PNL_TempEdit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PNLInfoList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BarCodeBill_PNL_TempList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BarCodeBill_Set_TempEdit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BarCodeBill_Set_TempList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CusType_ExtendDoubleClickReturn.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ManualSynchronization.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaterialCorrection.html" />
@@ -616,6 +624,7 @@
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFile_Excel.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_MouldMaintainRuleBill_Excel.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_MouldMaintainRuleBillList_PDA.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatForm_Sec.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatForm.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatFormImport_SS_Sec.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatFormImport_SS.html" />
@@ -654,6 +663,7 @@
    <Content Include="views\生产管理\日计划基础资料\JIT_NeedMaterPlanConfigBill_Excel.html" />
    <Content Include="views\生产管理\日计划报表\JIT_DayPlanPlatFormHistoryNoteReport.html" />
    <Content Include="views\生产管理\日计划报表\JIT_FuHeFenXiReportDetail.html" />
    <Content Include="views\生产管理\日计划报表\ReportMOMaterReadysBillTotalList.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysisReport_His.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysis.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysisDetailReport.html" />
@@ -734,6 +744,8 @@
    <Content Include="views\设备管理\设备规程单\Sb_EquipPatrolCheckRuleEdit.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipPatrolCheckRuleList.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipMaintainRuleBill_Excel.html" />
    <Content Include="views\质量管理\PNL检验信息\QC_CheckNote_PNL_TempEdit.html" />
    <Content Include="views\质量管理\PNL检验信息\QC_CheckNote_PNL_TempList.html" />
    <Content Include="views\质量管理\基础建模\Gy_ErrMsgBackType_Excel.html" />
    <Content Include="views\质量管理\基础建模\Gy_ErrType_Excel.html" />
    <Content Include="views\质量管理\基础建模\QC_SpcCenterlineList.html" />
@@ -746,6 +758,7 @@
    <Content Include="views\质量管理\环境检测单\QC_EnvironmentTestDotCheckBillEdit.html" />
    <Content Include="views\质量管理\环境检测单\QC_EnvironmentTestDotCheckBillList.html" />
    <Content Include="views\质量管理\环境检测单\QC_EnvironmentTestDotCheckBillEdit_PDA.html" />
    <Content Include="views\质量管理\质量报表\QC_FiveMenOneRingList_ICMO.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityDailyReprot_Sum.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityDailyReprot.html" />
    <Content Include="views\质量管理\质量报表\QC_FiveMenOneRingList.html" />
@@ -841,6 +854,7 @@
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBillList.html" />
    <Content Include="views\车间管理\报表分析\Mes_OrderProcFlowAllReport_ICMO.html" />
    <Content Include="views\车间管理\报表分析\Qc_PreventErrMouldCheckReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_OEEReport_RunLogs.html" />
    <Content Include="views\车间管理\报表分析\Sc_WorkBeginDotCheckReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_MouldRequirementDay.html" />
    <Content Include="views\车间管理\报表分析\Sc_CompareOrderToSelloutReport.html" />
@@ -875,6 +889,7 @@
    <Content Include="views\采购管理\采购报表\Cg_POMaterialPriceReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderBillProcessSumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderInStockSumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_PoOrderInStockSumReport_QX.html" />
    <Content Include="views\采购管理\采购核销\Cg_POStockInBillList_Sec.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillCheckQuery.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillQuery.html" />
@@ -894,6 +909,7 @@
    <Content Include="views\销售管理\销售合同\Xs_ContractBillList.html" />
    <Content Include="views\销售管理\销售报价单\Xs_SeQuotationBillMain.html" />
    <Content Include="views\销售管理\销售报价单\Xs_SeQuotationBillMainList.html" />
    <Content Include="views\销售管理\销售报表\Xs_SeOrderOutStockSumReport_QX.html" />
    <Content Include="views\销售管理\销售报表\Xs_SeOrderOutStockSumReport.html" />
    <Content Include="views\销售管理\销售核销\XS_SellOutBillList_Sec.html" />
    <Content Include="views\销售管理\销售订单\Xs_SeOrderBillQuery.html" />
@@ -2342,6 +2358,7 @@
    <Content Include="views\项目管理\基础建模\Gy_TaskClass.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskBill_AutoLoadBillMain.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskBill_AutoLoadBillMain_20241226.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectTaskFeesQuery.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectTaskNeedSaveQuery.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectTaskNeedCheckQuery.html" />
    <Content Include="views\项目管理\工程项目\PM_CustomerProInfoBillMainList.html" />
@@ -2364,6 +2381,7 @@
    <Content Include="views\项目管理\工程项目\PM_ProjectMoneyBillMain.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectBill.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectBillList.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectTaskStepsQuery.html" />
    <Content Include="views\项目管理\工程项目\PM_WorkPlanMonthBillMain.html" />
    <Content Include="views\项目管理\工程项目\PM_WorkPlanMonthBillMainList.html" />
    <Content Include="views\项目管理\工程项目\PM_CustomerTaskBillMain.html" />