生产产品管理

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsMachine.java

@@ -19,6 +19,8 @@ public class PtsMachine implements Serializable{
     private Integer machineIsPrint;//是否打印
     private String machineCompoundImg;//合成图片
     private Integer machineProcessState;//生成流程状态
+    private String machineSoftwareVersion;//软件版本
+    private String machineHardwareVersion;//硬件版本
     private Date machineCreateTime;//创建时间
     private Date machineUpdateTime;//修改时间
 
@@ -125,4 +127,20 @@ public class PtsMachine implements Serializable{
     public void setMachineUpdateTime(Date machineUpdateTime) {
         this.machineUpdateTime = machineUpdateTime;
     }
+
+    public String getMachineSoftwareVersion() {
+        return machineSoftwareVersion;
+    }
+
+    public void setMachineSoftwareVersion(String machineSoftwareVersion) {
+        this.machineSoftwareVersion = machineSoftwareVersion;
+    }
+
+    public String getMachineHardwareVersion() {
+        return machineHardwareVersion;
+    }
+
+    public void setMachineHardwareVersion(String machineHardwareVersion) {
+        this.machineHardwareVersion = machineHardwareVersion;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsMachineLogs.java

@@ -1,12 +1,15 @@
 package com.iamberry.rst.core.pts;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * 机器生产流程日志实体类
  * Created by wangxiaoming on 2017/8/28.
  */
-public class PtsMachineLogs {
+public class PtsMachineLogs  implements Serializable {
+
+    private static final long serialVersionUID = -7197256299985669307L;
     private Integer logsId; //流程日志id
     private Integer machineId; //机器id
     private Integer employeeId; //员工id

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/processNode.java

@@ -15,6 +15,7 @@ public class processNode implements Serializable {
     private Integer produceId;          //产品id
     private Integer processId;          //工序id
     private Integer nodeNo;             //节点编号
+    private Integer nodeStatus;         //节点状态：0异常； 1正常；
     private String nodeDes;             //节点备注
     private Date nodeCreateTime;       //创建时间
     private Date nodeUpdateTime;       //修改时间
@@ -75,6 +76,14 @@ public class processNode implements Serializable {
         this.nodeUpdateTime = nodeUpdateTime;
     }
 
+    public Integer getNodeStatus() {
+        return nodeStatus;
+    }
+
+    public void setNodeStatus(Integer nodeStatus) {
+        this.nodeStatus = nodeStatus;
+    }
+
     @Override
     public String toString() {
         return "processNode{" +

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

@@ -0,0 +1,16 @@
+package com.iamberry.rst.faces.pts.produce;
+
+import com.iamberry.rst.core.pts.Produce;
+
+import java.util.List;
+
+/**
+ * 生产产品管理service
+ * Created by wangxiaoming on 2017/8/28.
+ */
+public interface ProduceService {
+
+    //获取生产产品列表
+    List<Produce> getProduceList();
+
+}

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

@@ -0,0 +1,24 @@
+package com.iamberry.rst.service.pts.produce;
+
+import com.iamberry.rst.core.pts.Produce;
+import com.iamberry.rst.faces.pts.produce.ProduceService;
+import com.iamberry.rst.service.pts.produce.mapper.ProduceMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+
+/**
+ * 生产产品管理
+ * Created by wangxiaoming on 2017/8/28.
+ */
+public class ProduceServiceImpl implements ProduceService {
+
+    @Autowired
+    private ProduceMapper produceMapper;
+
+    //获取生产产品列表
+    public  List<Produce> getProduceList() {
+        return produceMapper.getProduceList();
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.iamberry.rst.service.pts.produce.mapper;
+
+import com.iamberry.rst.core.pts.Produce;
+
+import java.util.List;
+
+/**
+ * 生产产品管理
+ * Created by wangxiaoming on 2017/8/28.
+ */
+public interface ProduceMapper {
+
+    //获取生产产品列表
+    List<Produce> getProduceList();
+}

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.iamberry.rst.service.product.mapper.ProductMapper">
+
+    <select id="getProduceList" parameterType="Produce" resultType="Produce">
+        SELECT
+            tb_rst_pts_produce.produce_id AS produceId,
+            tb_rst_pts_produce.produce_name AS produceName,
+            tb_rst_pts_produce.produce_status AS  produceStatus,
+            tb_rst_pts_produce.produce_remake AS produceRemake,
+            tb_rst_pts_produce.produce_create_time AS  produceCreateTime,
+            tb_rst_pts_produce.produce_update_time AS produceUpdateTime
+        FROM
+            tb_rst_pts_produce
+    </select>
+</mapper>

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

@@ -0,0 +1,64 @@
+package com.iamberry.rst.controllers.pts.produce;
+
+import com.iamberry.rst.core.faq.FAQDetails;
+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.faces.pts.produce.ProduceService;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 生产产品管理 controller
+ *  wangxiaoming
+ *
+ */
+@Controller
+@RequestMapping("/admin/produce")
+public class ProduceController {
+
+    @Autowired
+    private ProduceService produceService;
+
+
+    /**
+     * 查询生产产品列表
+     *
+     * @param request
+     * @return
+     */
+    @RequiresPermissions("produce:list_produce:produce")
+    @RequestMapping("/_produce_list")
+    public ModelAndView selectOrderList(HttpServletRequest request,
+                                        @RequestParam(value = "pageNO", defaultValue = "1", required = false) int pageNO,
+                                        @RequestParam(value = "pageTotal", required = false) Integer pageTotal,
+                                        @RequestParam(value = "pageSize", defaultValue = "5", required = false) int pageSize,
+                                        Order order) {
+        ModelAndView mv = new ModelAndView("produce/produce_list");
+        StringBuilder url = new StringBuilder("/admin/produce/_produce_list?pageSize=" + pageSize);
+        List<Produce> list = produceService.getProduceList();
+        mv.addObject("result", list);
+        return mv;
+    }
+
+
+    /**
+     * 跳转到添加产品页面
+     * @return
+     */
+    @RequiresPermissions("produce:to_save:produce")
+    @RequestMapping("/_to_save_produce")
+    public ModelAndView goSaveFilter(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("produce/saveProduce");
+        return mv;
+    }
+
+}