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

yusijie

2023-10-26 c890c969f056b949edae59c91b57cea2ccae3d06

 WebTM/WebTM.csproj

@@ -64,8 +64,6 @@
    <Reference Include="System.EnterpriseServices" />
  </ItemGroup>
  <ItemGroup>
    <Content Include="Files\OIP-C.jpg" />
    <Content Include="Files\R-C.jpg" />
    <Content Include="HtmlPage1.html" />
    <Content Include="layuiadmin\ax\ax-response.css" />
    <Content Include="layuiadmin\ax\ax.css" />
@@ -229,6 +227,12 @@
    <Content Include="views\人事管理\离职申请\HR_EmpDimissionBillList.html" />
    <Content Include="views\人事管理\职员异动单\HR_EmpChangeBill.html" />
    <Content Include="views\人事管理\职员异动单\HR_EmpChangeBillList.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_BadClass.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_Material.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_Emp.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_Dept.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_Customer.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_Sum.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill_KaiBei.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBillList.html" />
@@ -270,11 +274,14 @@
    <Content Include="views\工资管理\请假申请\Pay_OutApplyBillList.html" />
    <Content Include="views\条码明细\Kf_BarCodeDetailQuery.html" />
    <Content Include="views\生产管理\作业指导书\Gy_SOPBill_Video.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_Reply_MESExecptFeedBackBill.html" />
    <Content Include="views\生产管理\日计划基础资料\Cg_PODemandPlanConfigBill_Excel.html" />
    <Content Include="views\生产管理\日计划报表\MaterialShorAnalysisReport.html" />
    <Content Include="views\生产管理\生产工位\Gy_SourceWorkStationSet.html" />
    <Content Include="views\生产管理\生产工位\Gy_SourceWorkStationSetList.html" />
    <Content Include="views\生产管理\生产计划平台\Sc_ShopCalendar.html" />
    <Content Include="views\生产管理\订单状态分布\Sc_OrderStateDistribution.html" />
    <Content Include="views\生产管理\齐套分析\JIT_CompleteMaterlDetailList.html" />
    <Content Include="views\系统管理\快捷方式自定义\Xt_UserFastMenu.html" />
    <Content Include="views\系统管理\快捷方式自定义\Xt_UserFastMenu_IconSet.html" />
    <Content Include="views\系统管理\按钮设置\Xt_ModuleButtonSet.html" />
@@ -285,7 +292,11 @@
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillListQuery.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillList_His.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillSubList.html" />
    <Content Include="views\质量管理\工序检验单\MES_ProcessCheckBillList_PDA.html" />
    <Content Include="views\质量管理\工序检验单\MES_ProcessCheckBill_PDA.html" />
    <Content Include="views\质量管理\首件检验单\QC_FirstPieceCheckReport_ZDQX.html" />
    <Content Include="views\车间管理\工序流转\MES_Sc_ProcessExchangeBillMain_Note_PDA.html" />
    <Content Include="views\车间管理\报表分析\Sc_ProcessErrStationReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_MateOutSumReport_QiaoYi.html" />
    <Content Include="views\车间管理\报表分析\Kf_BrushingOutReport.html" />
    <Content Include="views\车间管理\产线组装追溯\Cj_AssemblyTraceability.html" />
@@ -473,6 +484,7 @@
    <Content Include="views\grf\cs10.grf" />
    <Content Include="views\grf\指引卡1.grf" />
    <Content Include="views\grf\生产领料单.grf" />
    <Content Include="views\grf\工序在制报表.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -1360,6 +1372,8 @@
    <Content Include="views\销售管理\销售订单\Add_Edit_Xs_SeOrderBillList.html" />
    <Content Include="views\项目管理\业绩指标\PM_YearEmployeeMoneyBillList.html" />
    <Content Include="views\项目管理\业绩指标\PM_YearEmployeeMoneyBill.html" />
    <Content Include="views\项目管理\周计划\PM_WorkTaskWeekBillList.html" />
    <Content Include="views\项目管理\周计划\PM_WorkTaskWeekBill.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskReportBillList.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskReportBill.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskBillList.html" />
@@ -1846,6 +1860,7 @@
    </Compile>
  </ItemGroup>
  <ItemGroup>
    <Folder Include="Files\" />
    <Folder Include="views\仓存管理\调拨单核对\" />
    <Folder Include="views\仓存管理\调拨单稽核\" />
  </ItemGroup>