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

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/approval/HistoricalRecord.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApprovalController.java

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

@@ -44,6 +44,10 @@ public class ApprovalApplyPick implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date applyPickUpdateTime;
 
+    private String applyPickOrderNo;//订单编号*系统自动生成;了解生产规则
+
+    private String applyPickCompanyName;//客户公司名称
+
     private List<ApprovalApplyPickItem> listApplyPickItem = new ArrayList<>();
 
     /*审批详情*/
@@ -168,4 +172,20 @@ public class ApprovalApplyPick implements Serializable {
     public void setApprovalInfo(ApprovalInfo approvalInfo) {
         this.approvalInfo = approvalInfo;
     }
+
+    public String getApplyPickOrderNo() {
+        return applyPickOrderNo;
+    }
+
+    public void setApplyPickOrderNo(String applyPickOrderNo) {
+        this.applyPickOrderNo = applyPickOrderNo;
+    }
+
+    public String getApplyPickCompanyName() {
+        return applyPickCompanyName;
+    }
+
+    public void setApplyPickCompanyName(String applyPickCompanyName) {
+        this.applyPickCompanyName = applyPickCompanyName;
+    }
 }

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

@@ -18,6 +18,8 @@ public class HistoricalRecord implements Serializable {
     private Date recordCreateTime;//
     private List<ProcessInfo> listProcessInfo;//流程信息集合
 
+    private String adminName;// 用户名
+
     public Integer getRecordId() {
         return recordId;
     }
@@ -81,4 +83,12 @@ public class HistoricalRecord implements Serializable {
     public void setListProcessInfo(List<ProcessInfo> listProcessInfo) {
         this.listProcessInfo = listProcessInfo;
     }
+
+    public String getAdminName() {
+        return adminName;
+    }
+
+    public void setAdminName(String adminName) {
+        this.adminName = adminName;
+    }
 }

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

@@ -5,10 +5,7 @@ import com.iamberry.rst.core.approval.*;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.sys.Admin;
 import com.iamberry.rst.faces.approval.ApplyPickService;
-import com.iamberry.rst.service.approval.mapper.ApplyPickItemMapper;
-import com.iamberry.rst.service.approval.mapper.ApplyPickMapper;
-import com.iamberry.rst.service.approval.mapper.ApprovalOrderMapper;
-import com.iamberry.rst.service.approval.mapper.ApprovalProductionMapper;
+import com.iamberry.rst.service.approval.mapper.*;
 import com.iamberry.rst.service.sys.mapper.SysMapper;
 import com.iamberry.rst.util.PageUtil;
 import com.iamberry.wechat.tools.SendMessageUtil;
@@ -40,6 +37,7 @@ public class ApplyPickServiceImpl  implements ApplyPickService {
     private ApprovalProductionMapper approvalProductionMapper;
 
 
+
     /**
      * 获取集合
      * @param  approvalApplyPick
@@ -90,6 +88,14 @@ public class ApplyPickServiceImpl  implements ApplyPickService {
             throw new RuntimeException("添加审批信息失败");
         }
 
+        /*查询生产审批*/
+        ApprovalProduction approvalProduction = new ApprovalProduction();
+        approvalProduction.setApprovalId(approvalApplyPick.getProductionApprovalId());
+        List<ApprovalProduction> approvalProductionList = approvalProductionMapper.getApprovalProductionList(approvalProduction);
+        approvalProduction = approvalProductionList.get(0);
+        /*将生产审批的订单编号和公司赋值到提货里面*/
+        approvalApplyPick.setApplyPickOrderNo(approvalProduction.getApplicantOrderNo());
+        approvalApplyPick.setApplyPickCompanyName(approvalProduction.getApplicantOrderNo());
         approvalApplyPick.setApprovalId(approvalInfo.getApprovalId());
         approvalApplyPick.setAdminId(admin.getAdminId());
         Integer flag = applyPickMapper.save(approvalApplyPick);

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

@@ -10,6 +10,8 @@
         t.apply_pick_name,
         t.apply_pick_tel,
         t.apply_pick_reason,
+        t.apply_pick_order_no,
+        t.apply_pick_company_name,
         t.apply_pick_struts,
         t.apply_pick_ship_way,
         t.apply_pick_ship_certificate,
@@ -54,6 +56,8 @@
         <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_order_no"    property="applyPickOrderNo" />
+        <result    column="apply_pick_company_name"    property="applyPickCompanyName" />
         <result    column="apply_pick_struts"    property="applyPickStruts" />
         <result    column="apply_pick_ship_way"    property="applyPickShipWay" />
         <result    column="apply_pick_ship_certificate"    property="applyPickShipCertificate" />
@@ -102,6 +106,8 @@
             t.apply_pick_name,
             t.apply_pick_tel,
             t.apply_pick_reason,
+            t.apply_pick_order_no,
+            t.apply_pick_company_name,
             t.apply_pick_struts,
             t.apply_pick_ship_way,
             t.apply_pick_ship_certificate,
@@ -165,6 +171,8 @@
         apply_pick_name,
         apply_pick_tel,
         apply_pick_reason,
+        apply_pick_order_no,
+        apply_pick_company_name,
         apply_pick_struts,
         apply_pick_ship_way,
         apply_pick_ship_certificate,
@@ -179,6 +187,8 @@
         #{applyPickName},
         #{applyPickTel},
         #{applyPickReason},
+        #{applyPickOrderNo},
+        #{applyPickCompanyName},
         #{applyPickStruts},
         #{applyPickShipWay},
         #{applyPickShipCertificate},
@@ -207,6 +217,12 @@
             <if test="applyPickReason != null and applyPickReason != ''">
                 apply_pick_reason = #{applyPickReason},
             </if >
+            <if test="applyPickOrderNo != null and applyPickOrderNo != ''">
+                apply_pick_order_no = #{applyPickOrderNo},
+            </if >
+            <if test="applyPickCompanyName != null and applyPickCompanyName != ''">
+                apply_pick_company_name = #{applyPickCompanyName},
+            </if >
             <if test="applyPickStruts != null ">
                 apply_pick_struts = #{applyPickStruts},
             </if >

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

@@ -49,6 +49,8 @@
     <result column="apply_pick_name" property="applyPickName" jdbcType="VARCHAR" />
     <result column="apply_pick_tel" property="applyPickTel" jdbcType="VARCHAR" />
     <result column="apply_pick_reason" property="applyPickReason" jdbcType="VARCHAR" />
+    <result column="apply_pick_order_no" property="applyPickOrderNo" jdbcType="VARCHAR" />
+    <result column="apply_pick_company_name" property="applyPickCompanyName" jdbcType="VARCHAR" />
     <result column="apply_pick_struts" property="applyPickStruts" jdbcType="INTEGER" />
     <result column="apply_pick_remk" property="applyPickRemk" jdbcType="VARCHAR" />
     <result column="apply_pick_create_time" property="applyPickCreateTime" jdbcType="TIMESTAMP" />
@@ -64,6 +66,7 @@
     <result column="task_id" property="taskId" jdbcType="VARCHAR" />
     <result column="approval_time" property="approvalTime" jdbcType="TIMESTAMP" />
     <result column="record_create_time" property="recordCreateTime" jdbcType="TIMESTAMP" />
+    <result column="admin_name" property="adminName"  />
     <collection property="listProcessInfo" column="record_id" ofType="ProcessInfo" select="listProcessInfoByRecordId"/>
   </resultMap>
 
@@ -373,6 +376,8 @@
     aap.apply_pick_name,
     aap.apply_pick_tel,
     aap.apply_pick_reason,
+    aap.apply_pick_order_no,
+    aap.apply_pick_company_name,
     aap.apply_pick_struts,
     aap.apply_pick_remk,
     aap.apply_pick_create_time,
@@ -599,8 +604,10 @@
     hr.record_state,
     hr.task_id,
     hr.approval_time,
-    hr.record_create_time
+    hr.record_create_time,
+    sa.admin_name
     from tb_rst_historical_record hr
+    LEFT  JOIN tb_rst_sys_admin sa ON hr.admin_id = sa.admin_id
     where
        hr.approval_id = #{approvalId}
   </select>

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

@@ -203,7 +203,7 @@ public class ApplyPickController {
             approvalProductionItem.setProductionId(ap.getProductionId());
             List<ApprovalProductionItem> approvalProductionItemList = approvalProductionService.getApprovalProductionItemList(approvalProductionItem);
             ap.setListProductionItem(approvalProductionItemList);
-            rj.addResponseKeyValue("ApprovalProduction",ap);
+            rj.addResponseKeyValue("approvalProduction",ap);
         }
 
         /*获取当前登录人查看当前审批的记录，判断状态*/
@@ -257,4 +257,5 @@ public class ApplyPickController {
         }
         return rj;
     }
+
 }

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

