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

yangle

2022-06-02 4f69c8ca58cce719c44db7dc033748d5ad10ead8

 WebTM/WebTM.csproj

@@ -206,6 +206,10 @@
    <Content Include="views\grf\墙咔条码.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\生产单.grf" />
    <Content Include="views\grf\生产单.grf" />
    <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>
@@ -644,7 +648,9 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdOutStockBill.aspx" />
    <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_ICMOBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList.aspx" />
    <Content Include="views\基础资料\基础资料\Gy_ConkReasonEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_ConkReasonList.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckEdit.html" />
@@ -859,6 +865,7 @@
    <Content Include="views\生产管理\生产装箱单\QK_PackedBillList.html" />
    <Content Include="views\生产管理\生产装箱单\QK_PackingBill.html" />
    <Content Include="views\生产管理\生产装箱单\Sc_PackUnionBill_Fast.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatFormImport.html" />
    <Content Include="views\生产管理\生产退库单\Sc_ProductionReturnList.html" />
    <Content Include="views\生产管理\组托单编辑\Sc_GroupOrderBillEdit_Fast.html" />
@@ -1311,12 +1318,26 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QK_PackingBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_QK_PackingBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QK_SPackingBillList.aspx.cs">
      <DependentUpon>xmlLBM_QK_SPackingBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QK_SPackingBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_QK_SPackingBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOBillList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ICMOBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ICMOBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\生产工序管理\工序汇报单\xmlLBM_ProcessReport.aspx.cs">
      <DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
@@ -1329,6 +1350,7 @@
  <ItemGroup>
    <Folder Include="views\仓存管理\调拨单核对\" />
    <Folder Include="views\仓存管理\调拨单稽核\" />
    <Folder Include="views\生产管理\日计划报表\" />
  </ItemGroup>
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>