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

ch

2022-06-30 7eac693bfb362231e94d4c5bd99ebf7a9405ce99

 WebTM/WebTM.csproj

@@ -97,6 +97,7 @@
    <Content Include="views\Baseset\基础资料\Gy_LineCenter.html" />
    <Content Include="views\Baseset\基础资料\Gy_OrganizationtList.html" />
    <Content Include="views\Baseset\基础资料\Gy_QCCheckProjectListView.html" />
    <Content Include="views\Baseset\基础资料\Gy_RoutingBillList.html" />
    <Content Include="views\Baseset\基础资料\Gy_RoutingGroup.html" />
    <Content Include="views\Baseset\基础资料\Gy_WarehouseListNew.html" />
    <Content Include="views\Baseset\基础资料\Sc_ICMOBillListView2.html" />
@@ -142,6 +143,7 @@
    <Content Include="views\video\success.wav" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockBill_CheckList_New.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockBill_Check_New.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockOutBill_Fast.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockRequestBillList.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockStepOutBill_Fast.html" />
    <Content Include="views\仓存管理\分步式调入单\Fb_StepFoldinBillList.html" />
@@ -702,6 +704,7 @@
    <Content Include="views\基础资料\辅助基础资料\Sb_Add_MaintenanceMode.html" />
    <Content Include="views\基础资料\采购基础资料\Gy_Supplier.html" />
    <Content Include="views\基础资料\销售基础资料\Gy_Customer.html" />
    <Content Include="views\基础资料\隐藏列设置\Gy_GridView_Hide.html" />
    <Content Include="views\工资管理\Gy_DuSubsidyItemBillEdit.html" />
    <Content Include="views\工资管理\Gy_DuSubsidyItemBillList.html" />
    <Content Include="views\工资管理\Gy_WorkPayTypeBillEdit.html" />
@@ -799,6 +802,7 @@
    <Content Include="views\生产工序管理\委外工序计划转出单\WW_EntrustProcessSendOutBillList.html" />
    <Content Include="views\生产工序管理\委外工序计划转出单\WW_EntrustProcessSendOutBill_PDA.html" />
    <Content Include="views\生产工序管理\工序汇报单\HBarPlanPrint.html" />
    <Content Include="views\生产工序管理\工序汇报单\Sc_ProcessReportOverList.html" />
    <Content Include="views\生产工序管理\工序汇报单\xmlLBM_ProcessReport.aspx" />
    <Content Include="views\生产工序管理\工序计划单\Sc_ProcessPlanEdit.html" />
    <Content Include="views\生产管理\上料防错单\Sc_Add_MaterToSourceBillList.html" />
@@ -839,6 +843,9 @@
    <Content Include="views\生产管理\日计划基础资料\Gy_WorkWarehouseBill_Add.html" />
    <Content Include="views\生产管理\日计划基础资料\JIT_NeedMaterPlanConfigBillList.html" />
    <Content Include="views\生产管理\日计划基础资料\JIT_NeedMaterPlanConfigBill_Add.html" />
    <Content Include="views\生产管理\日计划报表\ReportPODemandPlanBillList.html" />
    <Content Include="views\生产管理\日计划报表\ReportPODemandPlanBillList_S.html" />
    <Content Include="views\生产管理\日计划报表\ReportWorkDemandPlanBillList.html" />
    <Content Include="views\生产管理\生产上料单\Sc_MaterToSourceBillList - 复制.html" />
    <Content Include="views\生产管理\生产上料单\Sc_MaterToSourceBillList.html" />
    <Content Include="views\生产管理\生产停工单\Sc_Add_MESStopWorkBillList - 复制.html" />
@@ -893,6 +900,7 @@
    <Content Include="views\系统管理\系统参数管理\Xt_SystemParameter_Edit.html" />
    <Content Include="views\系统管理\系统参数管理\Xt_SystemParameterList.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBill.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillimport.html" />
    <Content Include="views\计划管理\工艺路线大类\Gy_RoutingGroupList.html" />
    <Content Include="views\设备管理\Sb_Add_EqpConkBookBillList.html" />
    <Content Include="views\设备管理\Sb_Add_EqpMaintenanceBillList.html" />
@@ -976,7 +984,10 @@
    <Content Include="views\领料发货\其他出库\Kf_OtherOutBill_Check.html" />
    <Content Include="views\领料发货\分步式调出单\Fb_StepFoldOutBillList.html" />
    <Content Include="views\领料发货\委外出库\Kf_EntrustOutBillList.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Check.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBackBillEdit.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBackBill_Fast.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBillLEdit.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBackBillList.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_FastCheck.html" />
@@ -987,6 +998,7 @@
    <Content Include="views\模治具管理\模治具管理\Kf_ProductInBillList.html" />
    <Content Include="views\验收入库\其他入库\Kf_OtherOutBill_Check_New.html" />
    <Content Include="views\验收入库\其他入库\Kf_OtherOutBill_CheckList_New.html" />
    <Content Include="views\验收入库\其他入库\Kf_RedOtherInBill_Fast.html" />
    <Content Include="views\验收入库\外购入库\Add_Edit_Kf_POStockInBillList.html" />
    <Content Include="views\验收入库\外购入库\Kf_POStockInBackBillList.html" />
    <Content Include="views\验收入库\外购入库\Kf_POStockInBillList.html" />