合并

yangle

2022-04-08 d4f919b6197ee799f42961acde6122f8363fb535

 WebTM/WebTM.csproj

@@ -632,6 +632,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdMoveStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdOutStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldTypeBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOBillList.aspx" />
    <Content Include="views\基础资料\基础资料\Gy_ConkReasonEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_ConkReasonList.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckEdit.html" />
@@ -1265,6 +1266,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldTypeBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldTypeBill.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_ProcessReport.aspx.cs">
      <DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>