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

yusijie

2024-06-19 b88f868bcd1e464e4566112d630210a885552d58

 WebTM/WebTM.csproj

@@ -336,6 +336,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_MaintainLev.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PreventErrMould.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlSRM_Web_BarCodeBillList.aspx" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemMethodEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemClassEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemMethodList.html" />
@@ -371,6 +372,8 @@
    <Content Include="views\系统管理\会计期间\Xt_AccountPeriodAdd.html" />
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBillList_PDA.html" />
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBill_PDA.html" />
    <Content Include="views\设备管理\设备工艺参数订单点检表\SB_EquipICMOTechParamBillList.html" />
    <Content Include="views\设备管理\设备工艺参数订单点检表\SB_EquipICMOTechParamBillEdit.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBillList_PDA.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBill_PDA.html" />
    <Content Include="views\质量管理\工作联系单\OA_WorkLinkSelfQuery.html" />
@@ -406,6 +409,7 @@
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBillList.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBill.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBillList.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillList_Source.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeArrangement_PG.html" />
    <Content Include="views\车间管理\报表分析\Cj_SPCOscillationCurve.html" />
    <Content Include="views\车间管理\报表分析\Kf_PressurizedWaterNoOutReport.html" />
@@ -2140,6 +2144,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLYS_ReceiveOtherBillMainList.aspx.designer.cs">
      <DependentUpon>xmlLYS_ReceiveOtherBillMainList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlSRM_Web_BarCodeBillList.aspx.cs">
      <DependentUpon>xmlSRM_Web_BarCodeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlSRM_Web_BarCodeBillList.aspx.designer.cs">
      <DependentUpon>xmlSRM_Web_BarCodeBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlPM_WorkTaskBillMyList.aspx.cs">
      <DependentUpon>xmlPM_WorkTaskBillMyList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>