机器打印列表功能

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/MachineServiceImpl.java

@@ -2,7 +2,9 @@ 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.PtsDevice;
 import com.iamberry.rst.core.pts.PtsMachine;
 import com.iamberry.rst.core.pts.PtsMachineLogs;
 import com.iamberry.rst.faces.pts.MachineService;
@@ -35,9 +37,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-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -2,7 +2,9 @@ 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.PtsDevice;
 import com.iamberry.rst.core.pts.PtsMachine;
 import com.iamberry.rst.core.pts.PtsMachineLogs;
 import com.iamberry.rst.faces.pts.*;
@@ -42,15 +44,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 +64,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/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/pts/machine/machine_List.ftl

@@ -65,7 +65,7 @@
 			<table class="table table-border table-bordered table-bg table-hover table-sort">
 				<thead>
 				<tr class="text-c">
-					<th width="10">机器条码(点击打印)</th>
+					<th width="100">机器条码(点击打印)</th>
 					<th width="100">机器二维码(点击打印)</th>
 					<th width="100">打印状态</th>
 					<th width="100">销售状态</th>
@@ -225,7 +225,7 @@
                                 }else{
                                     machineProcessState = "异常";
                                 }
-                                var machineSalesDate = null;
+                                var machineSalesDate = "";
 								if(value.machineSalesDate != null && value.machineSalesDate != undefined){
                                     machineSalesDate =  formatDate(value.machineSalesDate);
 								}
@@ -233,16 +233,29 @@
                                 if(value.machineProducedTime != null && value.machineProducedTime != undefined){
                                     machineProducedTime =  formatDate(value.machineProducedTime);
                                 }
+                                var machineHardwareVersion = "";
+                                if(value.machineHardwareVersion != null && value.machineHardwareVersion != undefined){
+                                    machineHardwareVersion =  value.machineHardwareVersion;
+                                }
+
+                                var machineSoftwareVersion = "";
+                                if(value.machineSoftwareVersion != null && value.machineSoftwareVersion != undefined){
+                                    machineSoftwareVersion =  value.machineSoftwareVersion;
+                                }
 
 								$("#listid").prepend('<tr>'
-                                        +'<td class="text-c" width="100">value.machineBarcode</td>'
+                                        +'<td class="text-c" width="100">'+value.machineBarcode+'</td>'
                                         +'<td class="text-c" width="100"><div id="" onclick="print('+value.machineBarcode+')"><img style="width: 50px;height: 50px;" src="'+value.machineQrcode+'"></td>'
                                         +'<td class="text-c" width="100">'+machineIsPrint+'</td>'
                                         +'<td class="text-c" width="100">'+machineSalesState+'</td>'
 										+'<td class="text-c" width="100">'+machineSalesDate+'</td>'
                             			+'<td class="text-c" width="100">'+machineProcessState+'</td>'
                                         +'<td class="text-c" width="100">'+machineProducedTime+'</td>'
-                            			+'<td class="td-manage text-c"></td></tr>');
+                                        +'<td class="text-c" width="50">'+machineHardwareVersion+'</td>'
+                                        +'<td class="text-c" width="50">'+machineSoftwareVersion+'</td>'
+                            			+'<td class="td-manage text-c">'
+                                        +'<a onclick="machineLogs('+value.machineId+');" title="生产流程" href="javascript:;"  class="ml-5" style="text-decoration:none"><i class="Hui-iconfont">&#xe667;</i></a>'
+                                        +'</td></tr>');
 							});
 						}
 

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl

@@ -46,7 +46,7 @@
 				<tbody id="listid">
 					<#list machineList as list>
 						<tr class="text-c">
-                            <td width="2">
+                            <td width="10">
                                 <input name='checkbox' type='checkbox' value='${list.machineBarcode }${list.machineQrcode }${list.machineProduceType }' >
                             </td>
 							<td class="text-c" width="10">${list.machineBarcode }</td>
@@ -131,9 +131,9 @@
                                     '<span style="position: absolute;top:0px;font-size: 14px;">WaterO可移动智能净水机</span>' +
                                     '<span style="position: absolute;top: 24px;font-size: 12px;">型号：WA-1X</span>' +
                                     '<span style="position: absolute;top: 40px;font-size: 12px;">S／N</span>' +
