Merge remote-tracking branch 'liujiankang/master'

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

@@ -14,8 +14,8 @@ public class ProcessNode implements Serializable {
     private Integer nodeId;             //节点id
     private Integer produceId;          //产品id
     private Integer processId;          //工序id
-    private char nodeNo;             //节点编号
-    private Integer nodeStatus;         //节点状态：0异常； 1正常；
+    private String nodeNo;             //节点编号
+    private Integer nodeStatus;         //节点状态  1:正常  0异常
     private String nodeDes;             //节点备注
     private Date nodeCreateTime;       //创建时间
     private Date nodeUpdateTime;       //修改时间
@@ -44,11 +44,11 @@ public class ProcessNode implements Serializable {
         this.processId = processId;
     }
 
-    public char getNodeNo() {
+    public String getNodeNo() {
         return nodeNo;
     }
 
-    public void setNodeNo(char nodeNo) {
+    public void setNodeNo(String nodeNo) {
         this.nodeNo = nodeNo;
     }
 

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

@@ -12,7 +12,7 @@ public class Produce implements Serializable {
 
     private static final long serialVersionUID = -4839873263890150738L;
     private Integer  produceId;             //产品id
-    private char produceNo;                 //产品编号
+    private String produceNo;                 //产品编号
     private String produceName;             //产品名称
     private Integer produceStatus;          //产品状态
     private String produceRemake;           //产品备注
@@ -87,11 +87,11 @@ public class Produce implements Serializable {
         this.employeeId = employeeId;
     }
 
-    public char getProduceNo() {
+    public String getProduceNo() {
         return produceNo;
     }
 
-    public void setProduceNo(char produceNo) {
+    public void setProduceNo(String produceNo) {
         this.produceNo = produceNo;
     }
 

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

@@ -12,7 +12,7 @@ public class ProduceProcess implements Serializable {
     private static final long serialVersionUID = -1772411181364755611L;
     private Integer processId;              //工序id
     private Integer produceId;              //生产产品id
-    private char processNo;                //工序编号
+    private String processNo;                //工序编号
     private String processName;            //工序名称
     private Integer employeeId;            //员工id
     private Integer driveId;                //设备id
@@ -41,11 +41,11 @@ public class ProduceProcess implements Serializable {
         this.produceId = produceId;
     }
 
-    public char getProcessNo() {
+    public String getProcessNo() {
         return processNo;
     }
 
-    public void setProcessNo(char processNo) {
+    public void setProcessNo(String processNo) {
         this.processNo = processNo;
     }
 

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

@@ -0,0 +1,54 @@
+package com.iamberry.rst.controllers.pts;
+
+import com.iamberry.rst.core.order.Order;
+import com.iamberry.rst.core.pts.Produce;
+import com.iamberry.rst.faces.pts.ProduceService;
+import com.iamberry.wechat.tools.RespJsonBean;
+import com.iamberry.wechat.tools.ResponseJson;
+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.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 生产产品管理 controller
+ * wangxiaoming
+ */
+@Controller
+@RequestMapping("/produce")
+public class ProduceAppController {
+
+    @Autowired
+    private ProduceService produceService;
+
+    /**
+     * 获取生产产品、员工工作工序、工序操作选项  接口
+     *  @return:RespJsonBean  用于对接app的专用Bean
+     */
+    //@RequiresPermissions("produce:save_produce:produce")
+    @ResponseBody
+    @RequestMapping("/getProduce")
+    public RespJsonBean getProduce(HttpServletRequest request) {
+        RespJsonBean rsj = new RespJsonBean();
+        String employeeId = request.getParameter("employeeId"); //获取员工id
+
+        if (employeeId == null || "".equals(employeeId)) {
+            rsj.setResultCode(500);
+            rsj.setResultMsg("ERROR");
+            rsj.addResponseKeyValue("员工id为空");
+            return rsj;
+        }
+        //查询员工所做的产品，产品的工序，工序的节点操作
+        List<Produce> list = produceService.getAllProduceList(Integer.valueOf(employeeId));
+        rsj.setResultCode(200);
+        rsj.setResultMsg("SUCCESS");
+        rsj.setReturnMsg(list);
+        return rsj;
+    }
+}

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

@@ -0,0 +1,57 @@
+package com.iamberry.rst.controllers.pts;
+
+import com.iamberry.rst.core.pts.PtsEmployee;
+import com.iamberry.rst.faces.pts.PtsEmployeeService;
+import com.iamberry.wechat.tools.RespJsonBean;
+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.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * pts系统员工信息controller
+ * Created by wangxiaoming on 2017/8/29.
+ */
+@Controller
+@RequestMapping("/staffmember")
+public class PtsEmployeeAppController {
+
+    @Autowired
+    private PtsEmployeeService ptsEmployeeService;
+
+    /**
+     * 根据员工编号查询员工信息
+     *
+     * @param request
+     * @return:RespJsonBean  用于对接app的专用Bean
+     */
+    //@RequiresPermissions("produce:list_produce:produce")
+    @ResponseBody
+    @RequestMapping("/getStaffmemberByNumber")
+    public RespJsonBean getStaffmemberByNumber(HttpServletRequest request) {
+        RespJsonBean rsj = new RespJsonBean();
+        String employeeNo = request.getParameter("staffmemberNumber");  //获取员工编号
+        if (employeeNo == null || "".equals(employeeNo)) {
+            rsj.setResultCode(500);
+            rsj.setResultMsg("ERROR");
+            rsj.addResponseKeyValue("员工编号为空");
+            return rsj;
+        }
+        PtsEmployee ptsEmployee = new PtsEmployee();
+        ptsEmployee.setEmployeeNo(employeeNo);
+        ptsEmployee = ptsEmployeeService.getPtsEmployee(ptsEmployee); //查询员工信息
+        if (ptsEmployee == null) {
+            rsj.setResultCode(500);
+            rsj.setResultMsg("ERROR");
+            rsj.addResponseKeyValue("查询不到该员工");
+            return rsj;
+        }
+        rsj.setResultCode(200);
+        rsj.setResultMsg("SUCCESS");
+        rsj.setReturnMsg(ptsEmployee);
+        return rsj;
+    }
+
+}