后台机器类 机器列表

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

@@ -1,5 +1,7 @@
 package com.iamberry.rst.faces.pts;
 
+import com.iamberry.rst.core.order.Order;
+import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.pts.Produce;
 import com.iamberry.rst.core.pts.PtsMachine;
 
@@ -15,4 +17,7 @@ public interface MachineService {
 
     //修改机器信息
     Integer updateMachine(PtsMachine ptsMachine);
+
+    //查询机器列表
+    PagedResult<PtsMachine> listMachine(int pageNO, int pageSize, PtsMachine ptsMachine, boolean isTotalNum);
 }

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

@@ -22,10 +22,10 @@ public interface ProduceService {
     Produce getProduce(String produceNo);
 
     //获取单个工序信息
-    ProduceProcess getProduceProcess(Integer produceId,char processNo);
+    ProduceProcess getProduceProcess(Integer produceId,String processNo);
 
     //获取单个工序选项信息
-    ProcessNode getprocessNode(Integer ProcessId,char nodeNo);
+    ProcessNode getprocessNode(Integer ProcessId,String nodeNo);
 
     //获取当前产品所有工序信息
     List<ProduceProcess> listProduceProcess(Integer produceId);

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

@@ -1,8 +1,12 @@
 package com.iamberry.rst.service.pts;
 
+import com.github.pagehelper.PageHelper;
+import com.iamberry.rst.core.order.Order;
+import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.pts.PtsMachine;
 import com.iamberry.rst.faces.pts.MachineService;
 import com.iamberry.rst.service.pts.mapper.MachineMapper;
+import com.iamberry.rst.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -28,4 +32,11 @@ public class MachineServiceImpl implements MachineService {
     public Integer updateMachine(PtsMachine ptsMachine) {
         return machineMapper.updateMachine(ptsMachine);
     }
+
+    @Override
+    public PagedResult<PtsMachine> listMachine(int pageNO, int pageSize, PtsMachine ptsMachine, boolean isTotalNum) {
+        PageHelper.startPage(pageNO, pageSize, isTotalNum);
+        List<PtsMachine> list = machineMapper.listMachine(ptsMachine);
+        return PageUtil.getPage(list);
+    }
 }

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

@@ -38,7 +38,7 @@ public class ProduceServiceImpl implements ProduceService {
     }
 
     @Override
-    public ProduceProcess getProduceProcess(Integer produceId,char processNo) {
+    public ProduceProcess getProduceProcess(Integer produceId,String processNo) {
         ProduceProcess produceProcess = new ProduceProcess();
         produceProcess.setProduceId(produceId);
         produceProcess.setProcessNo(processNo);
@@ -46,7 +46,7 @@ public class ProduceServiceImpl implements ProduceService {
     }
 
     @Override
-    public ProcessNode getprocessNode(Integer ProcessId,char nodeNo) {
+    public ProcessNode getprocessNode(Integer ProcessId,String nodeNo) {
         ProcessNode processNode = new ProcessNode();
         processNode.setProcessId(ProcessId);
         processNode.setNodeNo(nodeNo);

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

@@ -15,4 +15,7 @@ public interface MachineMapper {
 
     //修改机器信息
     Integer updateMachine(PtsMachine ptsMachine);
+
+    //查询机器列表
+    List<PtsMachine> listMachine(PtsMachine ptsMachine);
 }

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

@@ -48,4 +48,35 @@
             </if>
         </where>
     </update>
+
+    <select id="listMachine" parameterType="PtsMachine" resultType="PtsMachine">
+        SELECT
+         machine_id machineId,
+         machine_qrcode machineQrcode,
+         machine_barcode machineBarcode,
+         machine_sales_date machineSalesDate,
+         machine_sales_state machineSalesState,
+         machine_status machineStatus,
+         machine_produced_time machineProducedTime,
+         machine_sub_time machineSubTime,
+         machine_is_print machineIsPrint,
+         machine_compound_img machineCompoundImg,
+         machine_process_state machineProcessState,
+         machine_software_version machineSoftwareVersion,
+         machine_hardware_version machineHardwareVersion,
+         machine_create_time machineCreateTime,
+         machine_update_time machineUpdateTime
+         FROM  tb_rst_pts_machine
+        <where>
+            <if test="machineBarcode != null">
+                machine_barcode = #{machineBarcode}
+            </if>
+            <if test="machineIsPrint != null">
+               AND machine_is_print = #{machineIsPrint}
+            </if>
+            <if test="machineProcessState != null">
+                AND machine_process_state = #{machineProcessState}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -1,33 +1,18 @@
 package com.iamberry.rst.controllers.pts;
 
-import com.github.pagehelper.Page;
 import com.iamberry.rst.core.order.Order;
 import com.iamberry.rst.core.order.RentType;
 import com.iamberry.rst.core.page.PagedResult;
-import com.iamberry.rst.core.pts.*;
-import com.iamberry.rst.core.tools.QRCJson;
-import com.iamberry.rst.core.tools.WeixinUtil;
+import com.iamberry.rst.core.pts.PtsMachine;
 import com.iamberry.rst.faces.pts.*;
-import com.iamberry.wechat.tools.NameUtils;
-import com.iamberry.wechat.tools.ResponseJson;
-import com.iamberry.wechat.tools.ResultInfo;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by LJK on 2017/8/29.
@@ -67,60 +52,40 @@ public class AdminMachineController {
     @RequiresPermissions("order:select_all:order")
     @RequestMapping("/_machine_list")
     public ModelAndView listOrder(
-            @RequestParam(value= "pageSize",defaultValue= "6" ,required=false) Integer pageSize,
+            @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,
-            Order order){
+            PtsMachine ptsMachine){
         ModelAndView mv = new ModelAndView("machine/machine_list");
-        PagedResult<Order> pagedResult = machineService.listOrder(pageNO, pageSize, order, totalNum == 0);
+        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/order/select_list?pageSize=" + pageSize);
+        StringBuilder sb = new StringBuilder("/admin/mcahine/_machine_list?pageSize=" + pageSize);
 
-        if (StringUtils.isNotEmpty(order.getOrderAddressName())) {
-            sb.append("&orderAddressName=");
-            sb.append(order.getOrderAddressName());
-            mv.addObject("orderAddressName",order.getOrderAddressName());
-        }
-        if (StringUtils.isNotEmpty(order.getOrderAddressTel())) {
-            sb.append("&orderAddressTel=" );
-            sb.append(order.getOrderAddressTel());
-            mv.addObject("orderAddressTel",order.getOrderAddressTel());
-        }
-        if (StringUtils.isNotEmpty(order.getOrderOpenId())) {
-            sb.append("&orderOpenId=");
-            sb.append(order.getOrderOpenId());
-            mv.addObject("orderOpenId",order.getOrderOpenId());
+        if (StringUtils.isNotEmpty(ptsMachine.getMachineBarcode())) {
+            sb.append("&machineBarcode=");
+            sb.append(ptsMachine.getMachineBarcode());
+            mv.addObject("machineBarcode",ptsMachine.getMachineBarcode());
         }
-        if (order.getOrderRentType() != null && order.getOrderRentType() != -1) {
-            sb.append("&orderRentType=" );
-            sb.append(order.getOrderRentType());
-            mv.addObject("orderRentType",order.getOrderRentType());
+        if (ptsMachine.getMachineIsPrint() != null && ptsMachine.getMachineIsPrint() != -1) {
+            sb.append("&machineIsPrint=" );
+            sb.append(ptsMachine.getMachineIsPrint());
+            mv.addObject("machineIsPrint",ptsMachine.getMachineIsPrint());
         }
-        if (order.getOrderPayType() != null && order.getOrderPayType() != -1) {
-            sb.append("&orderPayType=" );
-            sb.append(order.getOrderPayType());
-            mv.addObject("orderPayType",order.getOrderPayType());
-        }
-        if (order.getOrderStatus() != null && order.getOrderStatus() != -1) {
-            sb.append("&orderStatus=" );
-            sb.append(order.getOrderStatus());
-            mv.addObject("orderStatus",order.getOrderStatus());
+        if (ptsMachine.getMachineProcessState() != null && ptsMachine.getMachineProcessState() != -1) {
+            sb.append("&machineProcessState=" );
+            sb.append(ptsMachine.getMachineProcessState());
+            mv.addObject("machineProcessState",ptsMachine.getMachineProcessState());
         }
         sb.append("&totalNum=");
         sb.append(totalNum == 0 ? pagedResult.getTotal() : totalNum);
         sb.append("&pageNO=");
 
-        //查询所有正在使用的租赁类型
-        List<RentType> rentTypeList = orderService.listRentType();
-        mv.addObject("rentTypeList",rentTypeList);
-
         mv.addObject("page", pagedResult);
         mv.addObject("url", sb.toString());
-        mv.addObject("conditionOrder",order);
         return mv;
     }
 }

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

@@ -77,8 +77,8 @@ public class MachineController {
             Long logsProcessTime = jsonObject.getLong("logsProcessTime"); //工序执行时间 （时间戳）
             Date logsProcessDate = new Date(logsProcessTime);
             Produce produce = produceService.getProduce(produceNo);//根据产品编号获取产品信息
-            ProduceProcess produceProcess = produceService.getProduceProcess(produce.getProduceId(),processNo.charAt(0));
-            ProcessNode processNode = produceService.getprocessNode(produceProcess.getProcessId(),nodeNo.charAt(0));
+            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);
             ptsMachineLogs.setDeviceId(produceProcess.getDriveId());
@@ -116,7 +116,7 @@ public class MachineController {
                     jsonObject2 = nodes.getJSONObject(i-1);
                     if(jsonObject2 != null){
                         processNo2 = jsonObject2.getString("processId");
-                        produceProcess2 = produceService.getProduceProcess(produce.getProduceId(),processNo2.charAt(0));
+                        produceProcess2 = produceService.getProduceProcess(produce.getProduceId(),processNo2);
                         //判断当前工序是否是修理工序，如果是，则修改上一条为次品
                         if(produceProcess.getProcessType() == 2){
                             ptsMachineLogs.setLogsErrorType(2);//异常类型 1:流程异常 2:次品异常
@@ -142,7 +142,7 @@ public class MachineController {
                                     jsonObject2 = nodes.getJSONObject(j);
                                     if(jsonObject2 != null){
                                         processNo2 = jsonObject2.getString("processId");
-                                        produceProcess2 = produceService.getProduceProcess(produce.getProduceId(),processNo2.charAt(0));
+                                        produceProcess2 = produceService.getProduceProcess(produce.getProduceId(),processNo2);
                                         if(produceProcess2.getProcessType() == 1){//判断是否是修理工序 1:生产工序 2:修理工序
                                             if(produceProcess.getProcessSort() > produceProcess2.getProcessSort()){
                                                 ptsMachineLogs.setLogsProcessStatus(0);

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_List.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title></title>
+		<style>
+			*{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: 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>
+	</head>
+	<body>
+		<div>
+		<input class="my-input" type="text" placeholder="请输入机器编号"/>
+		<select class="my-select">
+			<option value ="未打印">未打印</option>
+		</select>
+		<select class="my-select">
+			<option value ="正常">正常</option>
+		</select>
+		<button type="submit" class="my-btn-search">搜索</button>
+		</div>
+	</body>
+</html>