@@ -9,6 +9,7 @@ import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.sys.Admin;
 import com.iamberry.rst.faces.approval.ApplyPickService;
 import com.iamberry.rst.faces.approval.ApprovalOrderService;
+import com.iamberry.rst.faces.approval.ApprovalProductionService;
 import com.iamberry.rst.faces.approval.ApprovalTaskService;
 import com.iamberry.rst.faces.sys.SysService;
 import com.iamberry.wechat.core.entity.WechatUtils;
@@ -51,6 +52,8 @@ public class ApprovalController {
     private SysService sysService;
     @Autowired
     private ApplyPickService applyPickService;
+    @Autowired
+    private ApprovalProductionService approvalProductionService;
     @SuppressWarnings("restriction")
     private BASE64Decoder decoder = new BASE64Decoder();
     /**
@@ -377,6 +380,9 @@ public class ApprovalController {
         if(approvalInfo == null){
             return  ResponseJson.getFAILURE();
         }
+
+        approvalInfo = approvalOrderService.getApprovalInfoById(approvalInfo.getApprovalId());
+
         //获取openid,根据openid查询当前登录人信息
         String openId = WechatUtils.getUserBySession(request).getUserOpenid();
         Admin admin = sysService.getByOpenid(openId);
@@ -406,22 +412,30 @@ public class ApprovalController {
                 //修改审核历史记录状态为已通过
                 historicalRecord.setRecordState(2);
                 if(approvalOrderService.updateHistoricalRecord(historicalRecord) < 1){
-                    return  ResponseJson.getFAILURE();
+                    rj = ResponseJson.getFAILURE();
+                    rj.setResultMsg("修改审核历史记录状态失败！");
+                    return  rj;
                 }
                 //查询当前审核人当前审核任务信息
                 HistoricalRecord record = approvalOrderService.getHistoricalRecord(historicalRecord);
                 if(record == null){
-                    return  ResponseJson.getFAILURE();
+                    rj = ResponseJson.getFAILURE();
+                    rj.setResultMsg("查询当前审核人当前审核任务信息为空！");
+                    return  rj;
                 }
                 //获取下一个审核人，并添加审核历史信息
                 Map<String, Object> taskMap = approvalTaskService.completeTask(approvalInfo.getActivitiId(),record.getTaskId());
                 if(taskMap == null){
-                    return  ResponseJson.getFAILURE();
+                    rj = ResponseJson.getFAILURE();
+                    rj.setResultMsg("获取下一个审核人，并添加审核历史信息失败！");
+                    return  rj;
                 }
                 if((Integer) taskMap.get("status") == 1){//没有下一个审批人，修改审批任务状态为已审批通过
                     info.setApprovalStatus(2);
                     if(approvalOrderService.updateApprovalInfo(info) < 1){
-                        return  ResponseJson.getFAILURE();
+                        rj = ResponseJson.getFAILURE();
+                        rj.setResultMsg("修改审批信息失败！");
+                        return  rj;
                     }
                     //判断是生产审批或提货审批
                     if(info.getApprovalType() == 1){
@@ -432,7 +446,9 @@ public class ApprovalController {
                         admininfo.setAdminId(production.getApplicantId());
                         admininfo = sysService.getAdminInfo(admininfo);
                         if(admininfo.getAdminOpenId() == null ){
-                            return  ResponseJson.getFAILURE();
+                            rj = ResponseJson.getFAILURE();
+                            rj.setResultMsg("获取管理信息失败！");
+                            return  rj;
                         }
                         //通知申请人该审批已通过
                         SendMessageUtil sendMessageUtil = new SendMessageUtil();
@@ -490,14 +506,18 @@ public class ApprovalController {
 
                 }else if((Integer) taskMap.get("status") == 0){//还有下一个审批人，需要增加审批历史任务
                     if(taskMap.get("users") == null){
-                        return  ResponseJson.getFAILURE();
+                        rj = ResponseJson.getFAILURE();
+                        rj.setResultMsg("获取下一个审批人失败！");
+                        return  rj;
                     }
                     String[] split = (String[])taskMap.get("users");
                     for (String name : split){
                         //通过name查询管理员id
                        Admin approvalAdmin = sysService.getByName(name);
                        if(approvalAdmin == null){
-                           return  ResponseJson.getFAILURE();
+                           rj = ResponseJson.getFAILURE();
+                           rj.setResultMsg("查询管理员失败！");
+                           return  rj;
                        }
 
                         HistoricalRecord recordInfo = new HistoricalRecord();
@@ -506,12 +526,16 @@ public class ApprovalController {
                         recordInfo.setRecordState(1);
                         recordInfo.setTaskId(taskMap.get("taskId").toString());
                         if(approvalOrderService.insertHistoricalRecord(recordInfo) < 1){
-                            return  ResponseJson.getFAILURE();
+                            rj = ResponseJson.getFAILURE();
+                            rj.setResultMsg("添加历史审批人失败！");
+                            return  rj;
                         }
                         //修改审核信息表
                         info.setApprovalStatusDetails("待"+name+"审批");
                         if(approvalOrderService.updateApprovalInfo(info) < 1){
-                            return  ResponseJson.getFAILURE();
+                            rj = ResponseJson.getFAILURE();
+                            rj.setResultMsg("修改审核信息失败！");
+                            return  rj;
                         }
                         //推送微信模板消息通知
                           //查询审批订单信息
@@ -531,23 +555,31 @@ public class ApprovalController {
                 //添加流程信息记录
                 processInfo.setProcessState(2);
                 if(approvalOrderService.insertProcessInfo(processInfo) < 1){
-                    return  ResponseJson.getFAILURE();
+                    rj = ResponseJson.getFAILURE();
+                    rj.setResultMsg("添加流程信息记录失败！");
+                    return  rj;
                 }
                 break;
             case 2:
                 //修改历史记录状态为已驳回
                 historicalRecord.setRecordState(3);
                 if(approvalOrderService.updateHistoricalRecord(historicalRecord) < 1){
-                    return  ResponseJson.getFAILURE();
+                    rj = ResponseJson.getFAILURE();
+                    rj.setResultMsg("修改历史记录状态为已驳回失败！");
+                    return  rj;
                 }
                 info.setApprovalStatus(3);
                 if(approvalOrderService.updateApprovalInfo(info) < 1){
-                    return  ResponseJson.getFAILURE();
+                    rj = ResponseJson.getFAILURE();
+                    rj.setResultMsg("修改审批信息失败！");
+                    return  rj;
                 }
                 //添加流程信息记录
                 processInfo.setProcessState(3);
                 if(approvalOrderService.insertProcessInfo(processInfo) < 1){
-                    return  ResponseJson.getFAILURE();
+                    rj = ResponseJson.getFAILURE();
+                    rj.setResultMsg("添加流程信息记录失败！");
+                    return  rj;
                 }
 
                 //调用第三方revokeTask接口执行撤销
@@ -557,7 +589,9 @@ public class ApprovalController {
                 //修改审批信息状态为撤销
                 info.setApprovalStatus(9);
                 if(approvalOrderService.updateApprovalInfo(info) < 1){
-                    return  ResponseJson.getFAILURE();
+                    rj = ResponseJson.getFAILURE();
+                    rj.setResultMsg("修改审批信息状态为撤销失败！");
+                    return  rj;
                 }
                 //删除该审批的历史记录
                 approvalOrderService.deleteHistoricalRecord(approvalInfo.getApprovalId());
@@ -565,7 +599,9 @@ public class ApprovalController {
                 //添加流程信息记录
                 processInfo.setProcessState(4);
                 if(approvalOrderService.insertProcessInfo(processInfo) < 1){
-                    return  ResponseJson.getFAILURE();
+                    rj = ResponseJson.getFAILURE();
+                    rj.setResultMsg("添加流程信息记录失败！");
+                    return  rj;
                 }
                 //调用第三方revokeTask接口执行撤销
                 approvalTaskService.revokeTask(approvalInfo.getActivitiId(),"业务员撤销审核");
@@ -574,7 +610,9 @@ public class ApprovalController {
                 //添加评论内容到流程信息表，不用修改任何状态
                 processInfo.setProcessState(0);
                 if(approvalOrderService.insertProcessInfo(processInfo) < 1){
-                    return  ResponseJson.getFAILURE();
+                    rj = ResponseJson.getFAILURE();
+                    rj.setResultMsg("添加评论内容到流程信息失败！");
+                    return  rj;
                 }
                 break;
         }
@@ -697,6 +735,7 @@ public class ApprovalController {
         return rj;
     }
 
+
     /**
      *  获取某个审批的整个审批流程 1:生成订单审批；2：提货申请
      * @param
@@ -719,4 +758,29 @@ public class ApprovalController {
         return rj;
     }
 
+    /**
+     *  查询入库记录
+     * @param approvalId
+     * @return productionItem
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping(value = "/getProductionItem")
+    public ResponseJson getProductionItem(HttpServletRequest request,Integer approvalId) throws Exception {
+        ResponseJson rj =new ResponseJson(200, "查询成功", 200);
+        if(approvalId == null){
+            return  ResponseJson.getFAILURE();
+        }
+        ApprovalProduction  approvalProduction = new ApprovalProduction();
+        approvalProduction.setApprovalId(approvalId);
+        List<ApprovalProduction> approvalProductionList = approvalProductionService.getApprovalProductionList(approvalProduction);
+        approvalProduction = approvalProductionList.get(0);
+        ApprovalProductionItem approvalProductionItem = new ApprovalProductionItem();
+        approvalProductionItem.setProductionId(approvalProduction.getProductionId());
+        List<ApprovalProductionItem> approvalProductionItemList = approvalProductionService.getApprovalProductionItemList(approvalProductionItem);
+        rj.addResponseKeyValue("apItemList",approvalProductionItemList);
+
+        return rj;
+    }
+
 }

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

@@ -280,10 +280,12 @@
 
    $(function (){
         var ulc = initAddress($(".address_info"));
+
+        var sc = initSalesChannel($(".sales_channel"));
     })
 
     /*初始化销售公司店铺*/
-    var sc = $(".sales_channel").initSalesChannel();
+//    var sc = $(".sales_channel").initSalesChannel();
 
 </script>
 

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/update_order.ftl

@@ -132,13 +132,13 @@
                     <label class="form-label col-1 col-sm-1">销售渠道：</label>
                     <div class="formControls col-2 col-sm-2" style="">
                     <span class="select-box">
-                        <select class="select init_company" name="salesCompanyId" id="" companyId="${order.salesCompanyId!""}" >
+                        <select class="select init_company" name="salesCompanyId" id="" ulcId="${order.salesCompanyId!""}" >
                         </select>
 				    </span>
                     </div>
                     <div class="formControls col-2 col-sm-2">
                     <span class="select-box">
-                        <select  class="select init_store"  name="salesStoreId" id="" storeId="${order.salesStoreId!""}" >
+                        <select  class="select init_store"  name="salesStoreId" id="" ulcId="${order.salesStoreId!""}" >
                         </select>
                     </span>
                     </div>
@@ -336,10 +336,13 @@
     /*初始化省市区*/
     $(function (){
         var ulc = initAddress($(".address_info"));
+
+
+        var sc = initSalesChannel($(".sales_channel"));
     })
 
     /*初始化销售公司店铺*/
-    $(".sales_channel").initSalesChannel();
+//    $(".sales_channel").initSalesChannel();
 </script>
 </body>
 </html>

watero-rst-web/src/main/webapp/common/js/common/salesChannel.js

@@ -86,3 +86,62 @@
     }
 })(jQuery,window,document);
 
