提货

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

@@ -1,6 +1,7 @@
 package com.iamberry.rst.faces.approval;
 
 import com.iamberry.rst.core.approval.ApprovalApplyPick;
+import com.iamberry.rst.core.approval.ApprovalProductionContract;
 import com.iamberry.rst.core.order.OrderBatch;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
@@ -42,7 +43,7 @@ public interface ApplyPickService {
      * @param  approvalApplyPick
      * @return Integer
      */
-    Integer  save(ApprovalApplyPick  approvalApplyPick,String openid, Map<String, Object> tasknfo);
+    Integer  save(ApprovalApplyPick  approvalApplyPick, String openid, Map<String, Object> tasknfo,List<ApprovalProductionContract> approvalProductionContractList);
     /**
      * 修改数据
      * @param  approvalApplyPick

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

@@ -2,8 +2,6 @@ package com.iamberry.rst.service.approval;
 
 import com.github.pagehelper.PageHelper;
 import com.iamberry.rst.core.approval.*;
-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.ApplyPickService;
@@ -70,7 +68,7 @@ public class ApplyPickServiceImpl  implements ApplyPickService {
      */
     @Override
     @Transactional
-    public  Integer  save(ApprovalApplyPick  approvalApplyPick, String openid, Map<String, Object> tasknfo){
+    public  Integer  save(ApprovalApplyPick  approvalApplyPick, String openid, Map<String, Object> tasknfo,List<ApprovalProductionContract> approvalProductionContractList){
         Admin admin = sysMapper.getByOpenid(openid);
         approvalApplyPick.setAdminId(admin.getAdminId());
 
@@ -101,6 +99,18 @@ public class ApplyPickServiceImpl  implements ApplyPickService {
             throw new RuntimeException("添加审批信息失败");
         }
 
+        for (ApprovalProductionContract apc:approvalProductionContractList) {
+            apc.setApprovalId(approvalInfo.getApprovalId());
+            apc.setContractName(admin.getAdminName()+"的提货订单");
+            if(apc.getContractUrl() == null || "".equals(apc.getContractUrl())){
+                throw new RuntimeException("审批合同url地址为空");
+            }
+            flag = approvalOrderMapper.insertProductionContract(apc);
+            if(flag < 1){
+                throw new RuntimeException("添加合同失败");
+            }
+        }
+
         //添加审批历史记录
         ApprovalInfo info = new ApprovalInfo();
         info.setApprovalId(approvalInfo.getApprovalId());

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

@@ -3,6 +3,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.approval.ApprovalProductionContract;
 import com.iamberry.rst.core.cm.SendProdcue;
 import com.iamberry.rst.core.order.OrderBatch;
 import com.iamberry.rst.core.page.PageRequest;
@@ -94,7 +95,7 @@ public class ApplyPickController {
      */
     @ResponseBody
     @RequestMapping("/addApplyPick")
-    public ResponseJson addApplyPick(HttpServletRequest request,ApprovalApplyPick approvalApplyPick,String listApplyPickItemJson) {
+    public ResponseJson addApplyPick(HttpServletRequest request,ApprovalApplyPick approvalApplyPick,String listApplyPickItemJson,String imageJson) {
         ResponseJson rj = new ResponseJson(500, "FAILURE", 500);
         String openId = WechatUtils.getUserBySession(request).getUserOpenid();
 
@@ -105,6 +106,9 @@ public class ApplyPickController {
             return rj;
         }
 
+        JSONArray imageJSONArray = JSONArray.fromObject(imageJson);
+        List<ApprovalProductionContract> approvalProductionContractList = (List) JSONArray.toCollection(imageJSONArray, ApprovalProductionContract.class);
+
         JSONArray jsonArray = JSONArray.fromObject(listApplyPickItemJson);
         List<ApprovalApplyPickItem> listApplyPickItem = (List) JSONArray.toCollection(jsonArray, ApprovalApplyPickItem.class);
         approvalApplyPick.setListApplyPickItem(listApplyPickItem);
@@ -112,7 +116,7 @@ public class ApplyPickController {
         //获取审批任务id
         Map<String, Object> taskinfo = approvalTaskService.salesmanSubmitApply(2);
         try{
-          applyPickService.save(approvalApplyPick,openId,taskinfo);
+          applyPickService.save(approvalApplyPick,openId,taskinfo,approvalProductionContractList);
         }catch (Exception e){
             e.printStackTrace();
             rj.setResultMsg("添加提货失败,"+ e.getMessage());