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

zzr99

2021-11-05 9a03fabcc94ed2acacc19f97fbf531d99ee619e7

 WebTM/WebTM.csproj

@@ -107,6 +107,8 @@
    <Content Include="views\grf\b1.grf" />
    <Content Include="views\grf\b.grf" />
    <Content Include="views\indexMenu.html" />
    <Content Include="views\PublicPage\OrderBackInfomation.html" />
    <Content Include="views\PublicPage\OrderLevInformation.html" />
    <Content Include="views\PublicPage\Gy_MaterType.html" />
    <Content Include="views\PublicPage\CheckItemInformation.html" />
    <Content Include="views\PublicPage\Gy_Maintain.html" />
@@ -114,12 +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.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderLev.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\基础资料\公用基础资料\Gy_WorkCenter_Add_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_MouldType.html" />
    <Content Include="views\基础资料\公用基础资料\grf\b.grf" />
@@ -130,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>
@@ -557,10 +572,22 @@
    <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" />
    <Content Include="views\基础资料\数据字典\Xt_DataDictionary_Proc.html" />
    <Content Include="views\基础资料\数据字典\Xt_DataDictionary_View.html" />
    <Content Include="views\基础资料\数据字典\Xt_DataDictionary_Table.html" />
    <Content Include="views\基础资料\数据字典\Xt_DataDictionary_ProcList.html" />
    <Content Include="views\基础资料\数据字典\Xt_DataDictionary_ViewList.html" />
    <Content Include="views\基础资料\数据字典\Xt_DataDictionary_TableList.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_Process.html" />
    <Content Include="views\基础资料\采购基础资料\Gy_Supplier_Edit.html" />
@@ -607,11 +634,14 @@
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBillList.html" />
    <Content Include="views\模治具管理\模具处理出库单\Sc_MouldScrapOutBill_PDA.html" />
    <Content Include="views\模治具管理\模具寿命调整单\Sc_MouldLifeChangeBill_PDA.html" />
    <Content Include="views\模治具管理\模具改制入库单\Sc_MouldRepairInBill_PDA.html" />
    <Content Include="views\模治具管理\模具改制出库单\Sc_MouldRepairOutBill_PDA.html" />
    <Content Include="views\模治具管理\模具生产退库单\Sc_MouldProdBackBill_PDA.html" />
    <Content Include="views\模治具管理\模具生产领用单\Sc_MouldProdOutBill_PDA.html" />
    <Content Include="views\模治具管理\模具维修记录单\Sc_MouldRepairWorkBill_PDA.html" />
    <Content Include="views\模治具管理\模具其他出库单\Sc_MouldOtherOutBill_PDA.html" />
    <Content Include="views\模治具管理\模具其他入库单\Sc_MouldOtherInBill_PDA.html" />
    <Content Include="views\模治具管理\模具采购入库单\Sc_MouldProdInBill_PDA.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldMoveStockStepOutBill.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldMoveStockStepInBill.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldMoveStockStepInBillList.html" />
@@ -627,7 +657,7 @@
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldRepairOutBillEdit.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldRepairOutBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldRepairInBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldScrapInBill_PDA.html" />
    <Content Include="views\模治具管理\模具报废入库单\Sc_MouldScrapInBill_PDA.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldOtherOutBillEdit.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldOtherOutBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_Add_MouldLifeChangeBillList.html" />
@@ -656,6 +686,9 @@
    <Content Include="views\模治具管理\模治具管理\Sc_MouldOtherInBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_MouldOtherOutBill.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_MouldOtherOutBillList.html" />
    <Content Include="views\模治具管理\设备保养记录单\Sb_EquipMaintainBill_PDA.html" />
    <Content Include="views\模治具管理\设备点检记录单\Sb_EquipDotCheckBill_PDA.html" />
    <Content Include="views\模治具管理\设备维修记录单\Sb_EquipRepairWorkBill_PDA.html" />
    <Content Include="views\生产工序管理\委外工单\WW__Add_EntrustWorkOrderBill.html" />
    <Content Include="views\生产工序管理\委外工序派工单\WW_AddEntrustProcSendWork.html" />
    <Content Include="views\生产工序管理\委外工序计划汇报单\WW_Add_EntrustProcessReport.html" />
@@ -720,12 +753,15 @@
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillList.html" />
    <Content Include="views\设备管理\Sc_Add_MouldDotCheckBillList.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainEdit.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainList.html" />
    <Content Include="views\质量管理\出厂检验单\QC_OutCompCheckBill.html" />
    <Content Include="views\质量管理\巡检记录单\QC_Add_Edit_PatrolProcCheckBill.html" />
    <Content Include="views\质量管理\产品入库检验单\QC_LastPieceCheckBill.html" />
    <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" />
@@ -753,6 +789,7 @@
    <Content Include="views\车间管理\工序进站接收单\Sc_StationInBill_Mul_PDA.html" />
    <Content Include="views\车间管理\工序进站接收单\Sc_StationInBill_Mul.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillList.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast.html" />
    <Content Include="views\验收入库\产品入库\Kf_ProductInBillList.html" />
    <Content Include="views\验收入库\其他入库\Kf_OtherInBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Kf_ProductInBillList.html" />