产品管理修改，查询员工信息修改

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

@@ -18,6 +18,7 @@ public class PtsEmployee implements Serializable{
     private Date employeeDepartureDate;//离职日期
     private String employeePost; //员工岗位
     private String employeeDesc; //员工备注
+    private Integer employeeClearPower; //是否拥有清除权限 0:否 1:是
     private Date employeeCreateTime; //创建时间
     private Date employeeUpdateTime; //修改时间
 
@@ -108,4 +109,12 @@ public class PtsEmployee implements Serializable{
     public void setEmployeeUpdateTime(Date employeeUpdateTime) {
         this.employeeUpdateTime = employeeUpdateTime;
     }
+
+    public Integer getEmployeeClearPower() {
+        return employeeClearPower;
+    }
+
+    public void setEmployeeClearPower(Integer employeeClearPower) {
+        this.employeeClearPower = employeeClearPower;
+    }
 }

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

@@ -29,4 +29,7 @@ public interface ProduceService {
 
     //获取当前产品所有工序信息
     List<ProduceProcess> listProduceProcess(Integer produceId);
+
+    //添加Produce
+    Integer saveProduce(Produce produce);
 }

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

@@ -58,5 +58,17 @@ public class ProduceServiceImpl implements ProduceService {
         return produceMapper.listProduceProcess(produceId);
     }
 
+    //添加产品
+    public Integer saveProduce(Produce produce){
+        int flag = produceMapper.saveProduce(produce);
+        return flag;
+    }
+
+    //添加产品工序
+    private Integer saveProduceProcess(List<ProduceProcess> produceProcessesList){
+        int flag = produceMapper.saveProduceProcessList(produceProcessesList);
+        return flag;
+    }
+
 
 }

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

@@ -30,4 +30,10 @@ public interface ProduceMapper {
     //获取当前产品所有工序信息
     List<ProduceProcess> listProduceProcess(Integer produceId);
 
+    //添加产品
+    Integer saveProduce(Produce produce);
+
+    //添加产品工序
+    Integer saveProduceProcessList(List<ProduceProcess> produceProcessesList);
+
 }

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

@@ -18,6 +18,7 @@
     <!--获取产品工序节点的接口sql-start-->
     <resultMap id="ProduceMap" type="com.iamberry.rst.core.pts.Produce">
         <id column="produce_id" property="produceId" />
+        <result column="produce_no" property="produceNo" />
         <result column="produce_name" property="produceName" />
         <result column="produce_status" property="produceStatus" />
         <result column="produce_remake" property="produceRemake" />
@@ -27,7 +28,6 @@
         <collection property="process" column="{produceId = produce_id ,employeeId = employee_id}" javaType="ArrayList"
                     ofType="com.iamberry.rst.core.pts.ProduceProcess" select="getProduceProcessList"/>
     </resultMap>
-
     <resultMap id="ProduceProcessMap" type="com.iamberry.rst.core.pts.ProduceProcess">
         <id column="process_id" property="processId"/>
         <result column="produce_id" property="produceId"/>
@@ -43,7 +43,6 @@
         <collection property="nodes" column="process_id" javaType="ArrayList"
                     ofType="com.iamberry.rst.core.pts.ProcessNode" select="getProcessNodeList"/>
     </resultMap>
-
     <resultMap id="ProcessNodeMap" type="com.iamberry.rst.core.pts.ProcessNode">
         <id column="node_id" property="nodeId"/>
         <result column="produce_id" property="produceId"/>
@@ -54,62 +53,59 @@
         <result column="node_create_time" property="nodeCreateTime"/>
         <result column="node_update_time" property="nodeUpdateTime"/>
     </resultMap>
-
     <select id="getAllProduceList" parameterType="java.lang.Integer" resultMap="ProduceMap">
         SELECT
-            tp.produce_id,
-            tp.produce_name,
-            tp.produce_status,
-            tp.produce_remake,
-            tp.produce_create_time,
-            tp.produce_update_time,
-            ts.employee_id
+        tp.produce_id,
+        tp.produce_no,
+        tp.produce_name,
+        tp.produce_status,
+        tp.produce_remake,
+        tp.produce_create_time,
+        tp.produce_update_time,
+        ts.employee_id
         FROM
