设备列表。添加设备功能

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/EquipmentService.java

@@ -61,4 +61,11 @@ public interface EquipmentService {
      * @return
      */
     boolean updateProcessInfo(ProduceProcess process);
+
+
+    /**
+     * 查询是否存在机器
+     * @return
+     */
+    List<PtsDevice> listDeviceByNo(PtsDevice ptsDevice);
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/MachineService.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.faces.pts;
 
 import com.iamberry.rst.core.order.Order;
+import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.pts.Produce;
 import com.iamberry.rst.core.pts.PtsMachine;
@@ -20,7 +21,7 @@ public interface MachineService {
     Integer updateMachine(PtsMachine ptsMachine);
 
     //查询机器列表
-    PagedResult<PtsMachine> listMachine(int pageNO, int pageSize, PtsMachine ptsMachine, boolean isTotalNum);
+    PagedResult<PtsMachine> listMachine(PageRequest<PtsMachine> pageRequest);
 
     //查询最新机器
     List<PtsMachine> listLatestMachine(Integer machineId);

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/EquipmentServiceImpl.java

@@ -91,4 +91,9 @@ public class EquipmentServiceImpl implements EquipmentService {
             return false;
         }
     }
+
+    @Override
+    public List<PtsDevice> listDeviceByNo(PtsDevice ptsDevice) {
+        return equipmentMapper.listDevice(ptsDevice);
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/MachineServiceImpl.java

@@ -2,6 +2,7 @@ package com.iamberry.rst.service.pts;
 
 import com.github.pagehelper.PageHelper;
 import com.iamberry.rst.core.order.Order;
+import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.pts.PtsMachine;
 import com.iamberry.rst.core.pts.PtsMachineLogs;
@@ -35,9 +36,9 @@ public class MachineServiceImpl implements MachineService {
     }
 
     @Override
-    public PagedResult<PtsMachine> listMachine(int pageNO, int pageSize, PtsMachine ptsMachine, boolean isTotalNum) {
-        PageHelper.startPage(pageNO, pageSize, isTotalNum);
-        List<PtsMachine> list = machineMapper.listMachine(ptsMachine);
+    public PagedResult<PtsMachine> listMachine(PageRequest<PtsMachine> pageRequest) {
+        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
+        List<PtsMachine> list = machineMapper.listMachine(pageRequest.getData());
         return PageUtil.getPage(list);
     }
 

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/equipmentMapper.xml

@@ -31,6 +31,9 @@
             <if test="deviceId != null">
                 and device_id = #{deviceId}
             </if>
+            <if test="deviceNumber != null and deviceNumber !='' ">
+                and device_number = #{deviceNumber}
+            </if>
         </where>
         ORDER BY device_id DESC
     </select>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -2,6 +2,7 @@ package com.iamberry.rst.controllers.pts;
 
 import com.iamberry.rst.core.order.Order;
 import com.iamberry.rst.core.order.RentType;
+import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.pts.PtsMachine;
 import com.iamberry.rst.core.pts.PtsMachineLogs;
@@ -42,15 +43,9 @@ public class AdminMachineController {
     public ModelAndView listOrder(
             @RequestParam(value= "pageSize",defaultValue= "10" ,required=false) Integer pageSize,
             @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO,
-            @RequestParam(value = "totalNum", defaultValue = "0",required=false) Integer totalNum,
+            @RequestParam(value = "pageTotal", required = false) Integer pageTotal,
             PtsMachine ptsMachine){
         ModelAndView mv = new ModelAndView("pts/machine/machine_list");
-        PagedResult<PtsMachine> pagedResult = machineService.listMachine(pageNO, pageSize, ptsMachine, totalNum == 0);
-
-        if(totalNum != 0) {
-            pagedResult.setTotal(totalNum);
-            pagedResult.setPages((int) Math.ceil((double)totalNum/pageSize));
-        }
         StringBuilder sb = new StringBuilder("/admin/machine/_machine_list?pageSize=" + pageSize);
 
         if (StringUtils.isNotEmpty(ptsMachine.getMachineBarcode())) {
@@ -68,12 +63,21 @@ public class AdminMachineController {
             sb.append(ptsMachine.getMachineProcessState());
             mv.addObject("machineProcessState",ptsMachine.getMachineProcessState());
         }
-        sb.append("&totalNum=");
-        sb.append(totalNum == 0 ? pagedResult.getTotal() : totalNum);
-        sb.append("&pageNO=");
+
+        PageRequest<PtsMachine> pageRequest = new PageRequest<PtsMachine>(ptsMachine, pageNO, pageSize, pageTotal == null);
+        PagedResult<PtsMachine> pagedResult = machineService.listMachine(pageRequest);
+
+        long total = 0;
+        if (pageTotal == null) {
+            total = pagedResult.getPages();
+        } else {
+            total = pageTotal;
+            pagedResult.setPages(total);
+        }
         //查询最新一条机器id
         Integer machineId = machineService.maxMachineId();
         mv.addObject("machineId",machineId);
+        sb.append("&pageTotal=").append(total).append("&pageNO=");
         mv.addObject("page", pagedResult);
         mv.addObject("url", sb.toString());
         return mv;

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminPtsEmployeeController.java

@@ -35,11 +35,11 @@ public class AdminPtsEmployeeController {
     @RequestMapping("/_employee_list")
     @RequiresPermissions("employee:list_employee:employee")
     public ModelAndView getEmployeeList(HttpServletRequest request,
-                                    @RequestParam(value= "pageSize",defaultValue= "10" ,required=false) Integer pageSize,
-                                    @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO,
-                                    @RequestParam(value = "totalNum", defaultValue = "0",required=false) Integer totalNum) {
+                                        @RequestParam(value= "pageSize",defaultValue= "10" ,required=false) Integer pageSize,
+                                        @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO,
+                                        @RequestParam(value = "totalNum", defaultValue = "0",required=false) Integer totalNum) {
         ModelAndView mv = new ModelAndView("pts/employee/employee_list");
-
+        StringBuilder sb = new StringBuilder("/admin/employee/_employee_list?pageSize=" + pageSize);
         PtsEmployee employee = new PtsEmployee();
 
         String employeeName = request.getParameter("employeeName");
@@ -49,15 +49,23 @@ public class AdminPtsEmployeeController {
 
         if (employeeName != null && !"".equals(employeeName)) {
             employee.setEmployeeName(employeeName);
+            sb.append("&employeeName=");
+            sb.append(employeeName);
         }
         if (employeeNo != null && !"".equals(employeeNo)) {
             employee.setEmployeeNo(employeeNo);
+            sb.append("&employeeNo=");
+            sb.append(employeeNo);
         }
         if (employeeTel != null && !"".equals(employeeTel)) {
             employee.setEmployeeTel(employeeTel);
+            sb.append("&employeeTel=");
+            sb.append(employeeTel);
         }
         if (employeeState != null && !"".equals(employeeState)) {
             employee.setEmployeeState(Integer.valueOf(employeeState));
+            sb.append("&employeeState=");
+            sb.append(employeeState);
         }
 
         PagedResult<PtsEmployee> pagedResult = ptsEmployeeService.getEmployeeList(pageNO, pageSize, employee, totalNum == 0);
@@ -65,7 +73,7 @@ public class AdminPtsEmployeeController {
             pagedResult.setTotal(totalNum);
             pagedResult.setPages((int) Math.ceil((double)totalNum/pageSize));
         }
-        StringBuilder sb = new StringBuilder("/admin/employee/_employee_list?pageSize=" + pageSize);
+
         sb.append("&totalNum=");
         sb.append(totalNum == 0 ? pagedResult.getTotal() : totalNum);
         sb.append("&pageNO=");

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/EquipmentController.java

@@ -120,7 +120,7 @@ public class EquipmentController {
                                          @RequestParam(value = "pageNO", defaultValue = "1", required = false) int pageNO,
                                          @RequestParam(value = "pageTotal", required = false) Integer pageTotal,
                                          @RequestParam(value = "pageSize", defaultValue = "10", required = false) int pageSize
-                                         ) throws Exception {
+    ) throws Exception {
         ModelAndView mv = new ModelAndView("pts/device/device_list");
         StringBuilder url = new StringBuilder("/admin/equipment/select_device_list?pageSize=" + pageSize);
         String deviceNumber = request.getParameter("deviceNumber");
@@ -129,18 +129,26 @@ public class EquipmentController {
         String deviceRemake = request.getParameter("deviceRemake");
         PtsDevice device = new PtsDevice();
         if (StringUtil.isNotEmpty(deviceNumber)) {
+            url.append("&deviceNumber=");
+            url.append(deviceNumber);
             device.setDeviceNumber(deviceNumber);
             mv.addObject("deviceNumber", deviceNumber);
         }
         if (StringUtil.isNotEmpty(deviceName)) {
+            url.append("&deviceName=");
+            url.append(deviceName);
             device.setDeviceName(deviceName);
             mv.addObject("deviceName", deviceName);
         }
         if (StringUtil.isNotEmpty(deviceStatus)) {
+            url.append("&deviceStatus=");
+            url.append(deviceStatus);
             device.setDeviceStatus(Integer.parseInt(deviceStatus));
             mv.addObject("deviceStatus", device.getDeviceStatus());
         }
         if (StringUtil.isNotEmpty(deviceRemake)) {
+            url.append("&deviceRemake=");
+            url.append(deviceRemake);
             device.setDeviceRemake(deviceRemake);
             mv.addObject("deviceRemake", deviceRemake);
         }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java

@@ -108,9 +108,9 @@ public class MachineController {
             ProduceProcess produceProcess = produceService.getProduceProcess(produce.getProduceId(),processNo);
             ProcessNode processNode = produceService.getprocessNode(produceProcess.getProcessId(),nodeNo);
             PtsDevice ptsDevice = deviceService.getDevice(produceProcess.getDriveId());
-            PtsEmployee ptsEmployee =ptsEmployeeService.getPtsEmployeeById(employeeId);
+            PtsEmployee ptsEmployee =ptsEmployeeService.getPtsEmployeeById(produceProcess.getEmployeeId());
             ptsMachineLogs.setDeviceId(produceProcess.getDriveId());
-            ptsMachineLogs.setEmployeeId(employeeId);
+            ptsMachineLogs.setEmployeeId(produceProcess.getEmployeeId());
             ptsMachineLogs.setProduceId(produce.getProduceId());
             ptsMachineLogs.setProcessId(produceProcess.getProcessId());
             ptsMachineLogs.setMachineId(ptsMachine.getMachineId());

watero-rst-web/src/main/webapp/WEB-INF/views/base/page_util.ftl

@@ -24,29 +24,37 @@
 
 
 <div align="right" style="margin-right: 18px">
-<div class="divBody">
-    <div id="testDIV"></div>
-    <form action="" id="myForm" method="post"></form>
-    <div class="btn-group">
+    <div class="divBody">
+        <div id="testDIV"></div>
+        <form action="" id="myForm" method="post"></form>
+        <div class="btn-group">
         <span class="btn btn-lowblue radius">
-            <#if page.pageNo == 1>
-                <a class="active">上一页</a>
-            <#else>
-                <a href="${path}${url}${page.pageNo-1}" class="aBtn bold">上一页</a>
-            </#if>
+        <#if page.pageNo == 1>
+            <a class="active">上一页</a>
+        <#else>
+            <a href="${path}${url}${page.pageNo-1}" class="aBtn bold">上一页</a>
+        </#if>
         </span>
-        <#if page.pages lte 6>
+        <#if page.pages lte 5>
             <#assign begin=1/>
             <#assign end=page.pages/>
         <#else>
             <#assign begin=(page.pageNo - 2)/>
             <#assign end=(page.pageNo + 3)/>
-            <#if begin lt 1>
+            <#if begin lt 2>
                 <#assign begin=1/>
-                <#assign end=1/>
+                <#assign end=5/>
             <#else>
-                <#assign begin=(page.pages - 5)/>
-                <#assign end=(page.pages)/>
+                <#if (page.pageNo + 2) lte page.pages>
+                    <#assign begin=(page.pageNo - 2)/>
+                    <#assign end=(page.pageNo + 2)/>
+                <#elseif (page.pageNo + 1) lte page.pages>
+                    <#assign begin=(page.pageNo - 3)/>
+                    <#assign end=(page.pageNo + 1)/>
+                <#else>
+                    <#assign begin=(page.pageNo - 4)/>
+                    <#assign end=(page.pages)/>
+                </#if>
             </#if>
         </#if>
 
@@ -59,21 +67,21 @@
         </#list>
 
         <#if end==page.pages><a class="active">...</a></#if>
-        <span class="btn btn-lowblue radius">
+            <span class="btn btn-lowblue radius">
             <#if (page.pageNo == page.pages || page.pages == 0)>
                 <a class="active">下一页</a>
             <#else>
                 <a href="${path }${url}${page.pageNo+1}" class="aBtn bold">下一页</a>
             </#if>
 		</span>
-        <span class="btn" style="cursor: default;">
+            <span class="btn" style="cursor: default;">
     			您当前位于:${page.pageNo}页
     	</span>
 
-        <span class="btn" style="cursor: default;">共<a class="active">${page.pages}</a>页</span>
-        <span class="btn" style="cursor: default;">到&nbsp;<a class="active" style="max-height: 36px;min-height: 34px"><input type="text" id="pageCode" value="${page.pageNo}" class="input-text radius" style="width: 36px;height:22px;text-align: center;" maxlength="3"/></a>&nbsp;页</span>
-        <span class="btn btn-lowblue radius"><a href="javascript:_go();" class="active">确定</a></span>
-        <a href="#" style="overflow:hidden" class="active"></a>
+            <span class="btn" style="cursor: default;">共<a class="active">${page.pages}</a>页</span>
+            <span class="btn" style="cursor: default;">到<a class="active" style="max-height: 36px;min-height: 34px"><input type="text" id="pageCode" value="${page.pageNo}" class="input-text radius" style="width: 36px;height:22px;text-align: center;" maxlength="3"/></a>页</span>
+            <span class="btn btn-lowblue radius"><a href="javascript:_go();" class="active">确定</a></span>
+            <a href="#" style="overflow:hidden" class="active"></a>
+        </div>
     </div>
-</div>
 </div>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/add_device.ftl

@@ -90,19 +90,76 @@
         var flag = true;
         var deviceNumber = $('#deviceNumber').val();
         var deviceName = $('#deviceName').val();
+        var device_date = $('#device_date').val();
+        var deviceRemake = $('#deviceRemake').val();
+
         if (deviceNumber == null || !check_number.test(deviceNumber)) {
             flag = false;
             layer.msg('设备编号格式不正确，请重新输入!',{icon: 5,time:1000});
             return flag;
         }
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {
+                deviceNumber:deviceNumber
+            },
+            url: "${path}/admin/equipment/is_equipment",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    flag = false;
+                    layer.msg('该设备编号已存在',{icon: 5,time:1000});
+
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+
+            }
+        });
+        if(flag == false){
+            return flag;
+        }
         if (deviceName == null || !check_name.test(deviceName)) {
             flag = false;
             layer.msg('设备名称格式不正确，请重新输入!',{icon: 5,time:1000});
             return flag;
         }
+        if (device_date == null || device_date == "" ) {
+            flag = false;
+            layer.msg('购买日期不能为空!',{icon: 5,time:1000});
+            return flag;
+        }
+        if(deviceRemake != null){
+            if(deviceRemake.length > 50){
+                layer.msg('备注长度为0-50个字符!',{icon: 5,time:1000});
+            }
+        }
         return flag;
     }
 
+    /*验证编号*/
+    function ptsValiDataNo(thVal) {
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {
+                deviceNumber:thVal
+            },
+            url: "${path}/admin/equipment/is_equipment",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    layer.msg('该设备编号已存在',{icon: 5,time:1000});
+                    return false;
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+
+            }
+        });
+    }
+
     function submit_value() {
         var deviceNumber = $('#deviceNumber').val();
         var deviceName = $('#deviceName').val();

watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/device_list.ftl

@@ -7,8 +7,8 @@
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
         .my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 36px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
-        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 36px;background-color: #32a3d8;color: #fff;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(images/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
     </style>
 <#include "/base/list_base.ftl">
 </head>
@@ -16,81 +16,86 @@
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
     <span class="c-gray en">&gt;</span> PST管理
     <span class="c-gray en">&gt;</span> 设备列表
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 <div class="page-container">
-<div class="text-c">
-    <form name="form1" action="${path}/admin/equipment/select_device_list" method="post">
-        <button type="button" style="cursor:pointer;" class="my-btn-search" onclick="add_device();">添加设备</button>
-        <input class="my-input" type="text" name="deviceNumber" value="${deviceNumber!}" placeholder="请输入设备编号"/>
-        <select class="my-select" name="deviceStatus">
-            <option value ="">全部</option>
-            <option value ="0" <#if deviceStatus??><#if deviceStatus == 0>selected="selected"</#if></#if>>停止使用</option>
-            <option value ="1" <#if deviceStatus??><#if deviceStatus == 1>selected="selected"</#if></#if>>正常使用</option>
-        </select>
-        <input class="my-input" type="text" name="deviceName" value="${deviceName!}" placeholder="请输入设备名称"/>
-        <input class="my-input" type="text" name="deviceRemake" value="${deviceRemake!}" placeholder="请输入备注"/>
-        <button style="cursor:pointer;" type="submit" class="my-btn-search">搜索</button>
-    </form>
-</div>
-<div class="mt-20">
-    <table class="table table-border table-bordered table-bg table-hover table-sort">
-        <thead>
-        <tr class="text-c">
-            <th width="100">设备编号</th>
-            <th width="100">设备名称</th>
-            <th width="100">设备备注</th>
-            <th width="100">购买日期</th>
-            <th width="100">状态</th>
-            <th width="150">作用流程岗位</th>
-            <th width="50">操作</th>
-        </tr>
-        </thead>
-        <tbody id="listid">
-        <#list page.dataList as device>
-        <tr>
-            <td class="text-c" width="100">${device.deviceNumber!}</td>
-            <td class="text-c" width="100">${device.deviceName!}</td>
-            <td class="text-c" width="100">${device.deviceRemake!}</td>
-            <td class="text-c" width="100">${(device.deviceDate?string("yyyy-MM-dd"))!''}</td>
-            <td class="text-c" width="100">
-                <#if device.deviceStatus == 0>
-                    停止使用
-                </#if>
-                <#if device.deviceStatus == 1>
-                    正常使用
-                </#if>
-                <#if device.deviceStatus == 2>
-                    设备故障
-                </#if>
-            </td>
-            <td class="text-c" width="100">
-                <#if device.processList??>
-                    <#list device.processList as process>
-                        <#if (process_index + 1) == device.processList?size>
-                            ${process.produceName!}-${process.processName!}
+    <div class="text-c">
+        <form name="form1" action="${path}/admin/equipment/select_device_list" method="post">
+            <button type="button" style="cursor:pointer;float: left;" class="my-btn-search" onclick="add_device();">添加设备</button>
+            <input class="my-input" type="text" name="deviceNumber" value="${deviceNumber!}" placeholder="请输入设备编号"/>
+            <select class="select" name="deviceStatus" style="height: 30px;width: 150px">
+                <option value ="">全部</option>
+                <option value ="0" <#if deviceStatus??><#if deviceStatus == 0>selected="selected"</#if></#if>>停止使用</option>
+                <option value ="1" <#if deviceStatus??><#if deviceStatus == 1>selected="selected"</#if></#if>>正常使用</option>
+            </select>
+            <input class="my-input" type="text" name="deviceName" value="${deviceName!}" placeholder="请输入设备名称"/>
+            <input class="my-input" type="text" name="deviceRemake" value="${deviceRemake!}" placeholder="请输入备注"/>
+            <button style="cursor:pointer;" type="submit" class="my-btn-search">搜索</button>
+        </form>
+    </div>
+    <div class="mt-20">
+        <table class="table table-border table-bordered table-bg table-hover table-sort">
+            <thead>
+            <tr class="text-c">
+                <th width="100">设备编号</th>
+                <th width="100">设备名称</th>
+                <th width="100">设备备注</th>
+                <th width="100">购买日期</th>
+                <th width="100">状态</th>
+                <th width="150">作用流程岗位</th>
+                <th width="50">操作</th>
+            </tr>
+            </thead>
+            <tbody id="listid">
+            <#if (page.dataList?size > 0)>
+                <#list page.dataList as device>
+
+                <tr>
+                    <td class="text-c" width="100">${device.deviceNumber!}</td>
+                    <td class="text-c" width="100">${device.deviceName!}</td>
+                    <td class="text-c" width="100">${device.deviceRemake!}</td>
+                    <td class="text-c" width="100">${(device.deviceDate?string("yyyy-MM-dd"))!''}</td>
+                    <td class="text-c" width="100">
+                        <#if device.deviceStatus == 0>
+                            停止使用
+                        </#if>
+                        <#if device.deviceStatus == 1>
+                            正常使用
+                        </#if>
+                        <#if device.deviceStatus == 2>
+                            设备故障
                         </#if>
-                        <#if (process_index + 1) != device.processList?size>
-                        ${process.produceName!}-${process.processName!},
+                    </td>
+                    <td class="text-c" width="100">
+                        <#if device.processList??>
+                            <#list device.processList as process>
+                                <#if (process_index + 1) == device.processList?size>
+                                ${process.produceName!}-${process.processName!}
+                                </#if>
+                                <#if (process_index + 1) != device.processList?size>
+                                ${process.produceName!}-${process.processName!},
+                                </#if>
+                            </#list>
                         </#if>
-                    </#list>
-                </#if>
-            </td>
-            <!-- 遍历操作 -->
-            <td class="td-manage text-c">
-                <a style="text-decoration:none" href="javascript:;" title="查看"
-                   onclick="edit_detail('${path}/admin/equipment/_update_device?deviceId=${device.deviceId!}');">
-                    <i class="Hui-iconfont">&#xe6df;</i>
-                </a>
-                <a style="text-decoration:none" href="javascript:;" title="查看"
-                   onclick="edit_process('${path}/admin/equipment/_update_process?deviceId=${device.deviceId!}');">
-                    <i class="Hui-iconfont">&#xe665;</i>
-                </a>
-            </td>
-        </tr>
-        </#list>
-        </tbody>
-    </table>
+                    </td>
+                    <!-- 遍历操作 -->
+                    <td class="td-manage text-c">
+                        <a style="text-decoration:none" href="javascript:;" title="查看"
+                           onclick="edit_detail('${path}/admin/equipment/_update_device?deviceId=${device.deviceId!}');">
+                            <i class="Hui-iconfont">&#xe6df;</i>
+                        </a>
+                        <a style="text-decoration:none" href="javascript:;" title="查看"
+                           onclick="edit_process('${path}/admin/equipment/_update_process?deviceId=${device.deviceId!}');">
+                            <i class="Hui-iconfont">&#xe665;</i>
+                        </a>
+                    </td>
+                </tr>
+                </#list>
+            <#else >
+            <tr><td class="td-manage text-c" colspan = "7">暂时没有设备，请添加</td></tr>
+            </#if>
+            </tbody>
+        </table>
     </div>
 </div>
 <div style="padding-top: 10px;"></div>