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

chenhaozhe

9 天以前 f50cd9cfde1cdfc8e5b2205a63bdb2694da28e1c

 WebTM/WebTM.csproj

@@ -119,7 +119,11 @@
    <Content Include="layuiadmin\layui\layui.js" />
    <Content Include="layuiadmin\layui\layui2.10.0.js" />
    <Content Include="layuiadmin\modules\dropdown-disable.js" />
    <Content Include="layuiadmin\modules\numinput.js" />
    <Content Include="layuiadmin\modules\timerManager.js" />
    <Content Include="layuiadmin\modules\treeTable.js" />
    <Content Include="layuiadmin\qrcode\qrcode.js" />
    <Content Include="layuiadmin\qrcode\qrcode.min.js" />
    <Content Include="layuiadmin\resize\ResizeLeftRight.css" />
    <Content Include="layuiadmin\resize\ResizeLeftRight.js" />
    <Content Include="layuiadmin\QueryScheme.js" />
@@ -194,6 +198,7 @@
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestSchemeBillList.html" />
    <Content Include="views\WMS扫码模块\委外领料\Kf_EntrustOutBackBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\委外领料\Kf_EntrustOutBackBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\库存查询\KF_ICInventory_WorkShop_PDA.html" />
    <Content Include="views\WMS扫码模块\生产入库\Kf_ProductInBackBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产入库\Kf_ProductInBackBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBackBill_Check_PDA.html" />
@@ -623,6 +628,8 @@
    <Content Include="views\基础资料\基础资料\Gy_CarTypeEdit.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_WorkType_Excel.html" />
    <Content Include="views\基础资料\成本基础资料\Add_Edit_Gy_CostAverageType.html" />
    <Content Include="views\基础资料\成本基础资料\Cb_OtherOutBill_CostSubjectDetail.html" />
    <Content Include="views\基础资料\成本基础资料\Cb_OtherOutBill_CostSubjectDetail_excelimport.html" />
    <Content Include="views\基础资料\成本基础资料\CB_Wip_excelImport.html" />
    <Content Include="views\基础资料\成本基础资料\Gy_CostAverageTypeList.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_ProcMul.html" />
@@ -681,6 +688,8 @@
    <Content Include="views\案例代码\华远\HY_HistogramReport_ForPCSCheckNote.html" />
    <Content Include="views\案例代码\华远\HY_HistogramReport.html" />
    <Content Include="views\案例代码\华远\HY_InterfaceTest.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldDailyUseReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldMonthUseReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MoldMainoverdueWarnReport.html" />
    <Content Include="views\模治具管理\器具领用申请单\Sc_MouldOutRequestBillEdit.html" />
    <Content Include="views\模治具管理\器具领用申请单\Sc_MouldOutRequestBillList.html" />
@@ -885,6 +894,7 @@
    <Content Include="views\设备管理\设备工艺参数订单点检表\SB_EquipICMOTechParamBillEdit.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBillList_PDA.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBill_PDA.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipDailyRunStateReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipDotCheckTaskReport.html" />
    <Content Include="views\设备管理\设备报表\SB_EquipICMOTechParamReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipMentCollectionTechParam_Temp.html" />
@@ -1048,6 +1058,7 @@
    <Content Include="views\车间管理\报表分析\Mes_OrderProcFlowAllReport_ICMO.html" />
    <Content Include="views\车间管理\报表分析\Qc_PreventErrMouldCheckReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_AllowedPrintProcExchangeBillList.html" />
    <Content Include="views\车间管理\报表分析\Sc_ProcDailyRunStateReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_StationOutVarianceReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_WorkShopICStockBillList.html" />
    <Content Include="views\车间管理\报表分析\Sc_WorkShopXJICInventoryList.html" />