生产产品接口

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

@@ -13,4 +13,7 @@ public interface ProduceService {
     //获取生产产品列表
     List<Produce> getProduceList();
 
+    //获取生产产品，产品工序，工序节点
+    List<Produce> getAllProduceList(Integer employeeId);
+
 }

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

@@ -23,4 +23,10 @@ public class ProduceServiceImpl implements ProduceService {
     public  List<Produce> getProduceList() {
         return produceMapper.getProduceList();
     }
+
+
+    //获取生产产品，产品工序，工序节点
+    public List<Produce> getAllProduceList(Integer employeeId){
+        return produceMapper.getAllProduceList(employeeId);
+    }
 }

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

@@ -12,4 +12,7 @@ public interface ProduceMapper {
 
     //获取生产产品列表
     List<Produce> getProduceList();
+
+    //获取生产产品，产品工序，工序节点
+    List<Produce> getAllProduceList(Integer employeeId);
 }

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

@@ -3,6 +3,7 @@ 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.ResponseJson;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -18,7 +19,7 @@ import java.util.List;
  * wangxiaoming
  */
 @Controller
-@RequestMapping("/admin/produce")
+@RequestMapping("/produce")
 public class ProduceController {
 
     @Autowired
@@ -71,9 +72,26 @@ public class ProduceController {
     }
 
 
+    /**
+     * 获取生产产品、员工工作工序、工序操作选项
+     */
+    //@RequiresPermissions("produce:save_produce:produce")
+    @RequestMapping("/getProduce")
+    public ResponseJson getProduce(HttpServletRequest request) {
+        ResponseJson rsj = new ResponseJson();
+        String employeeId = request.getParameter("employeeId");
+        if (employeeId == null || "".equals(employeeId)) {
+            rsj.setResultCode(500);
+            rsj.setResultMsg("ERROR");
+            rsj.addResponseKeyValue("员工id为空");
+            return rsj;
+        }
 
-    //获取生产产品、员工工作工序、工序操作选项
+        List<Produce> list = produceService.getAllProduceList(Integer.valueOf(employeeId));
 
 
+        return rsj;
+    }
+
 
 }

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

@@ -6,6 +6,7 @@ import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.payUtil.StringUtil;
 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 javax.servlet.http.HttpServletRequest;
@@ -16,6 +17,8 @@ import java.util.Map;
  * pts系统员工信息controller
  * Created by wangxiaoming on 2017/8/29.
  */
+@Controller
+@RequestMapping("/staffmember")
 public class PtsEmployeeController {
 
     @Autowired
@@ -28,7 +31,7 @@ public class PtsEmployeeController {
      * @return
      */
     //@RequiresPermissions("produce:list_produce:produce")
-    @RequestMapping("/staffmember/getStaffmemberByNumber")
+    @RequestMapping("/getStaffmemberByNumber")
     public ResponseJson getStaffmemberByNumber(HttpServletRequest request) {
         ResponseJson rsj = new ResponseJson();
         String employeeNo = request.getParameter("staffmemberNumber");
@@ -47,7 +50,6 @@ public class PtsEmployeeController {
             rsj.addResponseKeyValue("查询不到该员工");
             return rsj;
         }
-
         rsj.setResultCode(200);
         rsj.setResultMsg("SUCCESS");
         rsj.addResponseKeyValue("returnMsg", ptsEmployee);