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

沈泽

2021-08-30 c55106b0797ac56f8d3fd55b78a8dcc9b312880c

 WebTM/WebTM.csproj

@@ -105,10 +105,21 @@
    <Content Include="views\grf\a.grf" />
    <Content Include="views\grf\b1.grf" />
    <Content Include="views\grf\b.grf" />
    <Content Include="views\PublicPage\CustomerTypeInformation.html" />
    <Content Include="views\PublicPage\SettleStyleInformation.html" />
    <Content Include="views\PublicPage\CurrencyInformation.html" />
    <Content Include="views\PublicPage\AreaInformation.html" />
    <Content Include="views\PublicPage\LocationGroupInformation.html" />
    <Content Include="views\PublicPage\BomGroupInformation.html" />
    <Content Include="views\PublicPage\RouteInformation.html" />
    <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\基础资料\公用基础资料\Add_Edit_Gy_Department.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_Warehouse.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">
@@ -507,6 +518,7 @@
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_Currency.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_Employee.html" />
    <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" />
@@ -516,6 +528,9 @@
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Currency.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_Material.aspx" />
    <Content Include="views\基础资料\公用基础资料\Gy_DepartmentList.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_Group_Add_Edit.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_Process.html" />
    <Content Include="views\基础资料\采购基础资料\Gy_Supplier_Edit.html" />
    <Content Include="views\基础资料\销售基础资料\Gy_Customer_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkCenter.html" />
@@ -527,8 +542,6 @@
    <Content Include="views\基础资料\公用基础资料\Gy_Unit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_StockPlace.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Warehouse.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Employee.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Department.html" />
    <Content Include="views\基础资料\公用基础资料\HBarPlanPrint.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_Department_Edit.aspx" />
    <Content Include="views\基础资料\工资基础资料\Add_Edit_Gy_Group.html" />
@@ -612,8 +625,9 @@
    <Content Include="views\生产管理\生产开工单\Sc_MESBeginWorkBillList.html" />
    <Content Include="views\生产管理\生产汇报单\Sc_Add_ICMOReportBillList.html" />
    <Content Include="views\生产管理\生产组装追溯单\Sc_AssemblyBillList.html" />
    <Content Include="views\生产管理\生产质量汇报单\Sc_QualityReportBillList.html" />
    <Content Include="views\生产管理\质量汇报单\Sc_QualityReportBillList.html" />
    <Content Include="views\生产管理\组装单\Sc_GroupOrderBillList.html" />
    <Content Include="views\生产管理\质量汇报单\Sc_QualityReportBill.html" />
    <Content Include="views\系统管理\会计期间\Xt_AccountPeriodList.html" />
    <Content Include="views\系统管理\会计期间\Xt_AccountPeriod_Edit.html" />
    <Content Include="views\系统管理\单据类型\Xt_BillType_Edit.html" />