-            	tb_rst_pts_produce tp
+        tb_rst_pts_produce tp
         LEFT JOIN tb_rst_pts_produce_process ts ON tp.produce_id = ts.produce_id AND ts.employee_id = #{employeeId}
         GROUP BY tp.produce_id
     </select>
-
     <select id="getProduceProcessList" parameterType="java.util.HashMap" resultMap="ProduceProcessMap">
-       SELECT
-            ts.process_id,
-            ts.produce_id,
-            ts.process_no,
-            ts.process_name,
-            ts.employee_id,
-            ts.drive_id,
-            ts.process_status,
-            ts.process_sort,
-            ts.process_remake,
-            ts.process_create_time,
-            ts.process_update_time
+        SELECT
+        ts.process_id,
+        ts.produce_id,
+        ts.process_no,
+        ts.process_name,
+        ts.employee_id,
+        ts.drive_id,
+        ts.process_status,
+        ts.process_sort,
+        ts.process_remake,
+        ts.process_create_time,
+        ts.process_update_time
         FROM
-            tb_rst_pts_produce_process ts
+        tb_rst_pts_produce_process ts
         WHERE  ts.produce_id = #{produceId}
         AND ts.employee_id = #{employeeId}
     </select>
-
     <select id="getProcessNodeList" parameterType="java.lang.Integer" resultMap="ProcessNodeMap">
         SELECT
-            tn.node_id,
-            tn.produce_id,
-            tn.process_id,
-            tn.node_no,
-            tn.node_status,
-            tn.node_des,
-            tn.node_create_time,
-            tn.node_update_time
+        tn.node_id,
+        tn.produce_id,
+        tn.process_id,
+        tn.node_no,
+        tn.node_status,
+        tn.node_des,
+        tn.node_create_time,
+        tn.node_update_time
         FROM
-            tb_rst_pts_process_node tn
+        tb_rst_pts_process_node tn
         WHERE  tn.process_id = #{processId}
     </select>
-    <!--获取产品工序节点的接口sql-start-->
+    <!--获取产品工序节点的接口sql-end-->
+
 
-    <!--根据产品编号获取产品信息-->
-    <select id="getProduce" parameterType="String" resultType="Produce">
+    <select id="getProduce" parameterType="Integer" resultType="Produce">
         SELECT
         tb_rst_pts_produce.produce_id AS produceId,
-        tb_rst_pts_produce.produce_no AS produceNo,
         tb_rst_pts_produce.produce_name AS produceName,
         tb_rst_pts_produce.produce_status AS  produceStatus,
         tb_rst_pts_produce.produce_remake AS produceRemake,
@@ -118,10 +114,10 @@
         FROM
         tb_rst_pts_produce
         WHERE
-        produce_no = #{produceNo}
+        produce_id = #{produceId}
     </select>
 
-    <select id="getProduceProcess" parameterType="ProduceProcess" resultType="ProduceProcess">
+    <select id="getProduceProcess" parameterType="Integer" resultType="ProduceProcess">
         SELECT
         pp.process_id AS processId,
         pp.produce_id AS produceId,
@@ -133,52 +129,65 @@
         pp.process_sort AS processSort,
         pp.process_remake AS processRemake,
         pp.process_create_time AS processCreateTime,
-        pp.process_update_time AS processUpdateTime,
-        pp.process_type AS processType
+        pp.process_update_time AS processUpdateTime
         FROM
         tb_rst_pts_produce_process pp
         WHERE
-        pp.produce_id = #{produceId}
-        AND
-        pp.process_no = #{processNo}
+        pp.process_id = #{processId}
     </select>
 
-    <select id="getprocessNode" parameterType="ProcessNode" resultType="ProcessNode">
+    <select id="getprocessNode" parameterType="Integer" resultType="ProcessNode">
         SELECT
         node_id AS nodeId,
         produce_id AS produceId,
         process_id AS processId,
         node_no AS  nodeNo,
         node_status AS nodeStatus,
