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

wtt

2025-12-03 acf8dbd4efdd5e98b53e8c9e1a435d050722f39c

 WebTM/WebTM.csproj

@@ -192,6 +192,8 @@
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestItem.html" />
    <Content Include="views\Baseset\基础资料\Gy_ErrMsgBackType.html" />
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestSchemeBillList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_Driver.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_DriverList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_OperationBill_Report.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MultipleCodes_Report.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PlanImplementation_Report.html" />
@@ -466,6 +468,7 @@
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBillList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaterialPackingRelationList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaterialPackingRelation_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlzuotuo_xiaowei.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_XinDa.aspx" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CheckNoteItem.html" />
@@ -583,6 +586,8 @@
    <Content Include="views\基础资料\基础资料\Gy_Repair_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_Maintain_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheck_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_CarTypeList.html" />
    <Content Include="views\基础资料\基础资料\Gy_CarTypeEdit.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_WorkType_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_ProcMul.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_BadReason_Excel.html" />
@@ -675,6 +680,8 @@
    <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_MouldProdBackBillEdit.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldProdMoveBillEdit.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldProdOutBillEdit_old.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldDotCheckBill_PDA.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldDotCheckBill_PDA_OLD.html" />
@@ -682,6 +689,8 @@
    <Content Include="views\模治具管理\模治具管理\Gy_BarCodeBillList_XinDa.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_BarCodeBillList_JiaNan.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFile_Excel.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_QCVerificationBillMain.html" />
    <Content Include="views\模治具管理\模治具管理\Sb_Add_Gy_QCVerificationBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_MouldMaintainRuleBill_Excel.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_MouldMaintainRuleBillList_PDA.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatForm_Sec.html" />
@@ -851,6 +860,7 @@
    <Content Include="views\质量管理\环境检测单\QC_EnvironmentTestDotCheckBillList.html" />
    <Content Include="views\质量管理\环境检测单\QC_EnvironmentTestDotCheckBillEdit_PDA.html" />
    <Content Include="views\质量管理\质量报表\QC_FiveMenOneRingList_ICMO.html" />
    <Content Include="views\质量管理\质量报表\QC_MeasuringToolsyWarningReport.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityDailyReprot_Sum.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityDailyReprot.html" />
    <Content Include="views\质量管理\质量报表\QC_FiveMenOneRingList.html" />
@@ -2674,6 +2684,10 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_stock.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlzuotuo_xiaowei.aspx.cs">
      <DependentUpon>xmlzuotuo_xiaowei.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>