+
+
+
+function initSalesChannel(node){
+    var $ulc1 = $(node).find(".init_company");
+    var $ulc2 = $(node).find(".init_store");
+    var ulc = $(node).initUlc({
+        urlPrefix: root_path,
+        ulcLevel :  [
+            {
+                ulcNode: $ulc1,	//节点
+                ulcURL: "/admin/salesChannel/select_company",	//url
+                ulcId : $ulc1.attr("ulcId"),	//节点option的value
+                ulcName: $ulc1.attr("ulcName"),
+                isFristSelect : false,	//是否有“请选择项”  false:无
+                fristSelectMsg : "请选择",
+                repData: function(res){ //res 即为原始返回的数据
+                    return {
+                        "isFlag": 200, //code判断
+                        "code": res.returnCode, //解析接口状态
+                        "msg": res.resultMsg, //解析提示文本
+                        "data": res.returnMsg.companyInfoList //解析数据列表
+                    };
+                },
+                parseData:function(data){ //res 即为原始返回的数据
+                    return {
+                        "id": data.companyId, //解析接口状态
+                        "val": data.companyName, //解析提示文本
+                        "msg": data.msg, //解析数据长度
+                    };
+                }
+            },
+            {
+                ulcNode: $ulc2,	//节点
+                ulcURL: "/admin/salesChannel/select_storeInfo?companyId=",	//url
+                ulcId : $ulc2.attr("ulcId"),	//节点option的value
+                ulcName: $ulc2.attr("ulcName"),
+                isFristSelect : false,	//是否有“请选择项”，
+                fristSelectMsg : "请选择",
+                repData: function(res){ //res 即为原始返回的数据
+                    return {
+                        "isFlag": 200, //code判断
+                        "code": res.returnCode, //解析接口状态
+                        "msg": res.resultMsg, //解析提示文本
+                        "data": res.returnMsg.storeInfoList //解析数据列表
+                    };
+                },
+                parseData:function(data){ //res 即为原始返回的数据
+                    return {
+                        "id": data.storeId, //解析接口状态
+                        "val": data.storeName, //解析提示文本
+                        "msg": data.msg, //解析数据长度
+                    };
+                }
+            }
+        ]
+    });
+    return ulc;
+}