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

zrg

2024-01-16 7de00c5824ecfd39fec748386298ba0cedd4504e

 WebTM/WebTM.csproj

@@ -309,6 +309,7 @@
    <Content Include="views\基础资料\公用基础资料\HBarPlanPrint_GXPG.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOInStockBackBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOChangeBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeArrangement.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_MateOutBillList.aspx" />
@@ -329,10 +330,14 @@
    <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\基础资料\生产基础资料\Add_Edit_Gy_DisposeWay.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_ScrapReason.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_DisposeWayList.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_ScrapReasonList.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Souce_Excel.html" />
    <Content Include="views\工资管理\加班申请\Pay_OverApplyBill.html" />
    <Content Include="views\工资管理\加班申请\Pay_OverApplyBillList.html" />
@@ -383,6 +388,7 @@
    <Content Include="views\系统管理\快捷方式自定义\Xt_UserFastMenu_IconSet.html" />
    <Content Include="views\系统管理\按钮设置\Xt_ModuleButtonSet.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserByUserList.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserByWorkStationList.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserCustomerList.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserCustomerList_Edit.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserMaterList.html" />
@@ -647,6 +653,7 @@
    <Content Include="views\grf\不良类型.grf" />
    <Content Include="views\grf\异常类型.grf" />
    <Content Include="views\grf\生产订单领料状态报表.grf" />
    <Content Include="views\grf\退料通知单.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -1743,6 +1750,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOInStockBackBill.aspx.cs">
      <DependentUpon>xmlLBM_HPOInStockBackBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOInStockBackBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_HPOInStockBackBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOChangeBillList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ICMOChangeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>