审批

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApplyPick.java

@@ -8,6 +8,7 @@ import  java.io.Serializable;
  * @Date 2018-09-19
  */
 public class ApplyPick  implements  Serializable{
+    private static final long serialVersionUID = -8874322751370182090L;
     //主键
     private Integer applyPickId;
     //审批订单主键

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApplyPickItem.java

@@ -0,0 +1,102 @@
+package com.iamberry.rst.core.approval;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  提货项信息类
+ * @author
+ * @Date 2018-09-19
+ */
+public class ApplyPickItem  implements  Serializable{
+    private static final long serialVersionUID = 4180448063080320150L;
+    //主键
+    private Integer applyItemId;
+    //提货申请id
+    private Integer applyPickId;
+    //产品id
+    private Integer applyItemProductId;
+    //颜色id
+    private Integer applyItemColorId;
+    //产品名称
+    private String applyItemProductName;
+    //颜色名称
+    private String applyItemColorName;
+    //产品数量
+    private Integer applyItemProductNum;
+    //创建时间
+    private Date applyItemCreateTime;
+    //修改时间'
+    private Date applyItemUpdateTime;
+
+    public Integer getApplyItemId(){
+        return applyItemId;
+    }
+
+    public void setApplyItemId(Integer  applyItemId){
+        this.applyItemId=applyItemId;
+    }
+
+    public Integer getApplyPickId(){
+        return applyPickId;
+    }
+
+    public void setApplyPickId(Integer  applyPickId){
+        this.applyPickId=applyPickId;
+    }
+
+    public Integer getApplyItemProductId(){
+        return applyItemProductId;
+    }
+
+    public void setApplyItemProductId(Integer  applyItemProductId){
+        this.applyItemProductId=applyItemProductId;
+    }
+
+    public Integer getApplyItemColorId(){
+        return applyItemColorId;
+    }
+
+    public void setApplyItemColorId(Integer  applyItemColorId){
+        this.applyItemColorId=applyItemColorId;
+    }
+
+    public String getApplyItemProductName(){
+        return applyItemProductName;
+    }
+
+    public void setApplyItemProductName(String  applyItemProductName){
+        this.applyItemProductName=applyItemProductName;
+    }
+
+    public String getApplyItemColorName(){
+        return applyItemColorName;
+    }
+
+    public void setApplyItemColorName(String  applyItemColorName){
+        this.applyItemColorName=applyItemColorName;
+    }
+
+    public Integer getApplyItemProductNum(){
+        return applyItemProductNum;
+    }
+
+    public void setApplyItemProductNum(Integer  applyItemProductNum){
+        this.applyItemProductNum=applyItemProductNum;
+    }
+
+    public Date getApplyItemCreateTime(){
+        return applyItemCreateTime;
+    }
+
+    public void setApplyItemCreateTime(Date  applyItemCreateTime){
+        this.applyItemCreateTime=applyItemCreateTime;
+    }
+
+    public Date getApplyItemUpdateTime(){
+        return applyItemUpdateTime;
+    }
+
+    public void setApplyItemUpdateTime(Date  applyItemUpdateTime){
+        this.applyItemUpdateTime=applyItemUpdateTime;
+    }
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/approval/ApplyPickItemService.java

@@ -0,0 +1,37 @@
+package com.iamberry.rst.faces.approval;
+
+import com.iamberry.rst.core.approval.ApplyPickItem;
+
+import java.util.List;
+
+/**
+ *  提货项信息接口
+ * @author
+ * @Date 2018-09-19
+ */
+public interface ApplyPickItemService {
+    /**
+     * 获取集合
+     * @param  applyPickItem
+     * @return List
+     */
+    List<ApplyPickItem> getApplyPickItemList(ApplyPickItem  applyPickItem);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  applyPickItem
+     */
+    ApplyPickItem  getApplyPickItemById(Integer  id);
+    /**
+     * 增加数据
+     * @param  applyPickItem
+     * @return Integer
+     */
+    Integer  save(ApplyPickItem  applyPickItem);
+    /**
+     * 修改数据
+     * @param  applyPickItem
+     * @return Integer
+     */
+    Integer  update(ApplyPickItem  applyPickItem);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/approval/ApplyPickService.java

@@ -1,4 +1,37 @@
 package com.iamberry.rst.faces.approval;
 
+import com.iamberry.rst.core.approval.ApplyPick;
+
+import java.util.List;
+
+/**
+ *  提货申请信息接口
+ * @author
+ * @Date 2018-09-19
+ */
 public interface ApplyPickService {
-}
+    /**
+     * 获取集合
+     * @param  applyPick
+     * @return List
+     */
+    List<ApplyPick> getApplyPickList(ApplyPick  applyPick);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  applyPick
+     */
+    ApplyPick  getApplyPickById(Integer  id);
+    /**
+     * 增加数据
+     * @param  applyPick
+     * @return Integer
+     */
+    Integer  save(ApplyPick  applyPick);
+    /**
+     * 修改数据
+     * @param  applyPick
+     * @return Integer
+     */
+    Integer  update(ApplyPick  applyPick);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApplyPickItemServiceImpl.java

@@ -0,0 +1,56 @@
+package com.iamberry.rst.service.approval;
+
+import com.iamberry.rst.core.approval.ApplyPickItem;
+import com.iamberry.rst.faces.approval.ApplyPickItemService;
+import com.iamberry.rst.service.approval.mapper.ApplyPickItemMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  提货项信息接口
+ * @author
+ * @Date 2018-09-19
+ */
+@Service
+public class ApplyPickItemServiceImpl  implements ApplyPickItemService {
+    @Autowired
+    private ApplyPickItemMapper applyPickItemMapper;
+    /**
+     * 获取集合
+     * @param  applyPickItem
+     * @return List
+     */
+    @Override
+    public List<ApplyPickItem> getApplyPickItemList(ApplyPickItem  applyPickItem){
+        return  applyPickItemMapper.getApplyPickItemList(applyPickItem);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  applyPickItem
+     */
+    @Override
+    public  ApplyPickItem  getApplyPickItemById(Integer  id){
+        return  applyPickItemMapper.getApplyPickItemById(id);
+    }
+    /**
+     * 增加数据
+     * @param  applyPickItem
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(ApplyPickItem  applyPickItem){
+        return  applyPickItemMapper.save(applyPickItem);
+    }
+    /**
+     * 修改数据
+     * @param  applyPickItem
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(ApplyPickItem  applyPickItem){
+        return  applyPickItemMapper.update(applyPickItem);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApplyPickServiceImpl.java

@@ -0,0 +1,56 @@
+package com.iamberry.rst.service.approval;
+
+import com.iamberry.rst.core.approval.ApplyPick;
+import com.iamberry.rst.faces.approval.ApplyPickService;
+import com.iamberry.rst.service.approval.mapper.ApplyPickMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  提货申请信息接口
+ * @author
+ * @Date 2018-09-19
+ */
+@Service
+public class ApplyPickServiceImpl  implements ApplyPickService {
+    @Autowired
+    private ApplyPickMapper applyPickMapper;
+    /**
+     * 获取集合
+     * @param  applyPick
+     * @return List
+     */
+    @Override
+    public List<ApplyPick> getApplyPickList(ApplyPick  applyPick){
+        return  applyPickMapper.getApplyPickList(applyPick);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  applyPick
+     */
+    @Override
+    public  ApplyPick  getApplyPickById(Integer  id){
+        return  applyPickMapper.getApplyPickById(id);
+    }
+    /**
+     * 增加数据
+     * @param  applyPick
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(ApplyPick  applyPick){
+        return  applyPickMapper.save(applyPick);
+    }
+    /**
+     * 修改数据
+     * @param  applyPick
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(ApplyPick  applyPick){
+        return  applyPickMapper.update(applyPick);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/ApplyPickItemMapper.java

@@ -0,0 +1,37 @@
+package com.iamberry.rst.service.approval.mapper;
+
+import com.iamberry.rst.core.approval.ApplyPickItem;
+
+import java.util.List;
+
+/**
+ *  提货项信息接口
+ * @author
+ * @Date 2018-09-19
+ */
+public interface ApplyPickItemMapper {
+    /**
+     * 获取集合
+     * @param  applyPickItem
+     * @return List
+     */
+    List<ApplyPickItem> getApplyPickItemList(ApplyPickItem  applyPickItem);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  applyPickItem
+     */
+    ApplyPickItem  getApplyPickItemById(Integer  id);
+    /**
+     * 增加数据
+     * @param  applyPickItem
+     * @return Integer
+     */
+    Integer  save(ApplyPickItem  applyPickItem);
+    /**
+     * 修改数据
+     * @param  applyPickItem
+     * @return Integer
+     */
+    Integer  update(ApplyPickItem  applyPickItem);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/ApplyPickMapper.java

@@ -0,0 +1,37 @@
+package com.iamberry.rst.service.approval.mapper;
+
+import com.iamberry.rst.core.approval.ApplyPick;
+
+import java.util.List;
+
+/**
+ *  提货申请信息接口
+ * @author
+ * @Date 2018-09-19
+ */
+public interface ApplyPickMapper {
+    /**
+     * 获取集合
+     * @param  applyPick
+     * @return List
+     */
+    List<ApplyPick> getApplyPickList(ApplyPick  applyPick);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  applyPick
+     */
+    ApplyPick  getApplyPickById(Integer  id);
+    /**
+     * 增加数据
+     * @param  applyPick
+     * @return Integer
+     */
+    Integer  save(ApplyPick  applyPick);
+    /**
+     * 修改数据
+     * @param  applyPick
+     * @return Integer
+     */
+    Integer  update(ApplyPick  applyPick);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/applyPickItemMapper.xml

@@ -0,0 +1,97 @@
+<?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.approval.mapper.ApplyPickItemMapper">
+    <resultMap  id="BaseResultMap" type="ApplyPickItem" >
+        <result    column="apply_item_id"    property="applyItemId" />
+        <result    column="apply_pick_id"    property="applyPickId" />
+        <result    column="apply_item_product_id"    property="applyItemProductId" />
+        <result    column="apply_item_color_id"    property="applyItemColorId" />
+        <result    column="apply_item_product_name"    property="applyItemProductName" />
+        <result    column="apply_item_color_name"    property="applyItemColorName" />
+        <result    column="apply_item_product_num"    property="applyItemProductNum" />
+        <result    column="apply_item_create_time"    property="applyItemCreateTime" />
+        <result    column="apply_item_update_time"    property="applyItemUpdateTime" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.apply_item_id,
+        t.apply_pick_id,
+        t.apply_item_product_id,
+        t.apply_item_color_id,
+        t.apply_item_product_name,
+        t.apply_item_color_name,
+        t.apply_item_product_num,
+        t.apply_item_create_time,
+        t.apply_item_update_time
+    </sql>
+    <select id="getApplyPickItemList" resultMap="BaseResultMap" parameterType="ApplyPickItem" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_approval_apply_pick_item t
+        <where>
+            <if test="applyItemId != null ">
+                AND t.apply_item_id = #{applyItemId}
+            </if >
+            <if test="applyPickId != null ">
+                AND t.apply_pick_id = #{applyPickId}
+            </if >
+            <if test="applyItemProductId != null ">
+                AND t.apply_item_product_id = #{applyItemProductId}
+            </if >
+            <if test="applyItemColorId != null ">
+                AND t.apply_item_color_id = #{applyItemColorId}
+            </if >
+        </where>
+    </select>
+    <select id="getApplyPickItemById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_approval_apply_pick_item t
+        where t.apply_item_id= #{applyItemId}
+    </select>
+    <insert id="save" parameterType="ApplyPickItem" >
+        insert into
+        tb_rst_approval_apply_pick_item
+        (
+        apply_pick_id,
+        apply_item_product_id,
+        apply_item_color_id,
+        apply_item_product_name,
+        apply_item_color_name,
+        apply_item_product_num
+        )
+        values
+        (
+        #{applyPickId},
+        #{applyItemProductId},
+        #{applyItemColorId},
+        #{applyItemProductName},
+        #{applyItemColorName},
+        #{applyItemProductNum}
+        )
+    </insert>
+    <update id="update" parameterType="ApplyPickItem" >
+        update
+        tb_rst_approval_apply_pick_item
+        <set >
+            <if test="applyPickId != null ">
+                apply_pick_id = #{applyPickId},
+            </if >
+            <if test="applyItemProductId != null ">
+                apply_item_product_id = #{applyItemProductId},
+            </if >
+            <if test="applyItemColorId != null ">
+                apply_item_color_id = #{applyItemColorId},
+            </if >
+            <if test="applyItemProductName != null and applyItemProductName != ''">
+                apply_item_product_name = #{applyItemProductName},
+            </if >
+            <if test="applyItemColorName != null and applyItemColorName != ''">
+                apply_item_color_name = #{applyItemColorName},
+            </if >
+            <if test="applyItemProductNum != null ">
+                apply_item_product_num = #{applyItemProductNum},
+            </if >
+        </set >
+        where apply_item_id= #{applyItemId}
+    </update>
+</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/applyPickMapper.xml

@@ -0,0 +1,110 @@
+<?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.approval.mapper.ApplyPickMapper">
+    <resultMap  id="BaseResultMap" type="ApplyPick" >
+        <result    column="apply_pick_id"    property="applyPickId" />
+        <result    column="approval_id"    property="approvalId" />
+        <result    column="admin_id"    property="adminId" />
+        <result    column="apply_pick_name"    property="applyPickName" />
+        <result    column="apply_pick_tel"    property="applyPickTel" />
+        <result    column="apply_pick_reason"    property="applyPickReason" />
+        <result    column="apply_pick_struts"    property="applyPickStruts" />
+        <result    column="apply_pick_remk"    property="applyPickRemk" />
+        <result    column="apply_pick_create_time"    property="applyPickCreateTime" />
+        <result    column="apply_pick_update_time"    property="applyPickUpdateTime" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.apply_pick_id,
+        t.approval_id,
+        t.admin_id,
+        t.apply_pick_name,
+        t.apply_pick_tel,
+        t.apply_pick_reason,
+        t.apply_pick_struts,
+        t.apply_pick_remk,
+        t.apply_pick_create_time,
+        t.apply_pick_update_time
+    </sql>
+    <select id="getApplyPickList" resultMap="BaseResultMap" parameterType="ApplyPick" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_approval_apply_pick t
+        <where>
+            <if test="applyPickId != null ">
+                AND t.apply_pick_id = #{applyPickId}
+            </if >
+            <if test="approvalId != null ">
+                AND t.approval_id = #{approvalId}
+            </if >
+            <if test="adminId != null ">
+                AND t.admin_id = #{adminId}
+            </if >
+            <if test="applyPickName != null and applyPickName != ''">
+                AND t.apply_pick_name  like  CONCAT ('%',#{applyPickName},'%')
+            </if >
+            <if test="applyPickTel != null and applyPickTel != ''">
+                AND t.apply_pick_tel  like  CONCAT ('%',#{applyPickTel},'%')
+            </if >
+            <if test="applyPickStruts != null ">
+                AND t.apply_pick_struts = #{applyPickStruts}
+            </if >
+        </where>
+    </select>
+    <select id="getApplyPickById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_approval_apply_pick t
+        where t.apply_pick_id= #{applyPickId}
+    </select>
+    <insert id="save" parameterType="ApplyPick" >
+        insert into
+        tb_rst_approval_apply_pick
+        (
+        approval_id,
+        admin_id,
+        apply_pick_name,
+        apply_pick_tel,
+        apply_pick_reason,
+        apply_pick_struts,
+        apply_pick_remk
+        )
+        values
+        (
+        #{approvalId},
+        #{adminId},
+        #{applyPickName},
+        #{applyPickTel},
+        #{applyPickReason},
+        #{applyPickStruts},
+        #{applyPickRemk}
+        )
+    </insert>
+    <update id="update" parameterType="ApplyPick" >
+        update
+        tb_rst_approval_apply_pick
+        <set >
+            <if test="approvalId != null ">
+                approval_id = #{approvalId},
+            </if >
+            <if test="adminId != null ">
+                admin_id = #{adminId},
+            </if >
+            <if test="applyPickName != null and applyPickName != ''">
+                apply_pick_name = #{applyPickName},
+            </if >
+            <if test="applyPickTel != null and applyPickTel != ''">
+                apply_pick_tel = #{applyPickTel},
+            </if >
+            <if test="applyPickReason != null and applyPickReason != ''">
+                apply_pick_reason = #{applyPickReason},
+            </if >
+            <if test="applyPickStruts != null ">
+                apply_pick_struts = #{applyPickStruts},
+            </if >
+            <if test="applyPickRemk != null and applyPickRemk != ''">
+                apply_pick_remk = #{applyPickRemk},
+            </if >
+        </set >
+        where apply_pick_id= #{applyPickId}
+    </update>
+</mapper>

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -119,6 +119,8 @@
 		<typeAlias type="com.iamberry.rst.core.approval.ApprovalOrderItem" alias="ApprovalOrderItem"/>
 		<typeAlias type="com.iamberry.rst.core.approval.ApprovalPeople" alias="ApprovalPeople"/>
 		<typeAlias type="com.iamberry.rst.core.approval.ApprovalRecord" alias="ApprovalRecord"/>
+		<typeAlias type="com.iamberry.rst.core.approval.ApplyPick" alias="ApplyPick"/>
+		<typeAlias type="com.iamberry.rst.core.approval.ApplyPickItem" alias="ApplyPickItem"/>
 	</typeAliases>
 	<!-- PageHelper -->
 	<plugins>
@@ -189,5 +191,8 @@
 
 		<mapper resource="com/iamberry/rst/service/cm/mapper/inventoryLogMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/cm/mapper/inventoryMapper.xml"/>
+
+		<mapper resource="com/iamberry/rst/service/approval/mapper/applyPickItemMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/approval/mapper/applyPickMapper.xml"/>
 	</mappers>
 </configuration>