diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
index b964c59..7e97f7e 100644
--- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
+++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
@@ -23,6 +23,7 @@ import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.oms.common.core.domain.entity.SysOmsUser;
 import com.xdadan.erp.oms.common.core.page.PageDomain;
 import com.xdadan.erp.oms.common.core.page.TableSupport;
+import com.xdadan.erp.oms.common.utils.DBUtil;
 import com.xdadan.erp.oms.common.utils.DateUtils;
 import com.xdadan.erp.oms.common.utils.HTTPHelperV3;
 import com.xdadan.erp.oms.common.utils.VerifyCodeUtil;
@@ -406,35 +407,50 @@ public class Oms2cWaybillController extends BaseController
 //                return AjaxResult.error("月结卡号对应邮箱不存在，不支持绑定!");
             }
 
-            // 生成流水号
-            String nowStr=DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS,new Date());
-            String applySeqNo=nowStr+Math.round(Math.random() * 23 + 1000);
+            // 已绑定无需再绑定
+            EmisMonthpayUseApply applayQuery=new EmisMonthpayUseApply();
+            applayQuery.setCustomerCode(getLoginUser().getUser().getCustomerCode());
+            applayQuery.setCustNo(monthPayCode);
+            List<EmisMonthpayUseApply> listSend=emisMonthpayUseApplyService.selectEmisMonthpayUseApplyList(applayQuery);
 
-            String msgCode = VerifyCodeUtil.generateTextCode(VerifyCodeUtil.TYPE_NUM_ONLY, 4, null);
+            if(!CollectionUtil.isEmpty(listSend)) {
+                EmisMonthpayUseApply useApp0=listSend.get(0);
+                if(useApp0.getAuditStatus() == 1) {
+                    return AjaxResult.error("已绑定");
+                }
+            }
 
-            EmisMonthpayUseApply emisMonthpayUseApply=new EmisMonthpayUseApply();
-            emisMonthpayUseApply.setCustomerCode(getLoginUser().getUser().getCustomerCode());
-            emisMonthpayUseApply.setCustNo(monthPayCode);
-            emisMonthpayUseApply.setApplySeq(applySeqNo);
-            emisMonthpayUseApply.setApplyName("月结卡号绑定申请");
-            emisMonthpayUseApply.setMsgCode(msgCode);
-            emisMonthpayUseApply.setApplyDate(new Date());
-            emisMonthpayUseApply.setAuditStatus(0);
-            emisMonthpayUseApplyService.insertEmisMonthpayUseApply(emisMonthpayUseApply);
 
-            //绑定
+                // 生成流水号
+//                String nowStr = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, new Date());
+//                String applySeqNo = nowStr + Math.round(Math.random() * 23 + 1000);
+                String applySeqNo = DBUtil.getSeqNoByLen(8);
+
+                String msgCode = VerifyCodeUtil.generateTextCode(VerifyCodeUtil.TYPE_NUM_ONLY, 4, null);
+
+                EmisMonthpayUseApply emisMonthpayUseApply = new EmisMonthpayUseApply();
+                emisMonthpayUseApply.setCustomerCode(getLoginUser().getUser().getCustomerCode());
+                emisMonthpayUseApply.setCustNo(monthPayCode);
+                emisMonthpayUseApply.setApplySeq(applySeqNo);
+                emisMonthpayUseApply.setApplyName("月结卡号绑定申请");
+                emisMonthpayUseApply.setMsgCode(msgCode);
+                emisMonthpayUseApply.setApplyDate(new Date());
+                emisMonthpayUseApply.setAuditStatus(0);
+                emisMonthpayUseApplyService.insertEmisMonthpayUseApply(emisMonthpayUseApply);
+
+                //绑定
 //            emisWaybillService.bindMonthPayCode(monthPayCode);
 
-            // 插入短信记录
-            EmisEmailSendRecord emisEmailSendRecord = new EmisEmailSendRecord();
-            emisEmailSendRecord.setEmail(email);
-//            String sendMsg=getLoginUser().getUser().getCustomerName()+" 申请绑定月结账号:"+monthPayCode+"，验证码是"+msgCode;
-            String sendMsg=getLoginUser().getUser().getCustomerName()+" 申请绑定月结账号:"+monthPayCode+"，输入月结密码完成绑定。";
-            emisEmailSendRecord.setContent(sendMsg);
-            emisEmailSendRecordService.insertEmisEmailSendRecord(emisEmailSendRecord);
-
+                // 插入短信记录
+//            EmisEmailSendRecord emisEmailSendRecord = new EmisEmailSendRecord();
+//            emisEmailSendRecord.setEmail(email);
+////            String sendMsg=getLoginUser().getUser().getCustomerName()+" 申请绑定月结账号:"+monthPayCode+"，验证码是"+msgCode;
+//            String sendMsg=getLoginUser().getUser().getCustomerName()+" 申请绑定月结账号:"+monthPayCode+"，输入月结密码完成绑定。";
+//            emisEmailSendRecord.setContent(sendMsg);
+//            emisEmailSendRecordService.insertEmisEmailSendRecord(emisEmailSendRecord);
 //            return AjaxResult.success("你已申请月结账号 "+monthPayCode+" 绑定，联系邮箱"+email+"收取验证码验证。");
-            return AjaxResult.success("你已申请月结账号 "+monthPayCode+" 绑定，输入月结密码完成绑定。");
+              return AjaxResult.success("你已申请月结账号 "+monthPayCode+" 绑定，输入月结密码完成绑定。");
+
 
 
         }catch (Exception ex){
@@ -465,7 +481,8 @@ public class Oms2cWaybillController extends BaseController
             }
 
             if(StringUtils.isEmpty(code)){
-                return AjaxResult.error("验证码必填!");
+//                return AjaxResult.error("验证码必填!");
+                return AjaxResult.error("月结密码必填!");
             }
 
             // 查询月结账号是否存在
@@ -481,17 +498,17 @@ public class Oms2cWaybillController extends BaseController
 
             String email = sysOmsUser0.getEmail();
             if(StringUtils.isEmpty(email)){
-                return AjaxResult.error("月结卡号对应邮箱不存在，不支持绑定!");
+//                return AjaxResult.error("月结卡号对应邮箱不存在，不支持绑定!");
             }
 
-            // 验证吗验证
+            // 验证验证
             EmisMonthpayUseApply emisMonthpayUseApply=new EmisMonthpayUseApply();
             emisMonthpayUseApply.setCustomerCode(getLoginUser().getUser().getCustomerCode());
             emisMonthpayUseApply.setCustNo(monthPayCode);
-            emisMonthpayUseApply.setMsgCode(code);
+//            emisMonthpayUseApply.setMsgCode(code);
            List<EmisMonthpayUseApply> listSend=emisMonthpayUseApplyService.selectEmisMonthpayUseApplyList(emisMonthpayUseApply);
            if(CollectionUtil.isEmpty(listSend)){
-               return AjaxResult.error("验证码错误!");
+               return AjaxResult.error("无绑定申请!");
            }
 
             // 验证成功