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

yangle

2022-07-29 16927f3ec97d35b398f0ec0d502e06d5bcdc8576

 WebTM/WebTM.csproj

@@ -214,6 +214,7 @@
    <Content Include="views\grf\包装方式条码.grf" />
    <Content Include="views\grf\花型条码.grf" />
    <Content Include="views\grf\工序流转.grf" />
    <Content Include="views\grf\cabinet-CG.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -653,6 +654,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldTypeBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_QK_PackingBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_QK_SPackingBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_HPPickingBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList.aspx" />
    <Content Include="views\基础资料\基础资料\Gy_ConkReasonEdit.html" />
@@ -867,6 +869,7 @@
    <Content Include="views\生产管理\生产开工单\Sc_Add_MESBeginWorkBillList - 复制.html" />
    <Content Include="views\生产管理\生产开工单\Sc_Add_MESBeginWorkBillList.html" />
    <Content Include="views\生产管理\生产开工单\Sc_MESBeginWorkBillList.html" />
    <Content Include="views\生产管理\生产投料单\Sc_PPickingBillList.html" />
    <Content Include="views\生产管理\生产拆箱单\Sc_PackSplitBill_Fast.html" />
    <Content Include="views\生产管理\生产日计划工单\JIT_DayPlanBillEdit.html" />
    <Content Include="views\生产管理\生产日计划工单\JIT_DayPlanBillList.html" />
@@ -905,6 +908,7 @@
    <Content Include="views\系统管理\用户管理\Xt_UserSuplies.html" />
    <Content Include="views\系统管理\系统参数管理\Xt_SystemParameter_Edit.html" />
    <Content Include="views\系统管理\系统参数管理\Xt_SystemParameterList.html" />
    <Content Include="views\组装单\Sc_PCruxBindingPDA.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBill.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillimport.html" />
    <Content Include="views\计划管理\工艺路线大类\Gy_RoutingGroupList.html" />
@@ -1344,6 +1348,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QK_SPackingBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_QK_SPackingBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_HPPickingBillList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_HPPickingBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_HPPickingBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_HPPickingBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOBillList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ICMOBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>