Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/WechatUtils.java

@@ -71,12 +71,12 @@ public class WechatUtils {
 	 */
 	public static Member getUserBySession(HttpServletRequest request) {
 
-//		Member m = new Member();
-//		m.setUserId(11861);
-//		m.setUserOpenid("o3G6nw7DSmcQwSy3LtNhEcPYMqRI");
-//		if(true){
-//			return m;
-//		}
+		Member m = new Member();
+		m.setUserId(11861);
+		m.setUserOpenid("oaH_GwObiozJFBypUg0wKJjQpBiU");
+		if(true){
+			return m;
+		}
 
 		//获取一个cookie数组
 		Cookie[] cookies = request.getCookies();

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

@@ -1,24 +1,44 @@
 package com.iamberry.rst.core.approval;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
- * Created by Administrator on 2018/9/29.
+ * Created by  on 2018/9/29.
  */
-public class ApprovalApplyPick implements Serializable{
+public class ApprovalApplyPick implements Serializable {
     private static final long serialVersionUID = -2650565647759079562L;
-    private Integer applyPickId;//
-    private Integer approvalId;//审批订单信息id
-    private Integer adminId;//申请人id
-    private Integer applyPickName;//姓名
-    private Integer applyPickTel;//手机号码
-    private Integer applyPickReason;//提货原因
-    private Integer applyPickStruts;//提货状态1:未发货  2:已发货
-    private Integer applyPickRemk;//备注信息
-    private Integer applyPickCreateTime;//
-    private Integer applyPickUpdateTime;//
-    private List<ApprovalApplyPickItem> listApplyPickItem;//产品项集合
+    //主键
+    private Integer applyPickId;
+    //审批订单信息id
+    private Integer approvalId;
+    //申请人id
+    private Integer adminId;
+    //姓名
+    private String applyPickName;
+    //手机号码
+    private String applyPickTel;
+    //提货原因
+    private String applyPickReason;
+    //提货状态1:未发货 2:已发货
+    private Integer applyPickStruts;
+    //备注信息
+    private String applyPickRemk;
+    //创建时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date applyPickCreateTime;
+    //修改时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date applyPickUpdateTime;
+
+    private List<ApprovalApplyPickItem> listApplyPickItem = new ArrayList<>();
 
     public Integer getApplyPickId() {
         return applyPickId;
@@ -44,27 +64,27 @@ public class ApprovalApplyPick implements Serializable{
         this.adminId = adminId;
     }
 
-    public Integer getApplyPickName() {
+    public String getApplyPickName() {
         return applyPickName;
     }
 
-    public void setApplyPickName(Integer applyPickName) {
+    public void setApplyPickName(String applyPickName) {
         this.applyPickName = applyPickName;
     }
 
-    public Integer getApplyPickTel() {
+    public String getApplyPickTel() {
         return applyPickTel;
     }
 
-    public void setApplyPickTel(Integer applyPickTel) {
+    public void setApplyPickTel(String applyPickTel) {
         this.applyPickTel = applyPickTel;
     }
 
-    public Integer getApplyPickReason() {
+    public String getApplyPickReason() {
         return applyPickReason;
     }
 
-    public void setApplyPickReason(Integer applyPickReason) {
+    public void setApplyPickReason(String applyPickReason) {
         this.applyPickReason = applyPickReason;
     }
 
@@ -76,27 +96,27 @@ public class ApprovalApplyPick implements Serializable{
         this.applyPickStruts = applyPickStruts;
     }
 
-    public Integer getApplyPickRemk() {
+    public String getApplyPickRemk() {
         return applyPickRemk;
     }
 
-    public void setApplyPickRemk(Integer applyPickRemk) {
+    public void setApplyPickRemk(String applyPickRemk) {
         this.applyPickRemk = applyPickRemk;
     }
 
-    public Integer getApplyPickCreateTime() {
+    public Date getApplyPickCreateTime() {
         return applyPickCreateTime;
     }
 
-    public void setApplyPickCreateTime(Integer applyPickCreateTime) {
+    public void setApplyPickCreateTime(Date applyPickCreateTime) {
         this.applyPickCreateTime = applyPickCreateTime;
     }
 
-    public Integer getApplyPickUpdateTime() {
+    public Date getApplyPickUpdateTime() {
         return applyPickUpdateTime;
     }
 
-    public void setApplyPickUpdateTime(Integer applyPickUpdateTime) {
+    public void setApplyPickUpdateTime(Date applyPickUpdateTime) {
         this.applyPickUpdateTime = applyPickUpdateTime;
     }
 
@@ -107,4 +127,4 @@ public class ApprovalApplyPick implements Serializable{
     public void setListApplyPickItem(List<ApprovalApplyPickItem> listApplyPickItem) {
         this.listApplyPickItem = listApplyPickItem;
     }
-}
+}

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

@@ -1,118 +1,138 @@
 package com.iamberry.rst.core.approval;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * Created by Administrator on 2018/9/29.
  */
 public class ApprovalApplyPickItem implements Serializable{
     private static final long serialVersionUID = -3566469572724340861L;
-    private Integer applyitemid;//
-    private Integer applyPickId;//提货id
-    private Integer productId;//产品id
-    private String itemProductName;//产品名称
-    private String itemColorName;//颜色名称
-    private Integer itemProductNum;//产品数量
-    private String itemBrandName;//品牌名称
-    private String itemProductModel;//产品型号
-    private String itemProductUnit;//单位
-    private Integer itemProductBoxNumber;//箱数/套数
-    private Integer itemCreateTime;//
-    private Integer itemUpdateTime;//
-
-    public Integer getApplyitemid() {
-        return applyitemid;
-    }
-
-    public void setApplyitemid(Integer applyitemid) {
-        this.applyitemid = applyitemid;
-    }
-
-    public Integer getApplyPickId() {
+    //
+    private Integer applyItemId;
+    //提货id
+    private Integer applyPickId;
+    //产品id
+    private Integer productId;
+    //产品名称
+    private String itemProductName;
+    //颜色名称
+    private String itemColorName;
+    //产品数量
+    private Integer itemProductNum;
+    //品牌名称
+    private String itemBrandName;
+    //产品型号
+    private String itemProductModel;
+    //单位
+    private String itemProductUnit;
+    //箱数/套数
+    private Integer itemProductBoxNumber;
+    //创建时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date itemCreateTime;
+    //修改时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date itemUpdateTime;
+
+    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 void setApplyPickId(Integer  applyPickId){
+        this.applyPickId=applyPickId;
     }
 
-    public Integer getProductId() {
+    public Integer getProductId(){
         return productId;
     }
 
-    public void setProductId(Integer productId) {
-        this.productId = productId;
+    public void setProductId(Integer  productId){
+        this.productId=productId;
     }
 
-    public String getItemProductName() {
+    public String getItemProductName(){
         return itemProductName;
     }
 
-    public void setItemProductName(String itemProductName) {
-        this.itemProductName = itemProductName;
+    public void setItemProductName(String  itemProductName){
+        this.itemProductName=itemProductName;
     }
 
-    public String getItemColorName() {
+    public String getItemColorName(){
         return itemColorName;
     }
 
-    public void setItemColorName(String itemColorName) {
-        this.itemColorName = itemColorName;
+    public void setItemColorName(String  itemColorName){
+        this.itemColorName=itemColorName;
     }
 
-    public Integer getItemProductNum() {
+    public Integer getItemProductNum(){
         return itemProductNum;
     }
 
-    public void setItemProductNum(Integer itemProductNum) {
-        this.itemProductNum = itemProductNum;
+    public void setItemProductNum(Integer  itemProductNum){
+        this.itemProductNum=itemProductNum;
     }
 
-    public String getItemBrandName() {
+    public String getItemBrandName(){
         return itemBrandName;
     }
 
-    public void setItemBrandName(String itemBrandName) {
-        this.itemBrandName = itemBrandName;
+    public void setItemBrandName(String  itemBrandName){
+        this.itemBrandName=itemBrandName;
     }
 
-    public String getItemProductModel() {
+    public String getItemProductModel(){
         return itemProductModel;
     }
 
-    public void setItemProductModel(String itemProductModel) {
-        this.itemProductModel = itemProductModel;
+    public void setItemProductModel(String  itemProductModel){
+        this.itemProductModel=itemProductModel;
     }
 
-    public String getItemProductUnit() {
+    public String getItemProductUnit(){
         return itemProductUnit;
     }
 
-    public void setItemProductUnit(String itemProductUnit) {
-        this.itemProductUnit = itemProductUnit;
+    public void setItemProductUnit(String  itemProductUnit){
+        this.itemProductUnit=itemProductUnit;
     }
 
-    public Integer getItemProductBoxNumber() {
+    public Integer getItemProductBoxNumber(){
         return itemProductBoxNumber;
     }
 
-    public void setItemProductBoxNumber(Integer itemProductBoxNumber) {
-        this.itemProductBoxNumber = itemProductBoxNumber;
+    public void setItemProductBoxNumber(Integer  itemProductBoxNumber){
+        this.itemProductBoxNumber=itemProductBoxNumber;
     }
 
-    public Integer getItemCreateTime() {
+    public Date getItemCreateTime(){
         return itemCreateTime;
     }
 
-    public void setItemCreateTime(Integer itemCreateTime) {
-        this.itemCreateTime = itemCreateTime;
+    public void setItemCreateTime(Date  itemCreateTime){
+        this.itemCreateTime=itemCreateTime;
     }
 
-    public Integer getItemUpdateTime() {
+    public Date getItemUpdateTime(){
         return itemUpdateTime;
     }
 
-    public void setItemUpdateTime(Integer itemUpdateTime) {
-        this.itemUpdateTime = itemUpdateTime;
+    public void setItemUpdateTime(Date  itemUpdateTime){
+        this.itemUpdateTime=itemUpdateTime;
     }
-}
+}

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

@@ -25,6 +25,7 @@ public class ApprovalInfo implements Serializable{
     private ApprovalApplyPick approvalApplyPick;//提货申请集合
     private List<ApprovalProductionContract> listProductionContract;//审批合同集合
     private Integer approvalAdminId;//审核人adminid
+    private Integer selectType;//查询类型 1.我发起的 2.我审核的 3.仓库确认
 
     public Integer getApprovalId() {
         return approvalId;
@@ -145,4 +146,12 @@ public class ApprovalInfo implements Serializable{
     public void setApprovalAdminId(Integer approvalAdminId) {
         this.approvalAdminId = approvalAdminId;
     }
+
+    public Integer getSelectType() {
+        return selectType;
+    }
+
+    public void setSelectType(Integer selectType) {
+        this.selectType = selectType;
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.iamberry.rst.faces.approval;
 
+import com.iamberry.rst.core.approval.ApprovalApplyPick;
+import com.iamberry.rst.core.order.OrderBatch;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 
@@ -11,5 +13,41 @@ import java.util.List;
  * @Date 2018-09-19
  */
 public interface ApplyPickService {
+    /**
+     * 获取集合
+     * @param  approvalApplyPick
+     * @return List
+     */
+    List<ApprovalApplyPick>  getApprovalApplyPickList(ApprovalApplyPick  approvalApplyPick);
+
+    /**
+     * 获取分页集合
+     * @param pageNO
+     * @param pageSize
+     * @param approvalApplyPick
+     * @param isTotalNum
+     * @return
+     */
+    PagedResult<ApprovalApplyPick> listOrderBatchPage(int pageNO, int pageSize, ApprovalApplyPick  approvalApplyPick, boolean isTotalNum);
+
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  approvalApplyPick
+     */
+    ApprovalApplyPick  getApprovalApplyPickById(Integer  id);
+    /**
+     * 增加数据
+     * @param  approvalApplyPick
+     * @return Integer
+     */
+    Integer  save(ApprovalApplyPick  approvalApplyPick);
+    /**
+     * 修改数据
+     * @param  approvalApplyPick
+     * @return Integer
+     */
+    Integer  update(ApprovalApplyPick  approvalApplyPick);
+
 
 }

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

@@ -1,6 +1,8 @@
 package com.iamberry.rst.service.approval;
 
 import com.github.pagehelper.PageHelper;
+import com.iamberry.rst.core.approval.ApprovalApplyPick;
+import com.iamberry.rst.core.order.OrderBatch;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.faces.approval.ApplyPickService;
@@ -18,5 +20,50 @@ import java.util.List;
  */
 @Service
 public class ApplyPickServiceImpl  implements ApplyPickService {
+    @Autowired
+    private  ApplyPickMapper  applyPickMapper;
+    /**
+     * 获取集合
+     * @param  approvalApplyPick
+     * @return List
+     */
+    @Override
+    public  List<ApprovalApplyPick>  getApprovalApplyPickList(ApprovalApplyPick  approvalApplyPick){
+        return  applyPickMapper.getApprovalApplyPickList(approvalApplyPick);
+    }
 
+    @Override
+    public PagedResult<ApprovalApplyPick> listOrderBatchPage(int pageNO, int pageSize, ApprovalApplyPick approvalApplyPick, boolean isTotalNum) {
+        PageHelper.startPage(pageNO, pageSize, isTotalNum);
+        List<ApprovalApplyPick> list = applyPickMapper.listOrderBatchPage(approvalApplyPick);
+        return PageUtil.getPage(list);
+    }
+
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  approvalApplyPick
+     */
+    @Override
+    public ApprovalApplyPick getApprovalApplyPickById(Integer  id){
+        return  applyPickMapper.getApprovalApplyPickById(id);
+    }
+    /**
+     * 增加数据
+     * @param  approvalApplyPick
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(ApprovalApplyPick  approvalApplyPick){
+        return  applyPickMapper.save(approvalApplyPick);
+    }
+    /**
+     * 修改数据
+     * @param  approvalApplyPick
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(ApprovalApplyPick  approvalApplyPick){
+        return  applyPickMapper.update(approvalApplyPick);
+    }
 }

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

@@ -57,7 +57,7 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
         approvalInfo.setApprovalStatus(1);
         approvalInfo.setAdminId(admin.getAdminId());
         approvalInfo.setApprovalApplicant(approvalProduction.getApplicantName());
-        approvalInfo.setActivitiId(tasknfo.get("pid").toString());
+        approvalInfo.setActivitiId(tasknfo.get("key").toString());
         approvalInfo.setApprovalDetails("html内容");
         approvalInfo.setApprovalRemark(approvalProduction.getProductionRemark());
         int returnValue = approvalOrderMapper.insertApprovalInfo(approvalInfo);
@@ -83,6 +83,9 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
             approvalOrderMapper.insertProductionContract(approvalProductionContract);
         }
         //封装生产审批产品项
+        for(ApprovalProductionItem approvalProductionItem : listApprovalProductionItem){
+            approvalProductionItem.setProductionId(approvalProduction.getProductionId());
+        }
         int returnValue3 = approvalOrderMapper.insertItem(listApprovalProductionItem);
         if(returnValue3 < 1){
             throw new RuntimeException("添加生产审批产品项信息失败");
@@ -103,7 +106,7 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
         if(tasknfo.get("users") == null){
             throw new RuntimeException("获取下一个审批人信息失败"+tasknfo);
         }
-        String[] split = tasknfo.get("users").toString().split(",");
+        String[] split = (String[])tasknfo.get("users");
         for (String name : split){
             //通过name查询管理员id
             Admin approvalAdmin = sysMapper.getByName(name);
@@ -116,6 +119,7 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
             recordInfo.setAdminId(approvalAdmin.getAdminId());
             recordInfo.setRecordState(1);
             recordInfo.setTaskId(tasknfo.get("taskId").toString());
+            recordInfo.setApprovalTime(new Date());
             if(approvalOrderMapper.insertHistoricalRecord(recordInfo) < 1){
                 throw new RuntimeException("添加历史审批信息失败"+tasknfo);
             }
@@ -125,16 +129,6 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
                 throw new RuntimeException("修改审批信息失败"+tasknfo);
             }
         }
-        HistoricalRecord historicalRecord = new HistoricalRecord();
-        historicalRecord.setApprovalId(approvalInfo.getApprovalId());
-        historicalRecord.setAdminId(admin.getAdminId());
-        historicalRecord.setRecordState(1);
-        historicalRecord.setTaskId(tasknfo.get("taskId").toString());
-        historicalRecord.setApprovalTime(new Date());
-        int returnValue5 = approvalOrderMapper.insertHistoricalRecord(historicalRecord);
-        if(returnValue5 < 1){
-            throw new RuntimeException("添加生产审批历史记录失败");
-        }
         return true;
     }
 

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

@@ -1,5 +1,7 @@
 package com.iamberry.rst.service.approval.mapper;
 
+import com.iamberry.rst.core.approval.ApprovalApplyPick;
+
 import java.util.List;
 
 /**
@@ -8,5 +10,36 @@ import java.util.List;
  * @Date 2018-09-19
  */
 public interface ApplyPickMapper {
+    /**
+     * 获取集合
+     * @param  approvalApplyPick
+     * @return List
+     */
+    List<ApprovalApplyPick>  getApprovalApplyPickList(ApprovalApplyPick  approvalApplyPick);
+
+    /**
+     * 获取分页集合
+     * @param  approvalApplyPick
+     * @return List
+     */
+    List<ApprovalApplyPick>  listOrderBatchPage(ApprovalApplyPick  approvalApplyPick);
 
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  approvalApplyPick
+     */
+    ApprovalApplyPick getApprovalApplyPickById(Integer  id);
+    /**
+     * 增加数据
+     * @param  approvalApplyPick
+     * @return Integer
+     */
+    Integer  save(ApprovalApplyPick  approvalApplyPick);
+    /**
+     * 修改数据
+     * @param  approvalApplyPick
+     * @return Integer
+     */
+    Integer  update(ApprovalApplyPick  approvalApplyPick);
 }

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

@@ -1,29 +1,35 @@
 <?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" >
+    <resultMap  id="BaseResultMap" type="ApprovalApplyPickItem" >
         <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" />
+        <result    column="product_id"    property="productId" />
+        <result    column="item_product_name"    property="itemProductName" />
+        <result    column="item_color_name"    property="itemColorName" />
+        <result    column="item_product_num"    property="itemProductNum" />
+        <result    column="item_brand_name"    property="itemBrandName" />
+        <result    column="item_product_model"    property="itemProductModel" />
+        <result    column="item_product_unit"    property="itemProductUnit" />
+        <result    column="item_product_box_number"    property="itemProductBoxNumber" />
+        <result    column="item_create_time"    property="itemCreateTime" />
+        <result    column="item_update_time"    property="itemUpdateTime" />
     </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
+        t.product_id,
+        t.item_product_name,
+        t.item_color_name,
+        t.item_product_num,
+        t.item_brand_name,
+        t.item_product_model,
+        t.item_product_unit,
+        t.item_product_box_number,
+        t.item_create_time,
+        t.item_update_time
     </sql>
-    <select id="getApplyPickItemList" resultMap="BaseResultMap" parameterType="ApplyPickItem" >
+    <select id="getApprovalApplyPickItemList" resultMap="BaseResultMap" parameterType="ApprovalApplyPickItem" >
         select
         <include refid="Base_List" />
         from tb_rst_approval_apply_pick_item t
@@ -34,62 +40,86 @@
             <if test="applyPickId != null ">
                 AND t.apply_pick_id = #{applyPickId}
             </if >
-            <if test="applyItemProductId != null ">
-                AND t.apply_item_product_id = #{applyItemProductId}
+            <if test="productId != null ">
+                AND t.product_id = #{productId}
             </if >
-            <if test="applyItemColorId != null ">
-                AND t.apply_item_color_id = #{applyItemColorId}
+            <if test="itemProductName != null and itemProductName != ''">
+                AND t.item_product_name  like  CONCAT ('%',#{itemProductName},'%')
+            </if >
+            <if test="itemColorName != null and itemColorName != ''">
+                AND t.item_color_name  like  CONCAT ('%',#{itemColorName},'%')
+            </if >
+            <if test="itemProductNum != null ">
+                AND t.item_product_num = #{itemProductNum}
+            </if >
+            <if test="itemProductBoxNumber != null ">
+                AND t.item_product_box_number = #{itemProductBoxNumber}
             </if >
         </where>
     </select>
-    <select id="getApplyPickItemById" resultMap="BaseResultMap" parameterType="Integer" >
+    <select id="getApprovalApplyPickItemById" 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 id="save" parameterType="ApprovalApplyPickItem" >
         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
+        product_id,
+        item_product_name,
+        item_color_name,
+        item_product_num,
+        item_brand_name,
+        item_product_model,
+        item_product_unit,
+        item_product_box_number
         )
         values
         (
         #{applyPickId},
-        #{applyItemProductId},
-        #{applyItemColorId},
-        #{applyItemProductName},
-        #{applyItemColorName},
-        #{applyItemProductNum}
+        #{productId},
+        #{itemProductName},
+        #{itemColorName},
+        #{itemProductNum},
+        #{itemBrandName},
+        #{itemProductModel},
+        #{itemProductUnit},
+        #{itemProductBoxNumber}
         )
     </insert>
-    <update id="update" parameterType="ApplyPickItem" >
+    <update id="update" parameterType="ApprovalApplyPickItem" >
         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 test="productId != null ">
+                product_id = #{productId},
+            </if >
+            <if test="itemProductName != null and itemProductName != ''">
+                item_product_name = #{itemProductName},
+            </if >
+            <if test="itemColorName != null and itemColorName != ''">
+                item_color_name = #{itemColorName},
+            </if >
+            <if test="itemProductNum != null ">
+                item_product_num = #{itemProductNum},
             </if >
-            <if test="applyItemColorId != null ">
-                apply_item_color_id = #{applyItemColorId},
+            <if test="itemBrandName != null and itemBrandName != ''">
+                item_brand_name = #{itemBrandName},
             </if >
-            <if test="applyItemProductName != null and applyItemProductName != ''">
-                apply_item_product_name = #{applyItemProductName},
+            <if test="itemProductModel != null and itemProductModel != ''">
+                item_product_model = #{itemProductModel},
             </if >
-            <if test="applyItemColorName != null and applyItemColorName != ''">
-                apply_item_color_name = #{applyItemColorName},
+            <if test="itemProductUnit != null and itemProductUnit != ''">
+                item_product_unit = #{itemProductUnit},
             </if >
-            <if test="applyItemProductNum != null ">
-                apply_item_product_num = #{applyItemProductNum},
+            <if test="itemProductBoxNumber != null ">
+                item_product_box_number = #{itemProductBoxNumber},
             </if >
         </set >
         where apply_item_id= #{applyItemId}

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

@@ -1,18 +1,7 @@
 <?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,
@@ -25,7 +14,61 @@
         t.apply_pick_create_time,
         t.apply_pick_update_time
     </sql>
-    <select id="getApplyPickList" resultMap="BaseResultMap" parameterType="ApplyPick" >
+    <select id="getApprovalApplyPickList" resultType="ApprovalApplyPick" parameterType="ApprovalApplyPick" >
+        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>
+
+    <resultMap  id="BaseResultMap" type="ApprovalApplyPick" >
+        <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" />
+        <collection property="listApplyPickItem" column="apply_pick_id" javaType="ArrayList"
+                    ofType="ApprovalApplyPickItem" select="getApprovalApplyPickItemList"/>
+    </resultMap>
+    <resultMap  id="approvalApplyPickItemMap" type="ApprovalApplyPickItem" >
+        <result    column="apply_item_id"    property="applyItemId" />
+        <result    column="apply_pick_id"    property="applyPickId" />
+        <result    column="product_id"    property="productId" />
+        <result    column="item_product_name"    property="itemProductName" />
+        <result    column="item_color_name"    property="itemColorName" />
+        <result    column="item_product_num"    property="itemProductNum" />
+        <result    column="item_brand_name"    property="itemBrandName" />
+        <result    column="item_product_model"    property="itemProductModel" />
+        <result    column="item_product_unit"    property="itemProductUnit" />
+        <result    column="item_product_box_number"    property="itemProductBoxNumber" />
+        <result    column="item_create_time"    property="itemCreateTime" />
+        <result    column="item_update_time"    property="itemUpdateTime" />
+    </resultMap>
+    <select id="listOrderBatchPage" resultMap="BaseResultMap" parameterType="ApprovalApplyPick" >
         select
         <include refid="Base_List" />
         from tb_rst_approval_apply_pick t
@@ -50,13 +93,21 @@
             </if >
         </where>
     </select>
-    <select id="getApplyPickById" resultMap="BaseResultMap" parameterType="Integer" >
+    <select id="getApprovalApplyPickItemList" resultMap="approvalApplyPickItemMap" parameterType="Integer" >
+        select
+        *
+        from tb_rst_approval_apply_pick_item t
+        WHERE
+          t.apply_pick_id = #{applyPickId}
+    </select>
+
+    <select id="getApprovalApplyPickById" resultType="ApprovalApplyPick" 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 id="save" parameterType="ApprovalApplyPick" >
         insert into
         tb_rst_approval_apply_pick
         (
@@ -79,7 +130,7 @@
         #{applyPickRemk}
         )
     </insert>
-    <update id="update" parameterType="ApplyPick" >
+    <update id="update" parameterType="ApprovalApplyPick" >
         update
         tb_rst_approval_apply_pick
         <set >

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

@@ -173,13 +173,12 @@
   <insert id="insertProductionContract" parameterType="ApprovalProductionContract">
     INSERT INTO tb_rst_approval_production_contract(
     contract_id,
-    production_id,
+    approval_id,
     contract_url,
-    contract_type,
     contract_create_time
     )
     VALUES
-    (#{contractId},#{productionId},#{contractUrl},#{contractType},NOW())
+    (#{contractId},#{approvalId},#{contractUrl},NOW())
   </insert>
 
   <insert id="insertProcessInfo" parameterType="ProcessInfo">
@@ -204,7 +203,7 @@
     record_create_time
     )
     VALUES
-    (#{approvalId},#{adminId},#{processDesc},#{processState},NOW())
+    (#{approvalId},#{adminId},#{recordState},#{taskId},#{approvalTime},NOW())
   </insert>
 
 
@@ -285,6 +284,9 @@
       <if test="approvalAdminId != null and approvalAdminId != ''">
         AND hr.admin_id = #{approvalAdminId}
       </if>
+      <if test="selectType != null and selectType != '' and selectType == 3">
+        AND ai.approval_status in (5,6,7,8)
+      </if>
     </where>
   </select>
 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApplyPickController.java

@@ -1,21 +1,28 @@
 package com.iamberry.rst.controllers.approval;
 
+import com.iamberry.rst.core.approval.ApprovalApplyPick;
+import com.iamberry.rst.core.order.OrderBatch;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.sys.Admin;
 import com.iamberry.rst.faces.approval.ApplyPickItemService;
 import com.iamberry.rst.faces.approval.ApplyPickService;
 import com.iamberry.rst.faces.sys.SysService;
+import com.iamberry.rst.utils.StitchAttrUtil;
 import com.iamberry.wechat.core.entity.WechatUtils;
 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 javax.servlet.http.HttpServletRequest;
 
 @Controller
-@RequestMapping("/wechat/applyPick")
+//@RequestMapping("/wechat/applyPick")
+@RequestMapping("/applyPick")
 public class ApplyPickController {
 
     @Autowired
@@ -46,12 +53,29 @@ public class ApplyPickController {
      */
     @ResponseBody
     @RequestMapping("/listApplyPick")
-    public ResponseJson listApplyPick(HttpServletRequest request) {
+    public ResponseJson listApplyPick(HttpServletRequest request,Integer applyPickStruts,
+                                      @RequestParam(value= "pageSize",defaultValue= "10" ,required=false) Integer pageSize,
+                                      @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+                                      @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum
+    ) {
         String openId = WechatUtils.getUserBySession(request).getUserOpenid();
         Admin admin = sysService.getByOpenid(openId);
+        if(admin == null){
+            return ResponseJson.getFAILURE();
+        }
+        ApprovalApplyPick approvalApplyPick = new ApprovalApplyPick();
+        approvalApplyPick.setAdminId(admin.getAdminId());
+        approvalApplyPick.setApplyPickStruts(applyPickStruts);
 
+        PagedResult<ApprovalApplyPick> pagedResult = applyPickService.listOrderBatchPage(pageNo, pageSize, approvalApplyPick, totalNum == 0);
+        if (totalNum != 0){
+            pagedResult.setTotal(totalNum);
+        }
 
-        return null;
+        ResponseJson rj = ResponseJson.getSUCCESS();
+        rj.addResponseKeyValue("lastPage",StitchAttrUtil.getSa().getLastPage(pagedResult));
+        rj.addResponseKeyValue("list",pagedResult.getDataList());
+        return rj;
     }
 
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApprovalController.java

@@ -151,7 +151,7 @@ public class ApprovalController {
  * @param pageSize
  * @param pageNO
  * @param totalNum
- * @param selectType 1.我发起的 2.我审核的
+ * @param selectType 1.我发起的 2.我审核的 3.仓库确认
  * @return
  * @throws Exception
  */
@@ -164,7 +164,8 @@ public class ApprovalController {
             @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) throws Exception {
         ResponseJson rj =new ResponseJson(200, "查询成功", 200);
         //获取openid,根据openid查询当前登录人信息
-        String openId = WechatUtils.getUserBySession(request).getUserOpenid();
+        /*String openId = WechatUtils.getUserBySession(request).getUserOpenid();*/
+        String openId = "oaH_GwObiozJFBypUg0wKJjQpBiU";
         Admin admin = sysService.getByOpenid(openId);
         if(admin == null){
             return new ResponseJson(200, "未查询到登录人信息", 500);
@@ -249,7 +250,7 @@ public class ApprovalController {
                     if(taskMap.get("users") == null){
                         return  ResponseJson.getFAILURE();
                     }
-                    String[] split = taskMap.get("users").toString().split(",");
+                    String[] split = (String[])taskMap.get("users");
                     for (String name : split){
                         //通过name查询管理员id
                        Admin approvalAdmin = sysService.getByName(name);

watero-rst-web/src/main/java/com/iamberry/rst/utils/ExcelUtil.java

@@ -447,7 +447,7 @@ public class ExcelUtil {
             }
             // 匹配地址（可能是多个，需要组合连接）
             for (int i = 0; i < infos.length; i++) {
-                if (infos[i].equals(cell.getStringCellValue().trim())) {
+                if (infos[i].equals(cell.getStringCellValue())) {
                     infoColumnIndex[i] = cell.getColumnIndex();
                 }
             }

watero-rst-web/src/main/java/com/iamberry/rst/utils/StitchAttrUtil.java

@@ -151,4 +151,18 @@ public class StitchAttrUtil {
     }
 
 
+    /**
+     * 判断是否还有下一页
+     * @param pagedResult
+     * @return
+     */
+    public boolean getLastPage( PagedResult<?> pagedResult){
+        /* 当前页 >= 总页面数目 */
+        if(pagedResult.getPageNo() >=  pagedResult.getPages()){
+            return false;
+        }else{
+            return true;
+        }
+    }
+
 }

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

@@ -239,13 +239,11 @@
 		<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/applyPickItemMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/approval/mapper/applyPickMapper.xml"/>
-		-->
-
-		<!--member-->
 		<mapper resource="com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml"/>
 
+		<!--member-->
 		<mapper resource="com/iamberry/rst/service/member/mapper/memberMapper.xml"/>
 
 		<!--wx -->