-                                    '<div style="position: absolute;left: -10px;top: 75px;height: 30px;" id="bcTarget2" class="barcodeImg">' + barcodes + '</div>' +
-                                    '<span style="position: absolute;top: 102px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">' + machineBarcode + '</span>' +
-                                    '<img style="position: absolute;right: 2px;top:18px;width: 86px;height: 86px;" id="qrcodeImg" src="' + machineQrcode + '" /> ' +
+                                    '<div style="position: absolute;left: -10px;top: 75px;height: 30px;"  class="barcodeImg">' + barcodes + '</div>' +
+                                    '<span style="position: absolute;top: 102px;font-size: 12px;width: 116px;text-align: center;">' + machineBarcode + '</span>' +
+                                    '<img style="position: absolute;right: 2px;top:18px;width: 86px;height: 86px;"  src="' + machineQrcode + '" /> ' +
                                     '<span style="position: absolute;right: 26px;top: 102px;font-size: 12px;">NO.4295</span> ' +
                                     '</div>');
                         }
@@ -142,9 +142,9 @@
                                     '<span style="position: absolute;top:0px;font-size: 14px;">爱贝源冲奶机</span>' +
                                     '<span style="position: absolute;top: 24px;font-size: 12px;">型号：WA-1X</span>' +
                                     '<span style="position: absolute;top: 40px;font-size: 12px;">S／N</span>' +
-                                    '<div style="position: absolute;left: -10px;top: 75px;height: 30px;" id="bcTarget2" class="barcodeImg">' + barcodes + '</div>' +
-                                    '<span style="position: absolute;top: 102px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">' + machineBarcode + '</span>' +
-                                    '<img style="position: absolute;right: 2px;top:18px;width: 86px;height: 86px;" id="qrcodeImg" src="' + machineQrcode + '" /> ' +
+                                    '<div style="position: absolute;left: -10px;top: 75px;height: 30px;"  class="barcodeImg">' + barcodes + '</div>' +
+                                    '<span style="position: absolute;top: 102px;font-size: 12px;width: 116px;text-align: center;" >' + machineBarcode + '</span>' +
+                                    '<img style="position: absolute;right: 2px;top:18px;width: 86px;height: 86px;"  src="' + machineQrcode + '" /> ' +
                                     '<span style="position: absolute;right: 26px;top: 102px;font-size: 12px;">NO.4295</span> ' +
                                     '</div>');
                         }
@@ -254,7 +254,18 @@
                     var barcodes = $("#bcTarget").html();
                     /*$("#barcodeId").html(machineBarcode);
                     $("#qrcodeImg").attr('src',machineQrcode);*/
-                    if(machineProduceType == 1){//净水机模板
+
+                    $("#printlist").append('<div style="width: 268px;height: 152px;position: relative;">' +
+                            '<span style="position: absolute;top:0px;font-size: 14px;">WaterO可移动智能净水机</span>' +
+                            '<span style="position: absolute;top: 24px;font-size: 12px;">型号：WA-1X</span>' +
+                            '<span style="position: absolute;top: 40px;font-size: 12px;">S／N</span>' +
+                            '<div style="position: absolute;left: -10px;top: 75px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
+                            '<span style="position: absolute;top: 102px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
+                            '<img style="position: absolute;right: 2px;top:18px;width: 86px;height: 86px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
+                            '<span style="position: absolute;right: 26px;top: 102px;font-size: 12px;">NO.4295</span> ' +
+                            '</div>');
+
+                    /*if(machineProduceType == 1){//净水机模板
                         $("#printlist").append('<div style="width: 268px;height: 152px;position: relative;">' +
                                 '<span style="position: absolute;top:0px;font-size: 14px;">WaterO可移动智能净水机</span>' +
                                 '<span style="position: absolute;top: 24px;font-size: 12px;">型号：WA-1X</span>' +
@@ -275,7 +286,7 @@
                                 '<img style="position: absolute;right: 2px;top:18px;width: 86px;height: 86px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
                                 '<span style="position: absolute;right: 26px;top: 102px;font-size: 12px;">NO.4295</span> ' +
                                 '</div>');
-                    }
+                    }*/
                 }
                 $("#printlist").printArea();