提货

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("oaH_GwObiozJFBypUg0wKJjQpBiU");
-		if(true){
-			return m;
-		}
+//		Member m = new Member();
+//		m.setUserId(1);
+//		m.setUserOpenid("xxx");
+//		if(true){
+//			return m;
+//		}
 
 		//获取一个cookie数组
 		Cookie[] cookies = request.getCookies();

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

@@ -81,6 +81,13 @@ public interface ApprovalOrderService {
      */
     List<ApprovalInfo> getApprovalInfo(ApprovalInfo approvalInfo);
 
+
+    /**
+     * 查询单个审批信息
+     * @return
+     */
+    ApprovalInfo getApprovalInfoById(Integer approvalId);
+
     /**
      * 修改审批订单项
      * @return

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

@@ -79,18 +79,17 @@ public class ApplyPickServiceImpl  implements ApplyPickService {
             throw new RuntimeException("添加提货失败");
         }
         for (ApprovalApplyPickItem approvalApplyPickItem:approvalApplyPick.getListApplyPickItem()) {
-            
+            approvalApplyPickItem.setApplyPickId(approvalApplyPick.getApplyPickId());
         }
         flag = applyPickItemMapper.saveList(approvalApplyPick.getListApplyPickItem());
         if(flag < 1){
             throw new RuntimeException("添加提货项失败");
         }
 
-
         //添加审批信息
         ApprovalInfo approvalInfo = new ApprovalInfo();
-        approvalInfo.setApprovalName(admin.getAdminName()+"的审批订单");
-        approvalInfo.setApprovalType(1);
+        approvalInfo.setApprovalName(admin.getAdminName()+"的提货订单");
+        approvalInfo.setApprovalType(2);
         approvalInfo.setApprovalStatus(1);
         approvalInfo.setAdminId(admin.getAdminId());
         approvalInfo.setApprovalApplicant(approvalApplyPick.getApplyPickName());
@@ -133,6 +132,7 @@ public class ApplyPickServiceImpl  implements ApplyPickService {
         }
         return  flag;
     }
+
     /**
      * 修改数据
      * @param  approvalApplyPick

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

@@ -191,6 +191,11 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
     }
 
     @Override
+    public ApprovalInfo getApprovalInfoById(Integer approvalId) {
+        return approvalOrderMapper.getApprovalInfoById(approvalId);
+    }
+
+    @Override
     public Integer updateProductionItem(ApprovalProductionItem approvalProductionItem) {
         return approvalOrderMapper.updateProductionItem(approvalProductionItem);
     }

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

@@ -10,7 +10,13 @@ import java.util.List;
  */
 public interface ApprovalOrderMapper {
 
-    /**
+   /**
+    * 查询单个审批信息
+    * @return
+    */
+   ApprovalInfo getApprovalInfoById(Integer approvalId);
+
+  /**
      * 新增审批信息
      * @return
      */

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

@@ -107,10 +107,11 @@
         from tb_rst_approval_apply_pick t
         where t.apply_pick_id= #{applyPickId}
     </select>
-    <insert id="save" parameterType="ApprovalApplyPick" >
+    <insert id="save" parameterType="ApprovalApplyPick" keyProperty="applyPickId" useGeneratedKeys="true"   >
         insert into
         tb_rst_approval_apply_pick
         (
+        apply_pick_id,
         approval_id,
         admin_id,
         apply_pick_name,
@@ -121,6 +122,7 @@
         )
         values
         (
+        #{applyPickId},
         #{approvalId},
         #{adminId},
         #{applyPickName},

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

@@ -251,6 +251,23 @@
     </where>
   </update>
 
+  <!--查询审批信息-->
+  <select id="getApprovalInfoById" parameterType="Integer" resultType="ApprovalInfo">
+    SELECT
+    ai.approval_id,
+    ai.approval_name,
+    ai.approval_type,
+    ai.approval_status,
+    ai.approval_status_details,
+    ai.admin_id,
+    ai.approval_applicant,
+    ai.activiti_id,
+    ai.approval_details,
+    ai.approval_remark,
+    ai.approval_create_time
+    from tb_rst_approval_info ai
+    WHERE ai.approval_id = #{approvalId}
+  </select>
 
 <!--查询审批信息列表-->
   <select id="listApprovalInfo" parameterType="ApprovalInfo" resultMap="ApprovalInfoResultMap">

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

@@ -2,6 +2,7 @@ package com.iamberry.rst.controllers.approval;
 
 import com.iamberry.rst.core.approval.ApprovalApplyPick;
 import com.iamberry.rst.core.approval.ApprovalApplyPickItem;
+import com.iamberry.rst.core.approval.ApprovalInfo;
 import com.iamberry.rst.core.cm.SendProdcue;
 import com.iamberry.rst.core.order.OrderBatch;
 import com.iamberry.rst.core.page.PageRequest;
@@ -9,6 +10,7 @@ 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.approval.ApprovalOrderService;
 import com.iamberry.rst.faces.approval.ApprovalTaskService;
 import com.iamberry.rst.faces.sys.SysService;
 import com.iamberry.rst.utils.StitchAttrUtil;
@@ -28,8 +30,7 @@ import java.util.List;
 import java.util.Map;
 
 @Controller
-//@RequestMapping("/wechat/applyPick")
-@RequestMapping("/applyPick")
+@RequestMapping("/wechat/applyPick")
 public class ApplyPickController {
 
     @Autowired
@@ -38,9 +39,10 @@ public class ApplyPickController {
     private ApplyPickItemService applyPickItemService;
     @Autowired
     private ApprovalTaskService approvalTaskService;
-
     @Autowired
     private SysService sysService;
+    @Autowired
+    private ApprovalOrderService approvalOrderService;
 
     /**
      * 获取已审批通过的订单
@@ -55,7 +57,6 @@ public class ApplyPickController {
     }
 
 
-
     /**
      * 获取提货列表
      * @return
@@ -70,7 +71,7 @@ public class ApplyPickController {
         String openId = WechatUtils.getUserBySession(request).getUserOpenid();
         Admin admin = sysService.getByOpenid(openId);
         if(admin == null){
-            return ResponseJson.getFAILURE();
+            return new ResponseJson(500, "FAILURE", 500);
         }
         ApprovalApplyPick approvalApplyPick = new ApprovalApplyPick();
         approvalApplyPick.setAdminId(admin.getAdminId());
@@ -94,7 +95,7 @@ public class ApplyPickController {
     @ResponseBody
     @RequestMapping("/addApplyPick")
     public ResponseJson addApplyPick(HttpServletRequest request,ApprovalApplyPick approvalApplyPick,String listApplyPickItemJson) {
-        ResponseJson rj = ResponseJson.getFAILURE();
+        ResponseJson rj = new ResponseJson(500, "FAILURE", 500);
         String openId = WechatUtils.getUserBySession(request).getUserOpenid();
 
         Map<String,Object>  map = verification(approvalApplyPick);
@@ -114,7 +115,7 @@ public class ApplyPickController {
           applyPickService.save(approvalApplyPick,openId,taskinfo);
         }catch (Exception e){
             e.printStackTrace();
-            rj.setResultMsg("添加提货失败");
+            rj.setResultMsg("添加提货失败,"+ e.getMessage());
             return rj;
         }
         rj = ResponseJson.getSUCCESS();
@@ -138,12 +139,40 @@ public class ApplyPickController {
             return map;
         }
         if(approvalApplyPick.getApprovalId() == null || "".equals(approvalApplyPick.getApprovalId())){
-            map.put("msg","审批订单信息id");
+            map.put("msg","未选择审批订单");
             return map;
+        }else{
+            ApprovalInfo approvalInfo = approvalOrderService.getApprovalInfoById(approvalApplyPick.getApprovalId());
+            if(approvalInfo == null){
+                map.put("msg","审批订单信息id错误");
+                return map;
+            }
         }
         map.put("status",true);
         map.put("msg","success");
         return map;
     }
 
+    /**
+     * 获取提货信息
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/getApplyPick")
+    public ResponseJson getApplyPick(HttpServletRequest request,Integer applyPickId) {
+        if(applyPickId == null){
+           return new ResponseJson(500, "FAILURE", 500);
+        }
+        ApprovalApplyPick approvalApplyPick = applyPickService.getApprovalApplyPickById(applyPickId);
+
+        ApprovalApplyPickItem approvalApplyPickItem = new ApprovalApplyPickItem();
+        approvalApplyPickItem.setApplyPickId(applyPickId);
+        List<ApprovalApplyPickItem> approvalApplyPickItemList = applyPickItemService.getApprovalApplyPickItemList(approvalApplyPickItem);
+        approvalApplyPick.setListApplyPickItem(approvalApplyPickItemList);
+
+        ResponseJson rj = ResponseJson.getSUCCESS();
+        rj.addResponseKeyValue("approvalApplyPick",approvalApplyPick);
+        return rj;
+    }
+
 }

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

@@ -154,7 +154,7 @@ public class StitchAttrUtil {
     /**
      * 判断是否还有下一页
      * @param pagedResult
-     * @return
+     * @return false没有下一页   true 有下一页
      */
     public boolean getLastPage( PagedResult<?> pagedResult){
         /* 当前页 >= 总页面数目 */