修改名称。

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

@@ -2,6 +2,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.core.pts.ProduceProcess;
 import com.iamberry.rst.faces.pts.ProduceService;
 import com.iamberry.wechat.tools.RespJsonBean;
 import com.iamberry.wechat.tools.ResponseJson;
@@ -21,8 +22,8 @@ import java.util.List;
  * wangxiaoming
  */
 @Controller
-@RequestMapping("/produce")
-public class ProduceController {
+@RequestMapping("/admin/produce")
+public class AdminProduceController {
 
     @Autowired
     private ProduceService produceService;
@@ -36,19 +37,21 @@ public class ProduceController {
      */
     @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);
+    public ModelAndView selectOrderList(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("pts/produce/produce_list");
         List<Produce> list = produceService.getProduceList();
-        mv.addObject("result", list);
+
+        //获取每个产品的所有工序
+        for (Produce produce : list){
+            ProduceProcess produceProcess = new ProduceProcess();
+            produceProcess.setProduceId(produce.getProduceId());
+            List<ProduceProcess> produceProcessesList = produceService.listProduceProcess(produceProcess);
+            produce.setProcess(produceProcessesList);
+        }
+        mv.addObject("resultList", list);
         return mv;
     }
 
-
     /**
      * 跳转到添加产品页面
      *
@@ -57,7 +60,7 @@ public class ProduceController {
     @RequiresPermissions("produce:save_produce:produce")
     @RequestMapping("/to_save_produce")
     public ModelAndView goSaveProduce(HttpServletRequest request) {
-        ModelAndView mv = new ModelAndView("produce/saveProduce");
+        ModelAndView mv = new ModelAndView("pts/produce/save_produce");
         return mv;
     }
 
@@ -74,30 +77,30 @@ public class ProduceController {
         return new ResponseJson(200, "VALIDATION_ERROR", 500);
     }
 
-
     /**
-     * 获取生产产品、员工工作工序、工序操作选项  接口
-     *  @return:RespJsonBean  用于对接app的专用Bean
+     * 跳转到修改页面
+     *
+     * @return
      */
-    //@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;
+    @RequiresPermissions("produce:update_produce:produce")
+    @RequestMapping("/to_update_produce")
+    public ModelAndView toUpdateProduce(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("pts/produce/update_produce");
+        return mv;
     }
 
+    /**
+     * 修改产品
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("produce:update_produce:produce")
+    @RequestMapping("/update_produce")
+    public ResponseJson updateProduce(HttpServletRequest request,Produce produce) {
+        int flag = produceService.saveProduce(produce);
+        return new ResponseJson(200, "VALIDATION_ERROR", 500);
+    }
 
 }

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

@@ -0,0 +1,30 @@
+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 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 org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * pts系统员工信息controller
+ * Created by wangxiaoming on 2017/8/29.
+ */
+@Controller
+@RequestMapping("/admin/staffmember")
+public class AdminPtsEmployeeController {
+
+    @Autowired
+    private PtsEmployeeService ptsEmployeeService;
+
+
+}