diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
index 8b96f974..f7044728 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
@@ -223,8 +223,8 @@ public class AbnormalBillController {
      * @return
      */
     @GetMapping("/cancelBrowse")
-    public R cancelBrowse(String handle, String cancelBrowse,String code){
-        return R.ok( abnormalBillService.cancelBrowse(handle,cancelBrowse,code));
+    public R cancelBrowse(String handle, String cancelBrowse,String code,String cancelSendUserGroup){
+        return R.ok( abnormalBillService.cancelBrowse(handle,cancelBrowse,code,cancelSendUserGroup));
     }
 
     @GetMapping("/backLog")
@@ -319,6 +319,11 @@ public class AbnormalBillController {
         return R.ok(abnormalBillService.findUploadPictureByAbnormalBo(abnormalBill));
     }
 
+    @GetMapping("/getNextNumber")
+    public R getNextNumber(String type){
+        return R.ok(abnormalBillService.getNextNumber(type));
+    }
+
     @GetMapping("/clear")
     public R clear(String type){
         return R.ok(abnormalBillService.getNextNumber(type));
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalMessageController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalMessageController.java
index 8e782013..43057883 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalMessageController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalMessageController.java
@@ -13,8 +13,8 @@ import java.util.List;
 
 /**
  *
- * @author Philip
- * @since 2021-07-21
+ * @author 赵嘉伟
+ * @since 2021-07-22
  */
 @RestController
 @RequestMapping("/Z-ABNORMAL-MESSAGE")
@@ -76,7 +76,6 @@ public class AbnormalMessageController {
                 .or().like(AbnormalMessage::getUpUserGroup, frontPage.getGlobalQuery())
                 .or().like(AbnormalMessage::getUpUser, frontPage.getGlobalQuery())
                 .or().like(AbnormalMessage::getUpMessageType, frontPage.getGlobalQuery())
-                .or().like(AbnormalMessage::getGrade, frontPage.getGlobalQuery())
                 .or().like(AbnormalMessage::getAbnormalNode, frontPage.getGlobalQuery())
                 .or().like(AbnormalMessage::getStatus, frontPage.getGlobalQuery())
                 .or().like(AbnormalMessage::getCreatedUser, frontPage.getGlobalQuery())
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalMessageMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalMessageMapper.java
index 2fabbdc7..0d14bd7d 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalMessageMapper.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalMessageMapper.java
@@ -9,8 +9,8 @@ import org.springframework.stereotype.Repository;
  *  Mapper 接口
  * </p>
  *
- * @author Philip
- * @since 2021-07-21
+ * @author 赵嘉伟
+ * @since 2021-07-22
  */
 @Repository
 public interface AbnormalMessageMapper extends BaseMapper<AbnormalMessage> {
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalMessage.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalMessage.java
index 9edc276f..b113c833 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalMessage.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalMessage.java
@@ -14,8 +14,8 @@ import java.time.LocalDateTime;
  * 
  * </p>
  *
- * @author Philip
- * @since 2021-07-21
+ * @author 赵嘉伟
+ * @since 2021-07-22
  */
 
 @TableName("Z_ABNORMAL_MESSAGE")
@@ -88,7 +88,7 @@ public class AbnormalMessage extends Model<AbnormalMessage> {
      * 等级
      */
    @TableField("GRADE")
-   private String grade;
+   private Integer grade;
     /**
      * 消息触发时间
      */
@@ -222,11 +222,11 @@ public class AbnormalMessage extends Model<AbnormalMessage> {
       this.upDateTime = upDateTime;
    }
 
-   public String getGrade() {
+   public Integer getGrade() {
       return grade;
    }
 
-   public void setGrade(String grade) {
+   public void setGrade(Integer grade) {
       this.grade = grade;
    }
 
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
index 455099e8..6d367f9b 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java
@@ -50,7 +50,7 @@ public interface AbnormalBillService extends IService<AbnormalBill> {
      */
     String generateAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose,List<String> dutyCauseType,List<String> dutyType);
 
-    boolean cancelBrowse(String handle,String cancelBrowse,String code);
+    boolean cancelBrowse(String handle,String cancelBrowse,String code,String cancelSendUserGroup);
 
     String anomalyReportDevice(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose);
 
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalMessageService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalMessageService.java
index 1f386ee7..275e7e28 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalMessageService.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalMessageService.java
@@ -12,8 +12,8 @@ import java.util.List;
  *  服务类
  * </p>
  *
- * @author Philip
- * @since 2021-07-21
+ * @author 赵嘉伟
+ * @since 2021-07-22
  */
 public interface AbnormalMessageService extends IService<AbnormalMessage> {
 
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
index a6f4bfe8..2741b8d1 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
@@ -396,7 +396,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         abnormalBillDispose.setDutyDateTime(now);
         abnormalBillDispose.setDutyUser(user);
 
-        nwaUserService.checkUserGroup(abnormalBillDispose.getDutySendUserGroup());
+        nwaUserService.checkUserGroup(site,abnormalBillDispose.getDutySendUserGroup());
         this.saveOrUpdate(abnormalBill);
         this.anomalyCreatedAndSendMessage(abnormalBillMapper.selectById(abnormalBill.getHandle()),abnormalBillDispose);
         abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
@@ -604,7 +604,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         }
 
         //判断输入的责任划分用户组是否正确，并返回对应的用户
-        nwaUserService.checkUserGroup(abnormalBillDispose.getDutySendUserGroup());
+        nwaUserService.checkUserGroup(site,abnormalBillDispose.getDutySendUserGroup());
         //插入原因分类和责任分类
         if(dutyTypes.size() > 0){
             abnormalDutyService.saveOrUpdateBatch(dutyTypes);
@@ -623,7 +623,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
     }
 
     @Override
-    public boolean cancelBrowse(String handle, String cancelBrowse,String code) {
+    public boolean cancelBrowse(String handle, String cancelBrowse,String code,String cancelSendUserGroup) {
         LocalDateTime now = LocalDateTime.now();
         AbnormalBill abnormalBill = abnormalBillMapper.selectById(handle);
         if(abnormalBill == null){
@@ -631,6 +631,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         }
         abnormalBill.setStatus(Constants.CANCEL);
         abnormalBill.setCancelReason(cancelBrowse);
+        abnormalBill.setCancelSendUserGroup(cancelSendUserGroup);
         if(!StringUtil.isBlank(code)){
             abnormalBill.setCancelCode(code);
         }
@@ -828,6 +829,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
                 wrapper.setEntity(abnormalMessage1);
                 AbnormalMessage _abnormalMessage = abnormalMessageMapper.selectOne(wrapper);
                 abnormalMessage.setUpUserGroup(_abnormalMessage.getUpUserGroup());
+                abnormalMessage.setUpMessageType(_abnormalMessage.getUpMessageType());
                 abnormalMessage.setGrade(_abnormalMessage.getGrade());
                 abnormalMessage.setUpDateTime(_abnormalMessage.getUpDateTime());
                 abnormalMessage.setAbnormalNode(Constants.ABNORMAL_MESSAGE_RESPONSE);
@@ -860,8 +862,15 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
             //得到升级的时间和等级
 
             UserGroup customFieldByGroup = userGroupMapper.getCustomFieldByGroup(site, abnormalMessage.getSendUserGroup());
-            abnormalMessage.setUpDateTime(abnormalMessage.getResponseDateTime().plusMinutes(Integer.parseInt(customFieldByGroup.getMessageNoticeTime())));
-            abnormalMessage.setGrade(customFieldByGroup.getMessageNoticeLevel());
+            if(customFieldByGroup != null && !StringUtil.isBlank(customFieldByGroup.getMessageNoticeTime())){
+                abnormalMessage.setUpDateTime(abnormalMessage.getResponseDateTime().plusMinutes(Integer.parseInt(customFieldByGroup.getMessageNoticeTime())));
+            }else{
+                abnormalMessage.setStatus("Y");
+            }
+            assert customFieldByGroup != null;
+            if(!StringUtil.isBlank(customFieldByGroup.getMessageNoticeLevel())){
+                abnormalMessage.setGrade(Integer.parseInt(customFieldByGroup.getMessageNoticeLevel()));
+            }
             //得到升级的消息类型
             abnormalMessage.setUpMessageType(abnormalMessage.getMessageType());
         }
@@ -893,7 +902,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
             String sendUsers = abnormalMessage.getSendUser().replace(',', '|');
             activeMQUtil.wechatSendMessage(sendUsers,abnormalMessage.getContent());
         }else if(!Constants.ABNORMAL_MESSAGE_RESPONSE.equals(abnormalMessage.getAbnormalNode())){
-            List<NwaUser> nwaUsers = nwaUserService.checkUserGroup(abnormalMessage.getSendUserGroup());
+            List<NwaUser> nwaUsers = nwaUserService.checkUserGroup(site,abnormalMessage.getSendUserGroup());
             StringBuilder sendUsers = new StringBuilder();
             for (int i = 0; i < nwaUsers.size(); i++) {
                 if(i == (nwaUsers.size() - 1)){
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalMessageServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalMessageServiceImpl.java
index 8eda8ebf..c0bc6d0b 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalMessageServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalMessageServiceImpl.java
@@ -17,8 +17,8 @@ import java.util.List;
  *  服务实现类
  * </p>
  *
- * @author Philip
- * @since 2021-07-21
+ * @author 赵嘉伟
+ * @since 2021-07-22
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AnomalyJobServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AnomalyJobServiceImpl.java
index d3c9eb36..aa2a1702 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AnomalyJobServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AnomalyJobServiceImpl.java
@@ -10,10 +10,13 @@ import com.foreverwin.mesnac.anomaly.service.AbnormalMessageService;
 import com.foreverwin.mesnac.anomaly.service.AnomalyJobService;
 import com.foreverwin.mesnac.anomaly.util.ActiveMQUtil;
 import com.foreverwin.mesnac.common.util.StringUtil;
+import com.foreverwin.mesnac.meapi.mapper.UserGroupMapper;
 import com.foreverwin.mesnac.meapi.model.NwaUser;
 import com.foreverwin.mesnac.meapi.service.NwaUserService;
 import com.foreverwin.modular.core.util.CommonMethods;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -24,6 +27,8 @@ import java.util.UUID;
  * @Author zhaojiawei
  * @Since 2021-07-22
  */
+@Service
+@Transactional(rollbackFor = Exception.class)
 public class AnomalyJobServiceImpl implements AnomalyJobService {
 
     @Autowired
@@ -44,6 +49,10 @@ public class AnomalyJobServiceImpl implements AnomalyJobService {
     @Autowired
     private NwaUserService nwaUserService;
 
+    @Autowired
+    private UserGroupMapper userGroupMapper;
+
+
     @Override
     public void anomalyJobProcess(String site) {
         LocalDateTime now = LocalDateTime.now();
@@ -51,7 +60,7 @@ public class AnomalyJobServiceImpl implements AnomalyJobService {
         //找到状态为N，并且升级时间大于当前时间
         QueryWrapper<AbnormalMessage> abnormalMessageQueryWrapper = new QueryWrapper<>();
         abnormalMessageQueryWrapper.eq("STATUS","N");
-        abnormalMessageQueryWrapper.gt("UP_DATE_TIME",now);
+        abnormalMessageQueryWrapper.lt("UP_DATE_TIME",now);
         List<AbnormalMessage> abnormalMessages = abnormalMessageMapper.selectList(abnormalMessageQueryWrapper);
         for(AbnormalMessage _abnormalMessage : abnormalMessages){
             String uuid = UUID.randomUUID().toString();
@@ -59,7 +68,7 @@ public class AnomalyJobServiceImpl implements AnomalyJobService {
             //设置abnormalMessage的handle
             abnormalMessage.setHandle(uuid);
             //设置abnormalMessage的site
-            abnormalMessage.setSite(_abnormalMessage.getSite());
+            abnormalMessage.setSite(site);
             //设置abnormalMessage的异常单Bo
             abnormalMessage.setAbnormalBillBo(_abnormalMessage.getAbnormalBillBo());
             //设置abnormalMessage的type
@@ -69,14 +78,14 @@ public class AnomalyJobServiceImpl implements AnomalyJobService {
             //设置发送用户组和升级用户组
             if(!StringUtil.isBlank(_abnormalMessage.getUpUserGroup())){
                 //当前发送用户组就等于升级用户组，升级用户组就等于空
-                abnormalMessage.setSendUserGroup(abnormalMessage.getUpUserGroup());
+                abnormalMessage.setSendUserGroup(_abnormalMessage.getUpUserGroup());
                 abnormalMessage.setUpUserGroup(null);
             }
 
             //设置发送用户和升级用户
-            if(!StringUtil.isBlank(abnormalMessage.getUpUser())){
+            if(!StringUtil.isBlank(_abnormalMessage.getUpUser())){
                 //当前发送用户就等于升级用户，升级用户就等于空
-                abnormalMessage.setSendUser(abnormalMessage.getUpUser());
+                abnormalMessage.setSendUser(_abnormalMessage.getUpUser());
                 abnormalMessage.setUpUser(null);
             }
 
@@ -84,16 +93,17 @@ public class AnomalyJobServiceImpl implements AnomalyJobService {
 
             String message = abnormalBillService.formatMessage(abnormalBill,abnormalMessage.getMessageType(),site);
 
-            abnormalMessage.setContent(message);
+            abnormalMessage.setContent(message+"，It's Job send");
 
             //设置UP_DATE_TIME、UP_MESSAGE_TYPE、GRADE、RESPONSE_DATE_TIME、ABNORMAL_NODE、STATUS
             abnormalMessage.setUpMessageType(null);
             abnormalMessage.setUpDateTime(null);
 
-            abnormalMessage.setGrade(abnormalMessage.getGrade() + 1);
+            abnormalMessage.setGrade(_abnormalMessage.getGrade() + 1);
             abnormalMessage.setResponseDateTime(now);
             abnormalMessage.setAbnormalNode(_abnormalMessage.getAbnormalNode());
             abnormalMessage.setStatus("Y");
+            _abnormalMessage.setStatus("Y");
 
             //设置时间
             abnormalMessage.setCreatedUser(user);
@@ -105,7 +115,9 @@ public class AnomalyJobServiceImpl implements AnomalyJobService {
 //                String sendUsers = abnormalMessage.getSendUser().replace(',', '|');
 //                activeMQUtil.wechatSendMessage(sendUsers,abnormalMessage.getContent());
 //            }else if(!Constants.ABNORMAL_MESSAGE_RESPONSE.equals(abnormalMessage.getAbnormalNode())){
-                List<NwaUser> nwaUsers = nwaUserService.checkUserGroup(abnormalMessage.getSendUserGroup());
+                //判断是否有该用户组
+
+            List<NwaUser> nwaUsers = nwaUserService.checkUserGroup(site,abnormalMessage.getSendUserGroup());
                 StringBuilder sendUsers = new StringBuilder();
                 for (int i = 0; i < nwaUsers.size(); i++) {
                     if(i == (nwaUsers.size() - 1)){
@@ -117,6 +129,7 @@ public class AnomalyJobServiceImpl implements AnomalyJobService {
                 activeMQUtil.wechatSendMessage(sendUsers.toString(),abnormalMessage.getContent());
 //            }
             abnormalMessageService.saveOrUpdate(abnormalMessage);
+            abnormalMessageService.saveOrUpdate(_abnormalMessage);
         }
     }
 }
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java
index 7867dcee..6032f4d1 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java
@@ -83,8 +83,8 @@ public class ShopOrderController {
      * 根据工单找出工作令号，项目号，产品类别
      */
     @GetMapping("/findByShopOrderBo")
-    public R findByShopOrderBo(String handle){
-      return R.ok(shopOrderService.findByShopOrderBo(handle));
+    public R findByShopOrderBo(String shopOrder){
+      return R.ok(shopOrderService.findByShopOrderBo(shopOrder));
     }
 }
 
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java
index 57df9abb..aee47346 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java
@@ -36,5 +36,5 @@ public interface NwaUserService extends IService<NwaUser> {
      * @param userGroups
      * @return
      */
-    List<NwaUser> checkUserGroup(String userGroups);
+    List<NwaUser> checkUserGroup(String site,String userGroups);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NwaUserServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NwaUserServiceImpl.java
index 0a8cb37f..a2449279 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NwaUserServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/NwaUserServiceImpl.java
@@ -64,8 +64,10 @@ public class NwaUserServiceImpl extends ServiceImpl<NwaUserMapper, NwaUser> impl
     }
 
     @Override
-    public List<NwaUser> checkUserGroup(String userGroups) {
-        String site = CommonMethods.getSite();
+    public List<NwaUser> checkUserGroup(String site,String userGroups) {
+        if(StringUtils.isBlank(site)){
+            site = CommonMethods.getSite();
+        }
         List<String> item = new ArrayList<String>();
         if(StringUtils.isBlank(userGroups)){
             return null;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java
index bff01b04..20d6e2d8 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java
@@ -10,6 +10,7 @@ import com.foreverwin.mesnac.meapi.mapper.ShopOrderMapper;
 import com.foreverwin.mesnac.meapi.service.ShopOrderService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sap.me.status.StatusBOHandle;
+import org.eclipse.jetty.util.StringUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -53,7 +54,12 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
     }
 
     @Override
-    public ShopOrderDto findByShopOrderBo(String handle) {
+    public ShopOrderDto findByShopOrderBo(String shopOrder) {
+        String site = CommonMethods.getSite();
+        String handle = null;
+        if(!StringUtil.isBlank(shopOrder)){
+            handle = "ShopOrderBO:"+site+","+shopOrder;
+        }
         return shopOrderMapper.findByShopOrderBo(handle);
     }