合并

沈泽

2021-08-20 073aca8ebc3f025a3b1678a0fb83a697276561a5

 WebTM/WebTM.csproj

@@ -105,9 +105,13 @@
    <Content Include="views\grf\a.grf" />
    <Content Include="views\grf\b1.grf" />
    <Content Include="views\grf\b.grf" />
    <Content Include="views\PublicPage\Gy_MaterType.html" />
    <Content Include="views\PublicPage\CheckItemInformation.html" />
    <Content Include="views\PublicPage\Gy_Maintain.html" />
    <Content Include="views\ReportHtml.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Employee_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter_Add_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_MouldType.html" />
    <Content Include="views\基础资料\公用基础资料\grf\b.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
@@ -507,6 +511,7 @@
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_Unit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EmployeeList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CheckItem.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MouldType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_QCCheckClass.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Warehouse_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EquipMent_Edit.html" />
@@ -596,6 +601,7 @@
    <Content Include="views\生产工序管理\工序汇报单\xmlLBM_ProcessReport.aspx" />
    <Content Include="views\生产管理\产量汇报单\Sc_Add_ProductReportBillList.html" />
    <Content Include="views\生产管理\产量汇报单\Sc_ProductReportBillList.html" />
    <Content Include="views\生产管理\产量汇报单\Sc_ProductReportBillList_Web.html" />
    <Content Include="views\生产管理\报工平台功能页\LineBind.html" />
    <Content Include="views\生产管理\生产上料单\Sc_MaterToSourceBillList - 复制.html" />
    <Content Include="views\生产管理\生产上料单\Sc_MaterToSourceBillList.html" />