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

yusijie

2024-01-05 9ea152275f93c6e0ca3499b9a8a5d7e734874050

 WebTM/WebTM.csproj

@@ -272,12 +272,18 @@
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBillList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_InspectBasis.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_InspectInstruMent.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_StockOutStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_StockInStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_StockMoveStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_QualityStd.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_InspectMethod.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_InspectValue.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_TemporaryArea.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_InspectBasis.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_InspectInstruMent.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_StockOutStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_StockInStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_StockMoveStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_QualityStd.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_InspectMethod.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_InspectValue.html" />
@@ -304,8 +310,12 @@
    <Content Include="views\基础资料\基础资料\Gy_RepairCheckList_PDA.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcCommPrice.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcCommPriceList.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_Post.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_PostSkillList.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_BadResult.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_BadType.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Post.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_PostSkillList.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_BadResult.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_BadType.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Souce_Excel.html" />
@@ -340,6 +350,7 @@
    <Content Include="views\生产管理\报工台工序\产量汇报\Sc_ICMOBillWorkQtyStatus_TmpList.html" />
    <Content Include="views\生产管理\日计划基础资料\Cg_PODemandPlanConfigBill_Excel.html" />
    <Content Include="views\生产管理\日计划报表\MaterialShorAnalysisReport.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillList_LookDown.html" />
    <Content Include="views\生产管理\生产工位\Gy_SourceWorkStationSet.html" />
    <Content Include="views\生产管理\生产工位\Gy_SourceWorkStationSetList.html" />
    <Content Include="views\生产管理\生产报表\ProductionAnalysisReport.html" />
@@ -353,6 +364,8 @@
    <Content Include="views\系统管理\快捷方式自定义\Xt_UserFastMenu.html" />
    <Content Include="views\系统管理\快捷方式自定义\Xt_UserFastMenu_IconSet.html" />
    <Content Include="views\系统管理\按钮设置\Xt_ModuleButtonSet.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserCustomerList.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserCustomerList_Edit.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserProcessList.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserCustomer_ImportByExcel.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserEmployee_Excel.html" />
@@ -405,6 +418,7 @@
    <Content Include="views\车间管理\工序流转\MES_Sc_ProcessExchangeBillMain_Note_PDA.html" />
    <Content Include="views\车间管理\工序流转\MES_StationInBillList_PDA_QiaoYi.html" />
    <Content Include="views\车间管理\工序流转\MES_StationOutBillList_PDA_QiaoYi.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillList_LookDown.html" />
    <Content Include="views\车间管理\报表分析\Sc_BadReasonReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_ProcessErrStationReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_MateOutSumReport_QiaoYi.html" />