-        node_des AS  nodeDes,
+        node_desc AS  nodeDesc,
         node_create_time AS nodeCreateTime,
         node_update_time AS nodeUpdateTime
         FROM
         tb_rst_pts_process_node
         WHERE
-        process_id = #{processId}
-        AND
-        node_no = #{nodeNo}
+        node_id = #{nodeId}
     </select>
 
-    <select id="listProduceProcess" parameterType="ProduceProcess" resultType="ProduceProcess">
-        SELECT
-        pp.process_id AS processId,
-        pp.produce_id AS produceId,
-        pp.process_no AS processNo,
-        pp.process_name AS  processName,
-        pp.employee_id AS employeeId,
-        pp.drive_id AS  driveId,
-        pp.process_status AS processStatus,
-        pp.process_sort AS processSort,
-        pp.process_remake AS processRemake,
-        pp.process_create_time AS processCreateTime,
-        pp.process_update_time AS processUpdateTime
-        FROM
-        tb_rst_pts_produce_process pp
+
+    <insert id="saveProduce" parameterType="Produce" useGeneratedKeys="true">
+        insert into tbRstPtsProduce (produce_no,produce_name,produce_status,produce_remake,produce_create_time,produce_update_time)
+        values (#{produceNo},#{produceName},#{produceStatus},#{produceRemake},#{produceCreateTime},#{produceUpdateTime})
+    </insert>
+
+    <update id="updateProduce" parameterType="Produce" >
+        UPDATE tbRstPtsProduce
+        SET
+        produce_no = #{produceNo},
+        produce_name = #{produceName},
+        produce_status = #{produceStatus},
+        produce_remake = #{produceRemake},
+        produce_create_time = #{produceCreateTime},
+        produce_update_time = #{produceUpdateTime}
         WHERE
-        pp.produce_id = #{produceId}
-        order by id ACS
-    </select>
+        produce_id = #{produceId}
+    </update>
+
+
+    <insert id="saveProduceProcessList" parameterType="java.util.ArrayList" useGeneratedKeys="true">
+        insert into tbRstPtsProduce (produce_no,produce_name,produce_status,produce_remake,produce_create_time,produce_update_time)
+        values (#{produceNo},#{produceName},#{produceStatus},#{produceRemake},#{produceCreateTime},#{produceUpdateTime})
+    </insert>
+
+    <update id="updateProduceProcessList" parameterType="java.util.ArrayList" >
+        UPDATE tbRstPtsProduce
+        SET
+        produce_no = #{produceNo},
+        produce_name = #{produceName},
+        produce_status = #{produceStatus},
+        produce_remake = #{produceRemake},
+        produce_create_time = #{produceCreateTime},
+        produce_update_time = #{produceUpdateTime}
+        WHERE
+        produce_id = #{produceId}
+    </update>
 
 </mapper>

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

@@ -4,20 +4,29 @@
 
     <select id="getPtsEmployee" parameterType="PtsEmployee" resultType="PtsEmployee">
        SELECT
-            tb_rst_pts_employee.employee_id AS employeeId,
-            tb_rst_pts_employee.employee_no AS employeeNo,
-            tb_rst_pts_employee.employee_name AS employeeName,
-            tb_rst_pts_employee.employee_tel AS  employeeTel,
-            tb_rst_pts_employee.employee_state AS  employeeState,
-            tb_rst_pts_employee.employee_entry_date AS  employeeEntryDate,
-            tb_rst_pts_employee.employee_departure_date AS employeeDepartureDate ,
-            tb_rst_pts_employee.employee_post AS  employeePost,
-            tb_rst_pts_employee.employee_desc AS  employeeDesc,
-            tb_rst_pts_employee.employee_create_time AS  employeeCreateTime,
-            tb_rst_pts_employee.employee_update_time AS  employeeUpdateTime
+            employee_id AS employeeId,
+            employee_no AS employeeNo,
+            employee_name AS employeeName,
+            employee_tel AS  employeeTel,
+            employee_state AS  employeeState,
+            employee_entry_date AS  employeeEntryDate,
+            employee_departure_date AS employeeDepartureDate ,
+            employee_post AS  employeePost,
+            employee_desc AS  employeeDesc,
+            employee_clear_power AS  employeeClearPower,
+            employee_create_time AS  employeeCreateTime,
+            employee_update_time AS  employeeUpdateTime
         FROM
             tb_rst_pts_employee
+        WHERE
+            <if test="employeeId !=null and employeeId !=''">
+                employee_id = #{employeeId}
+            </if>
+            <if test="employeeNo !=null and employeeNo !=''">
+                employee_no = #{employeeNo}
+            </if>
     </select>
+
     <select id="getPtsEmployeeById" parameterType="Integer" resultType="PtsEmployee">
         SELECT
          employee_id AS employeeId,
@@ -29,6 +38,7 @@
          employee_departure_date AS employeeDepartureDate ,
          employee_post AS  employeePost,
          employee_desc AS  employeeDesc,
+         employee_clear_power AS  employeeClearPower,
          employee_create_time AS  employeeCreateTime,
          employee_update_time AS  employeeUpdateTime
         FROM

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

@@ -3,12 +3,14 @@ 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;
@@ -53,7 +55,7 @@ public class ProduceController {
      * @return
      */
     @RequiresPermissions("produce:save_produce:produce")
-    @RequestMapping("/_to_save_produce")
+    @RequestMapping("/to_save_produce")
     public ModelAndView goSaveProduce(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView("produce/saveProduce");
         return mv;
@@ -64,32 +66,36 @@ public class ProduceController {
      *
      * @return
      */
+    @ResponseBody
     @RequiresPermissions("produce:save_produce:produce")
-    @RequestMapping("/_save_produce")
-    public ModelAndView saveProduce(HttpServletRequest request) {
-        ModelAndView mv = new ModelAndView("produce/saveProduce");
-        return mv;
+    @RequestMapping("/save_produce")
+    public ResponseJson saveProduce(HttpServletRequest request,Produce produce) {
+        int flag = produceService.saveProduce(produce);
+        return new ResponseJson(200, "VALIDATION_ERROR", 500);
     }
 
 
     /**
-     * 获取生产产品、员工工作工序、工序操作选项
+     * 获取生产产品、员工工作工序、工序操作选项  接口
+     *  @return:RespJsonBean  用于对接app的专用Bean
      */
     //@RequiresPermissions("produce:save_produce:produce")
+    @ResponseBody
     @RequestMapping("/getProduce")
-    public ResponseJson getProduce(HttpServletRequest request) {
-        ResponseJson rsj = new ResponseJson();
-        String employeeId = request.getParameter("employeeId");
+    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.addResponseKeyValue("returnMsg",list);
+        rsj.setReturnMsg(list);
         return rsj;
     }
 

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

@@ -2,12 +2,14 @@ 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;
@@ -28,13 +30,14 @@ public class PtsEmployeeController {
      * 根据员工编号查询员工信息
      *
      * @param request
-     * @return
+     * @return:RespJsonBean  用于对接app的专用Bean
      */
     //@RequiresPermissions("produce:list_produce:produce")
+    @ResponseBody
     @RequestMapping("/getStaffmemberByNumber")
-    public ResponseJson getStaffmemberByNumber(HttpServletRequest request) {
-        ResponseJson rsj = new ResponseJson();
-        String employeeNo = request.getParameter("staffmemberNumber");
+    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");
@@ -43,7 +46,7 @@ public class PtsEmployeeController {
         }
         PtsEmployee ptsEmployee = new PtsEmployee();
         ptsEmployee.setEmployeeNo(employeeNo);
-        ptsEmployee = ptsEmployeeService.getPtsEmployee(ptsEmployee);
+        ptsEmployee = ptsEmployeeService.getPtsEmployee(ptsEmployee); //查询员工信息
         if (ptsEmployee == null) {
             rsj.setResultCode(500);
             rsj.setResultMsg("ERROR");
@@ -52,7 +55,7 @@ public class PtsEmployeeController {
         }
         rsj.setResultCode(200);
         rsj.setResultMsg("SUCCESS");
-        rsj.addResponseKeyValue("returnMsg", ptsEmployee);
+        rsj.setReturnMsg(ptsEmployee);
         return rsj;
     }