合并

ch

2021-11-05 b92d5211f90e8aac7b681613e4ddca75ac334c80

 WebTM/WebTM.csproj

@@ -116,22 +116,18 @@
    <Content Include="views\PublicPage\PeopleInformation.html" />
    <Content Include="views\ReportHtml.html" />
    <Content Include="views\test\testRenderAutomationList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderBackInfo.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderBackInfo.html.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderLev.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_Warehouse.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Xt_ORGANIZATIONSList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_Department.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_OrderBackInfo.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_OrderLev.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_Warehouse.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Xt_ORGANIZATIONSList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_Department.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Employee_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EquipType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EquipTypeEdit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ClassTimePrj.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ClassTimePrj.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter_Add_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_MouldType.html" />
    <Content Include="views\基础资料\公用基础资料\grf\b.grf" />
@@ -142,6 +138,13 @@
    <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" />
    <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>
@@ -569,6 +572,14 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdMoveStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdOutStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldTypeBill.aspx" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckList.html" />
    <Content Include="views\基础资料\基础资料\Gy_MaintainEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_MaintainList.html" />
    <Content Include="views\基础资料\基础资料\Gy_RepairCheckEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_RepairCheckList.html" />
    <Content Include="views\基础资料\基础资料\Gy_RepairEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_RepairList.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcPriceList.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_Group_Add_Edit.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcPrice.html" />
@@ -750,6 +761,7 @@
    <Content Include="views\质量管理\产品入库检验单\QC_LastPieceCheckBillList.html" />
    <Content Include="views\质量管理\出厂检验单\QC_OutCompCheckBillList.html" />
    <Content Include="views\质量管理\巡检记录单\QC_PatrolProcCheckBillList.html" />
    <Content Include="views\质量管理\来料检验单\QC_Add_Edit_POStockInCheckBillList.html" />
    <Content Include="views\质量管理\来料检验单\QC_Add_Edit_POStockInCheckBill.html" />
    <Content Include="views\质量管理\工序检验单\QC_ProcessCheckBill.html" />
    <Content Include="views\质量管理\工序检验单\QC_ProcessCheckBillList.html" />