From 4f7fd563335463f09c2a240c40059ebb71af4702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Thu, 12 Aug 2021 13:39:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E7=9A=84=E9=87=8D=E6=96=B0=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=EF=BC=8C=E5=BC=82=E5=B8=B8bug=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=8A=8A=E5=8F=91=E9=80=81=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8F=91=E9=80=81=E7=94=A8=E6=88=B7=E7=BB=84?=
 =?UTF-8?q?=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AbnormalBillDisposeController.java        |   6 +-
 .../controller/AbnormalBillLogController.java |   7 +-
 .../mapper/AbnormalBillDisposeMapper.java     |   6 +-
 .../anomaly/mapper/AbnormalBillLogMapper.java |   4 +-
 .../anomaly/model/AbnormalBillDispose.java    |  30 +--
 .../mesnac/anomaly/model/AbnormalBillLog.java |  22 +--
 .../service/AbnormalBillDisposeService.java   |   4 +-
 .../service/AbnormalBillLogService.java       |   4 +-
 .../anomaly/service/AbnormalBillService.java  |   2 +-
 .../impl/AbnormalBillDisposeServiceImpl.java  |   4 +-
 .../impl/AbnormalBillLogServiceImpl.java      |  25 ++-
 .../service/impl/AbnormalBillServiceImpl.java |  30 ++-
 .../service/impl/AbnormalPlanServiceImpl.java |   2 +-
 .../mapper/AbnormalBillDisposeMapper.xml      | 183 +++++++++++++-----
 .../mapper/AbnormalBillLogMapper.xml          |  40 ++--
 .../resources/mapper/AbnormalBillMapper.xml   |   4 +-
 .../service/impl/SfcScrapServiceImpl.java     |   2 +-
 .../main/resources/mapper/SfcScrapMapper.xml  |   3 +-
 18 files changed, 231 insertions(+), 147 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillDisposeController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillDisposeController.java
index 3856c3e3..dd68fe57 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillDisposeController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillDisposeController.java
@@ -13,8 +13,8 @@ import java.util.List;
 
 /**
  *
- * @author robert
- * @since 2021-06-29
+ * @author zjw
+ * @since 2021-08-12
  */
 @RestController
 @RequestMapping("/Z-ABNORMAL-BILL-DISPOSE")
@@ -80,7 +80,7 @@ public class AbnormalBillDisposeController {
                 .or().like(AbnormalBillDispose::getRouterBo, frontPage.getGlobalQuery())
                 .or().like(AbnormalBillDispose::getResolveShopOrder, frontPage.getGlobalQuery())
                 .or().like(AbnormalBillDispose::getResolveRemark, frontPage.getGlobalQuery())
-                .or().like(AbnormalBillDispose::getResolveSendUser, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillDispose::getResolveSendUserGroup, frontPage.getGlobalQuery())
                 .or().like(AbnormalBillDispose::getClosedUser, frontPage.getGlobalQuery())
                 .or().like(AbnormalBillDispose::getAbnormalReason, frontPage.getGlobalQuery())
                 .or().like(AbnormalBillDispose::getBeforeMeasure, frontPage.getGlobalQuery())
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java
index 8b69a27c..7721b6bf 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillLogController.java
@@ -15,8 +15,8 @@ import java.util.List;
 
 /**
  *
- * @author 赵嘉伟
- * @since 2021-07-23
+ * @author zjw
+ * @since 2021-08-12
  */
 @RestController
 @RequestMapping("/Z-ABNORMAL-BILL-LOG")
@@ -109,7 +109,7 @@ public class AbnormalBillLogController {
                 .or().like(AbnormalBillLog::getRouterBo, frontPage.getGlobalQuery())
                 .or().like(AbnormalBillLog::getResolveShopOrder, frontPage.getGlobalQuery())
                 .or().like(AbnormalBillLog::getResolveRemark, frontPage.getGlobalQuery())
-                .or().like(AbnormalBillLog::getResolveSendUser, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillLog::getResolveSendUserGroup, frontPage.getGlobalQuery())
                 .or().like(AbnormalBillLog::getClosedUser, frontPage.getGlobalQuery())
                 .or().like(AbnormalBillLog::getAbnormalReason, frontPage.getGlobalQuery())
                 .or().like(AbnormalBillLog::getBeforeMeasure, frontPage.getGlobalQuery())
@@ -165,7 +165,6 @@ public class AbnormalBillLogController {
         return R.ok(abnormalBillLogService.removeByIds(ids));
     }
 
-
     @GetMapping("/saveAndUpdate")
     public R saveAndUpdate(AbnormalBill abnormalBill,
                            AbnormalBillDispose abnormalBillDispose,
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillDisposeMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillDisposeMapper.java
index c5efb797..3070aa21 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillDisposeMapper.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillDisposeMapper.java
@@ -12,12 +12,13 @@ import org.springframework.stereotype.Repository;
  * 异常单处置 Mapper 接口
  * </p>
  *
- * @author robert
- * @since 2021-06-29
+ * @author zjw
+ * @since 2021-08-12
  */
 @Repository
 public interface AbnormalBillDisposeMapper extends BaseMapper<AbnormalBillDispose> {
 
+
     /**
      * 质量异常检索
      * @param abnormalBill
@@ -29,4 +30,5 @@ public interface AbnormalBillDisposeMapper extends BaseMapper<AbnormalBillDispos
 
 
 
+
 }
\ No newline at end of file
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillLogMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillLogMapper.java
index 4d898f53..65273f8b 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillLogMapper.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillLogMapper.java
@@ -11,8 +11,8 @@ import org.springframework.stereotype.Repository;
  * 异常单记录表 Mapper 接口
  * </p>
  *
- * @author 赵嘉伟
- * @since 2021-07-23
+ * @author zjw
+ * @since 2021-08-12
  */
 @Repository
 public interface AbnormalBillLogMapper extends BaseMapper<AbnormalBillLog> {
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillDispose.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillDispose.java
index beae589f..2ec563fb 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillDispose.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillDispose.java
@@ -14,8 +14,8 @@ import java.time.LocalDateTime;
  * 异常单处置
  * </p>
  *
- * @author robert
- * @since 2021-06-29
+ * @author zjw
+ * @since 2021-08-12
  */
 
 @TableName("Z_ABNORMAL_BILL_DISPOSE")
@@ -27,7 +27,7 @@ public class AbnormalBillDispose extends Model<AbnormalBillDispose> {
     /**
      * 主键
      */
-    @TableId(value = "HANDLE", type = IdType.INPUT)
+   @TableId(value = "HANDLE", type = IdType.INPUT)
    private String handle;
     /**
      * 站点
@@ -90,7 +90,11 @@ public class AbnormalBillDispose extends Model<AbnormalBillDispose> {
    @TableField("RESOLVE_DATE_TIME")
    private LocalDateTime resolveDateTime;
     /**
-     * 异常方案
+     * 异常方案     一个字母的质量异常响应，二个字母的是设备异常响应
+   X | 线下换料  ,  S | 试装,  R | 让步放心,  C | 产品报废 ,
+P | 配作 ,   F |  返修 ,
+
+ CG 常规维修,JH 计划维修,DX 大项修
      */
    @TableField("ABNORMAL_METHOD")
    private String abnormalMethod;
@@ -110,10 +114,10 @@ public class AbnormalBillDispose extends Model<AbnormalBillDispose> {
    @TableField("RESOLVE_REMARK")
    private String resolveRemark;
     /**
-     * 发送用户
+     * 发送用户组
      */
-   @TableField("RESOLVE_SEND_USER")
-   private String resolveSendUser;
+   @TableField("RESOLVE_SEND_USER_GROUP")
+   private String resolveSendUserGroup;
     /**
      * 闭环关闭填报人
      */
@@ -292,12 +296,12 @@ public class AbnormalBillDispose extends Model<AbnormalBillDispose> {
       this.resolveRemark = resolveRemark;
    }
 
-   public String getResolveSendUser() {
-      return resolveSendUser;
+   public String getResolveSendUserGroup() {
+      return resolveSendUserGroup;
    }
 
-   public void setResolveSendUser(String resolveSendUser) {
-      this.resolveSendUser = resolveSendUser;
+   public void setResolveSendUserGroup(String resolveSendUserGroup) {
+      this.resolveSendUserGroup = resolveSendUserGroup;
    }
 
    public String getClosedUser() {
@@ -398,7 +402,7 @@ public static final String RESOLVE_SHOP_ORDER = "RESOLVE_SHOP_ORDER";
 
 public static final String RESOLVE_REMARK = "RESOLVE_REMARK";
 
-public static final String RESOLVE_SEND_USER = "RESOLVE_SEND_USER";
+public static final String RESOLVE_SEND_USER_GROUP = "RESOLVE_SEND_USER_GROUP";
 
 public static final String CLOSED_USER = "CLOSED_USER";
 
@@ -442,7 +446,7 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
          ", routerBo = " + routerBo +
          ", resolveShopOrder = " + resolveShopOrder +
          ", resolveRemark = " + resolveRemark +
-         ", resolveSendUser = " + resolveSendUser +
+         ", resolveSendUserGroup = " + resolveSendUserGroup +
          ", closedUser = " + closedUser +
          ", closedDateTime = " + closedDateTime +
          ", abnormalReason = " + abnormalReason +
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillLog.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillLog.java
index 8e503406..eb89b0af 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillLog.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillLog.java
@@ -14,8 +14,8 @@ import java.time.LocalDateTime;
  * 异常单记录表
  * </p>
  *
- * @author 赵嘉伟
- * @since 2021-07-23
+ * @author zjw
+ * @since 2021-08-12
  */
 
 @TableName("Z_ABNORMAL_BILL_LOG")
@@ -260,10 +260,10 @@ public class AbnormalBillLog extends Model<AbnormalBillLog> {
    @TableField("RESOLVE_REMARK")
    private String resolveRemark;
     /**
-     * 发送用户
+     * 发送用户组
      */
-   @TableField("RESOLVE_SEND_USER")
-   private String resolveSendUser;
+   @TableField("RESOLVE_SEND_USER_GROUP")
+   private String resolveSendUserGroup;
     /**
      * 闭环关闭填报人
      */
@@ -692,12 +692,12 @@ public class AbnormalBillLog extends Model<AbnormalBillLog> {
       this.resolveRemark = resolveRemark;
    }
 
-   public String getResolveSendUser() {
-      return resolveSendUser;
+   public String getResolveSendUserGroup() {
+      return resolveSendUserGroup;
    }
 
-   public void setResolveSendUser(String resolveSendUser) {
-      this.resolveSendUser = resolveSendUser;
+   public void setResolveSendUserGroup(String resolveSendUserGroup) {
+      this.resolveSendUserGroup = resolveSendUserGroup;
    }
 
    public String getClosedUser() {
@@ -874,7 +874,7 @@ public static final String RESOLVE_SHOP_ORDER = "RESOLVE_SHOP_ORDER";
 
 public static final String RESOLVE_REMARK = "RESOLVE_REMARK";
 
-public static final String RESOLVE_SEND_USER = "RESOLVE_SEND_USER";
+public static final String RESOLVE_SEND_USER_GROUP = "RESOLVE_SEND_USER_GROUP";
 
 public static final String CLOSED_USER = "CLOSED_USER";
 
@@ -952,7 +952,7 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
          ", routerBo = " + routerBo +
          ", resolveShopOrder = " + resolveShopOrder +
          ", resolveRemark = " + resolveRemark +
-         ", resolveSendUser = " + resolveSendUser +
+         ", resolveSendUserGroup = " + resolveSendUserGroup +
          ", closedUser = " + closedUser +
          ", closedDateTime = " + closedDateTime +
          ", abnormalReason = " + abnormalReason +
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillDisposeService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillDisposeService.java
index a8018ed9..ad65bcf1 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillDisposeService.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillDisposeService.java
@@ -12,8 +12,8 @@ import java.util.List;
  * 异常单处置 服务类
  * </p>
  *
- * @author robert
- * @since 2021-06-29
+ * @author zjw
+ * @since 2021-08-12
  */
 public interface AbnormalBillDisposeService extends IService<AbnormalBillDispose> {
 
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillLogService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillLogService.java
index 9bdf6cdf..1b91b704 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillLogService.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillLogService.java
@@ -15,8 +15,8 @@ import java.util.List;
  * 异常单记录表 服务类
  * </p>
  *
- * @author 赵嘉伟
- * @since 2021-07-23
+ * @author zjw
+ * @since 2021-08-12
  */
 public interface AbnormalBillLogService extends IService<AbnormalBillLog> {
 
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 49aaccda..df5ab507 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
@@ -85,7 +85,7 @@ public interface AbnormalBillService extends IService<AbnormalBill> {
      * 方案确认
      * @param abnormalBill
      */
-    void programConfirm(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose);
+    void programConfirm(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose);
 
     /**
      * 判责提交
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillDisposeServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillDisposeServiceImpl.java
index ebb7af58..a017bbc4 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillDisposeServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillDisposeServiceImpl.java
@@ -17,8 +17,8 @@ import java.util.List;
  * 异常单处置 服务实现类
  * </p>
  *
- * @author robert
- * @since 2021-06-29
+ * @author zjw
+ * @since 2021-08-12
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java
index 84205ff7..366c9fe4 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillLogServiceImpl.java
@@ -13,10 +13,11 @@ import com.foreverwin.mesnac.anomaly.service.*;
 import com.foreverwin.mesnac.common.constant.Constants;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.util.StringUtil;
-import com.foreverwin.mesnac.meapi.mapper.NwaUserMapper;
 import com.foreverwin.mesnac.meapi.mapper.ShopOrderMapper;
+import com.foreverwin.mesnac.meapi.model.NwaUser;
 import com.foreverwin.mesnac.meapi.model.Router;
 import com.foreverwin.mesnac.meapi.model.ShopOrder;
+import com.foreverwin.mesnac.meapi.service.NwaUserService;
 import com.foreverwin.mesnac.meapi.service.RouterService;
 import com.foreverwin.modular.core.exception.BusinessException;
 import com.foreverwin.modular.core.util.CommonMethods;
@@ -34,8 +35,8 @@ import java.util.List;
  * 异常单记录表 服务实现类
  * </p>
  *
- * @author 赵嘉伟
- * @since 2021-07-23
+ * @author zjw
+ * @since 2021-08-12
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -45,6 +46,8 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
     @Autowired
     private AbnormalBillLogMapper abnormalBillLogMapper;
 
+
+
     @Autowired
     private AbnormalNcCodeService abnormalNcCodeService;
 
@@ -61,7 +64,8 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
     private RouterService routerService;
 
     @Autowired
-    private NwaUserMapper nwaUserMapper;
+    private NwaUserService nwaUserService;
+
 
     @Autowired
     private ShopOrderMapper shopOrderMapper;
@@ -69,6 +73,7 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
     @Autowired
     private AbnormalPlanService abnormalPlanService;
 
+
     @Override
     public IPage<AbnormalBillLog> selectPage(FrontPage<AbnormalBillLog> frontPage, AbnormalBillLog abnormalBillLog) {
         QueryWrapper<AbnormalBillLog> queryWrapper = new QueryWrapper<>();
@@ -112,12 +117,9 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
             }
         }
         //发送用户
-        String[] split = abnormalBillDispose.getResolveSendUser().split(",");
-        List<String> strings = Arrays.asList(split);
-        int length = nwaUserMapper.checkUser(site, strings);
-        if(length != strings.size()){
-            throw BusinessException.build("发送用户填报错误");
-        }
+        String resolveSendUserGroup = abnormalBillDispose.getResolveSendUserGroup();
+        List<NwaUser> nwaUsers = nwaUserService.checkUserGroup(site, resolveSendUserGroup);
+
 
 
         if(abnormalBillLogMapper.selectById(abnormalBillLog.getHandle()) == null){
@@ -178,4 +180,7 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
         }
     }
 
+
+
+
 }
\ No newline at end of file
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 99eb81fa..8319c3cd 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
@@ -377,6 +377,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
                 throw BusinessException.build("该返修工艺不存在");
             }
         }
+
+
         //判断返修工单是否正确
         if(!StringUtil.isBlank(abnormalBillDispose.getResolveShopOrder())){
             ShopOrder shopOrder = shopOrderMapper.selectById(HandleEnum.SHOP_ORDER.getHandle(site, abnormalBillDispose.getResolveShopOrder()));
@@ -384,13 +386,10 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
                 throw BusinessException.build("该返修工单不存在");
             }
         }
+
+
         //发送用户
-        String[] split = abnormalBillDispose.getResolveSendUser().split(",");
-        List<String> strings = Arrays.asList(split);
-        int length = nwaUserMapper.checkUser(site, strings);
-        if(length != strings.size()){
-            throw BusinessException.build("发送用户填报错误");
-        }
+        nwaUserService.checkUserGroup(site,abnormalBillDispose.getResolveSendUserGroup());
 
 
         //设置解决方案的处理时间和处理人
@@ -925,7 +924,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
                 abnormalMessage.setNode(Constants.ABNORMAL_MESSAGE_CORRECTION_CONFIRM);
                 break;
             case Constants.PROGRAM_CONFIRM://方案确认
-                abnormalMessage.setSendUser(abnormalBillDispose.getResolveSendUser());
+                abnormalMessage.setSendUser(abnormalBillDispose.getResolveSendUserGroup());
                 abnormalMessage.setNode(Constants.ABNORMAL_MESSAGE_PROGRAM_CONFIRM);
                 break;
             case Constants.CANCEL://取消
@@ -942,9 +941,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
                 messageTypeUpdateWrapper.eq("OBJECT_BO",abnormalMessage.getObjectBo());
                 messageService.update(abnormalMessage2,messageTypeUpdateWrapper);
                 break;
-            case Constants.SHUT_DOWN:
-                abnormalMessage.setSendUser(abnormalBillDispose.getResolveSendUser());
-                abnormalMessage.setNode(Constants.ABNORMAL_MESSAGE_PROGRAM_CONFIRM);
+            default:
+                abnormalMessage.setSendUser(abnormalBillDispose.getResolveSendUserGroup());
+                abnormalMessage.setNode(Constants.ABNORMAL_MESSAGE_CANCEL);
                 break;
         }
 
@@ -995,7 +994,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.getNode())){
-            List<NwaUser> nwaUsers = nwaUserService.checkUserGroup(site,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)){
@@ -1060,6 +1059,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
 //            messageMap.put("SHOPORDER",abnormalBill.getWorkCenter());
 //        }
 //        messageMap.put("ITEM",item);
+
         //格式化之后的消息
         return StringUtils.format(body, messageMap);
     }
@@ -1069,7 +1069,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         return abnormalBillMapper.getQCAbnormalList(CommonMethods.getSite());
     }
 
-
     @Override
     public boolean jgProductionIsScrap(String site,String sfc) {
         //查询该sfc在质量异常异常方案是否是报废,如果是，则大于1
@@ -1080,16 +1079,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
     @Override
     public List<ScrapDto> getScrapDtoBysfc(String site, String sfc) {
         //判断该产品条码是否已经报废
-//        if(sfcScrapMapper.selectById(HandleEnum.SFC_SCRAP.getHandle(site,sfc)) != null){
-//            throw new BaseException("该产品条码已经报废");
-//        }
         if(this.jgProductionIsScrap(site,sfc)){
             throw new BaseException("该产品条码的异常方案不是报废");
         }
         return abnormalBillMapper.findScrapDtoBySfc(site, sfc);
     }
-
-
-
-
 }
\ No newline at end of file
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java
index 3fd796b2..759f5fde 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalPlanServiceImpl.java
@@ -142,7 +142,7 @@ public class AbnormalPlanServiceImpl extends ServiceImpl<AbnormalPlanMapper, Abn
             AbnormalBill abnormalBill = abnormalBillMapper.selectById(HandleEnum.ABNORMAL_BILL.getHandle(site, abnormalPlan.getAbnormalNo()));
             AbnormalBillDispose abnormalBillDispose = abnormalBillDisposeMapper.selectById(HandleEnum.ABNORMAL_BILL_DISPOSE.getHandle(site, abnormalPlan.getAbnormalNo()));
             //发送消息
-            abnormalBillService.anomalyCreatedAndSendMessage(abnormalBill,abnormalBillDispose);
+        //    abnormalBillService.anomalyCreatedAndSendMessage(abnormalBill,abnormalBillDispose);
             if(Constants.PROCESSED.equals(abnormalPlan.getStatus())){
                 throw new BaseException("异常单："+abnormalPlan.getAbnormalNo()+"已经处理，不能再次处理");
             }
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml
index 38b863d1..87d1be31 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml
@@ -4,7 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose">
-        <result column="HANDLE" property="handle" />
+        <id column="HANDLE" property="handle" />
         <result column="SITE" property="site" />
         <result column="ABNORMAL_BILL_BO" property="abnormalBillBo" />
         <result column="DUTY_USER" property="dutyUser" />
@@ -21,7 +21,7 @@
         <result column="ROUTER_BO" property="routerBo" />
         <result column="RESOLVE_SHOP_ORDER" property="resolveShopOrder" />
         <result column="RESOLVE_REMARK" property="resolveRemark" />
-        <result column="RESOLVE_SEND_USER" property="resolveSendUser" />
+        <result column="RESOLVE_SEND_USER_GROUP" property="resolveSendUserGroup" />
         <result column="CLOSED_USER" property="closedUser" />
         <result column="CLOSED_DATE_TIME" property="closedDateTime" />
         <result column="ABNORMAL_REASON" property="abnormalReason" />
@@ -32,6 +32,8 @@
         <result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
     </resultMap>
 
+
+
     <!--质量异常响应界面检索用-->
     <resultMap id="AbnormalBillDisposeDto" type="com.foreverwin.mesnac.anomaly.dto.AbnormalBillDisposeDto" extends="BaseResultMap">
         <result column="ABNORMAL_NO" property="abnormalNo"/>
@@ -69,12 +71,17 @@
         <result column="REPORT_SEND_USER_GROUP" property="reportSendUserGroup"/>
     </resultMap>
 
+
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        HANDLE, SITE, ABNORMAL_BILL_BO, DUTY_USER, DUTY_DATE_TIME, DUTY_DEPART, DUTY_TYPE, PRINCIPAL_USER, DUTY_CAUSE_DESCRIPTION, DUTY_CAUSE_TYPE, DUTY_SEND_USER_GROUP, RESOLVE_USER, RESOLVE_DATE_TIME, ABNORMAL_METHOD, ROUTER_BO, RESOLVE_SHOP_ORDER, RESOLVE_REMARK, RESOLVE_SEND_USER, CLOSED_USER, CLOSED_DATE_TIME, ABNORMAL_REASON, BEFORE_MEASURE, CREATED_USER, CREATED_DATA_TIME, MODIFIED_USER, MODIFIED_DATE_TIME
+        HANDLE, SITE, ABNORMAL_BILL_BO, DUTY_USER, DUTY_DATE_TIME, DUTY_DEPART, DUTY_TYPE, PRINCIPAL_USER, DUTY_CAUSE_DESCRIPTION, DUTY_CAUSE_TYPE, DUTY_SEND_USER_GROUP, RESOLVE_USER, RESOLVE_DATE_TIME, ABNORMAL_METHOD, ROUTER_BO, RESOLVE_SHOP_ORDER, RESOLVE_REMARK, RESOLVE_SEND_USER_GROUP, CLOSED_USER, CLOSED_DATE_TIME, ABNORMAL_REASON, BEFORE_MEASURE, CREATED_USER, CREATED_DATA_TIME, MODIFIED_USER, MODIFIED_DATE_TIME
     </sql>
 
     <!-- BaseMapper标准查询/修改/删除 -->
+    <select id="selectById" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include> FROM Z_ABNORMAL_BILL_DISPOSE WHERE HANDLE=#{handle}
+    </select>
 
     <select id="selectByMap" resultMap="BaseResultMap">
         SELECT <include refid="Base_Column_List"></include>
@@ -90,6 +97,12 @@
         </if>
     </select>
 
+    <select id="selectBatchIds" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include>
+        FROM Z_ABNORMAL_BILL_DISPOSE WHERE HANDLE IN (
+        <foreach item="item" index="index" collection="coll" separator=",">#{item}
+        </foreach>)
+    </select>
 
     <select id="selectOne" resultMap="BaseResultMap">
         SELECT <include refid="Base_Column_List"></include> FROM Z_ABNORMAL_BILL_DISPOSE
@@ -113,7 +126,7 @@
             <if test="ew.entity.routerBo!=null"> AND ROUTER_BO=#{ew.entity.routerBo}</if>
             <if test="ew.entity.resolveShopOrder!=null"> AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder}</if>
             <if test="ew.entity.resolveRemark!=null"> AND RESOLVE_REMARK=#{ew.entity.resolveRemark}</if>
-            <if test="ew.entity.resolveSendUser!=null"> AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser}</if>
+            <if test="ew.entity.resolveSendUserGroup!=null"> AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup}</if>
             <if test="ew.entity.closedUser!=null"> AND CLOSED_USER=#{ew.entity.closedUser}</if>
             <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
             <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
@@ -149,7 +162,7 @@
                 <if test="ew.entity.routerBo!=null"> AND ROUTER_BO=#{ew.entity.routerBo}</if>
                 <if test="ew.entity.resolveShopOrder!=null"> AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder}</if>
                 <if test="ew.entity.resolveRemark!=null"> AND RESOLVE_REMARK=#{ew.entity.resolveRemark}</if>
-                <if test="ew.entity.resolveSendUser!=null"> AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser}</if>
+                <if test="ew.entity.resolveSendUserGroup!=null"> AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup}</if>
                 <if test="ew.entity.closedUser!=null"> AND CLOSED_USER=#{ew.entity.closedUser}</if>
                 <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                 <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
@@ -193,7 +206,7 @@
                     <if test="ew.entity.routerBo!=null"> AND ROUTER_BO=#{ew.entity.routerBo}</if>
                     <if test="ew.entity.resolveShopOrder!=null"> AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder}</if>
                     <if test="ew.entity.resolveRemark!=null"> AND RESOLVE_REMARK=#{ew.entity.resolveRemark}</if>
-                    <if test="ew.entity.resolveSendUser!=null"> AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser}</if>
+                    <if test="ew.entity.resolveSendUserGroup!=null"> AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup}</if>
                     <if test="ew.entity.closedUser!=null"> AND CLOSED_USER=#{ew.entity.closedUser}</if>
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
@@ -237,7 +250,7 @@
                     <if test="ew.entity.routerBo!=null"> AND ROUTER_BO=#{ew.entity.routerBo}</if>
                     <if test="ew.entity.resolveShopOrder!=null"> AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder}</if>
                     <if test="ew.entity.resolveRemark!=null"> AND RESOLVE_REMARK=#{ew.entity.resolveRemark}</if>
-                    <if test="ew.entity.resolveSendUser!=null"> AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser}</if>
+                    <if test="ew.entity.resolveSendUserGroup!=null"> AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup}</if>
                     <if test="ew.entity.closedUser!=null"> AND CLOSED_USER=#{ew.entity.closedUser}</if>
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
@@ -281,7 +294,7 @@
                     <if test="ew.entity.routerBo!=null"> AND ROUTER_BO=#{ew.entity.routerBo}</if>
                     <if test="ew.entity.resolveShopOrder!=null"> AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder}</if>
                     <if test="ew.entity.resolveRemark!=null"> AND RESOLVE_REMARK=#{ew.entity.resolveRemark}</if>
-                    <if test="ew.entity.resolveSendUser!=null"> AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser}</if>
+                    <if test="ew.entity.resolveSendUserGroup!=null"> AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup}</if>
                     <if test="ew.entity.closedUser!=null"> AND CLOSED_USER=#{ew.entity.closedUser}</if>
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
@@ -325,7 +338,7 @@
                     <if test="ew.entity.routerBo!=null"> AND ROUTER_BO=#{ew.entity.routerBo}</if>
                     <if test="ew.entity.resolveShopOrder!=null"> AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder}</if>
                     <if test="ew.entity.resolveRemark!=null"> AND RESOLVE_REMARK=#{ew.entity.resolveRemark}</if>
-                    <if test="ew.entity.resolveSendUser!=null"> AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser}</if>
+                    <if test="ew.entity.resolveSendUserGroup!=null"> AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup}</if>
                     <if test="ew.entity.closedUser!=null"> AND CLOSED_USER=#{ew.entity.closedUser}</if>
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
@@ -369,7 +382,7 @@
                     <if test="ew.entity.routerBo!=null"> AND ROUTER_BO=#{ew.entity.routerBo}</if>
                     <if test="ew.entity.resolveShopOrder!=null"> AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder}</if>
                     <if test="ew.entity.resolveRemark!=null"> AND RESOLVE_REMARK=#{ew.entity.resolveRemark}</if>
-                    <if test="ew.entity.resolveSendUser!=null"> AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser}</if>
+                    <if test="ew.entity.resolveSendUserGroup!=null"> AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup}</if>
                     <if test="ew.entity.closedUser!=null"> AND CLOSED_USER=#{ew.entity.closedUser}</if>
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
@@ -409,7 +422,7 @@
             <if test="routerBo!=null">ROUTER_BO,</if>
             <if test="resolveShopOrder!=null">RESOLVE_SHOP_ORDER,</if>
             <if test="resolveRemark!=null">RESOLVE_REMARK,</if>
-            <if test="resolveSendUser!=null">RESOLVE_SEND_USER,</if>
+            <if test="resolveSendUserGroup!=null">RESOLVE_SEND_USER_GROUP,</if>
             <if test="closedUser!=null">CLOSED_USER,</if>
             <if test="closedDateTime!=null">CLOSED_DATE_TIME,</if>
             <if test="abnormalReason!=null">ABNORMAL_REASON,</if>
@@ -437,7 +450,7 @@
             <if test="routerBo!=null">#{routerBo},</if>
             <if test="resolveShopOrder!=null">#{resolveShopOrder},</if>
             <if test="resolveRemark!=null">#{resolveRemark},</if>
-            <if test="resolveSendUser!=null">#{resolveSendUser},</if>
+            <if test="resolveSendUserGroup!=null">#{resolveSendUserGroup},</if>
             <if test="closedUser!=null">#{closedUser},</if>
             <if test="closedDateTime!=null">#{closedDateTime},</if>
             <if test="abnormalReason!=null">#{abnormalReason},</if>
@@ -472,7 +485,7 @@
             #{routerBo},
             #{resolveShopOrder},
             #{resolveRemark},
-            #{resolveSendUser},
+            #{resolveSendUserGroup},
             #{closedUser},
             #{closedDateTime},
             #{abnormalReason},
@@ -485,13 +498,70 @@
     </insert>
 
 
+    <update id="updateById">
+        UPDATE Z_ABNORMAL_BILL_DISPOSE <trim prefix="SET" suffixOverrides=",">
+        <if test="et.site!=null">SITE=#{et.site},</if>
+        <if test="et.abnormalBillBo!=null">ABNORMAL_BILL_BO=#{et.abnormalBillBo},</if>
+        <if test="et.dutyUser!=null">DUTY_USER=#{et.dutyUser},</if>
+        <if test="et.dutyDateTime!=null">DUTY_DATE_TIME=#{et.dutyDateTime},</if>
+        <if test="et.dutyDepart!=null">DUTY_DEPART=#{et.dutyDepart},</if>
+        <if test="et.dutyType!=null">DUTY_TYPE=#{et.dutyType},</if>
+        <if test="et.principalUser!=null">PRINCIPAL_USER=#{et.principalUser},</if>
+        <if test="et.dutyCauseDescription!=null">DUTY_CAUSE_DESCRIPTION=#{et.dutyCauseDescription},</if>
+        <if test="et.dutyCauseType!=null">DUTY_CAUSE_TYPE=#{et.dutyCauseType},</if>
+        <if test="et.dutySendUserGroup!=null">DUTY_SEND_USER_GROUP=#{et.dutySendUserGroup},</if>
+        <if test="et.resolveUser!=null">RESOLVE_USER=#{et.resolveUser},</if>
+        <if test="et.resolveDateTime!=null">RESOLVE_DATE_TIME=#{et.resolveDateTime},</if>
+        <if test="et.abnormalMethod!=null">ABNORMAL_METHOD=#{et.abnormalMethod},</if>
+        <if test="et.routerBo!=null">ROUTER_BO=#{et.routerBo},</if>
+        <if test="et.resolveShopOrder!=null">RESOLVE_SHOP_ORDER=#{et.resolveShopOrder},</if>
+        <if test="et.resolveRemark!=null">RESOLVE_REMARK=#{et.resolveRemark},</if>
+        <if test="et.resolveSendUserGroup!=null">RESOLVE_SEND_USER_GROUP=#{et.resolveSendUserGroup},</if>
+        <if test="et.closedUser!=null">CLOSED_USER=#{et.closedUser},</if>
+        <if test="et.closedDateTime!=null">CLOSED_DATE_TIME=#{et.closedDateTime},</if>
+        <if test="et.abnormalReason!=null">ABNORMAL_REASON=#{et.abnormalReason},</if>
+        <if test="et.beforeMeasure!=null">BEFORE_MEASURE=#{et.beforeMeasure},</if>
+        <if test="et.createdUser!=null">CREATED_USER=#{et.createdUser},</if>
+        <if test="et.createdDataTime!=null">CREATED_DATA_TIME=#{et.createdDataTime},</if>
+        <if test="et.modifiedUser!=null">MODIFIED_USER=#{et.modifiedUser},</if>
+        <if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
+        </trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
+    </update>
 
 
+    <update id="updateAllColumnById">
+        UPDATE Z_ABNORMAL_BILL_DISPOSE <trim prefix="SET" suffixOverrides=",">
+        SITE=#{et.site},
+        ABNORMAL_BILL_BO=#{et.abnormalBillBo},
+        DUTY_USER=#{et.dutyUser},
+        DUTY_DATE_TIME=#{et.dutyDateTime},
+        DUTY_DEPART=#{et.dutyDepart},
+        DUTY_TYPE=#{et.dutyType},
+        PRINCIPAL_USER=#{et.principalUser},
+        DUTY_CAUSE_DESCRIPTION=#{et.dutyCauseDescription},
+        DUTY_CAUSE_TYPE=#{et.dutyCauseType},
+        DUTY_SEND_USER_GROUP=#{et.dutySendUserGroup},
+        RESOLVE_USER=#{et.resolveUser},
+        RESOLVE_DATE_TIME=#{et.resolveDateTime},
+        ABNORMAL_METHOD=#{et.abnormalMethod},
+        ROUTER_BO=#{et.routerBo},
+        RESOLVE_SHOP_ORDER=#{et.resolveShopOrder},
+        RESOLVE_REMARK=#{et.resolveRemark},
+        RESOLVE_SEND_USER_GROUP=#{et.resolveSendUserGroup},
+        CLOSED_USER=#{et.closedUser},
+        CLOSED_DATE_TIME=#{et.closedDateTime},
+        ABNORMAL_REASON=#{et.abnormalReason},
+        BEFORE_MEASURE=#{et.beforeMeasure},
+        CREATED_USER=#{et.createdUser},
+        CREATED_DATA_TIME=#{et.createdDataTime},
+        MODIFIED_USER=#{et.modifiedUser},
+        MODIFIED_DATE_TIME=#{et.modifiedDateTime},
+     </trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
+    </update>
 
 
     <update id="update">
         UPDATE Z_ABNORMAL_BILL_DISPOSE <trim prefix="SET" suffixOverrides=",">
-        <if test="et.handle!=null">HANDLE=#{et.handle},</if>
         <if test="et.site!=null">SITE=#{et.site},</if>
         <if test="et.abnormalBillBo!=null">ABNORMAL_BILL_BO=#{et.abnormalBillBo},</if>
         <if test="et.dutyUser!=null">DUTY_USER=#{et.dutyUser},</if>
@@ -508,7 +578,7 @@
         <if test="et.routerBo!=null">ROUTER_BO=#{et.routerBo},</if>
         <if test="et.resolveShopOrder!=null">RESOLVE_SHOP_ORDER=#{et.resolveShopOrder},</if>
         <if test="et.resolveRemark!=null">RESOLVE_REMARK=#{et.resolveRemark},</if>
-        <if test="et.resolveSendUser!=null">RESOLVE_SEND_USER=#{et.resolveSendUser},</if>
+        <if test="et.resolveSendUserGroup!=null">RESOLVE_SEND_USER_GROUP=#{et.resolveSendUserGroup},</if>
         <if test="et.closedUser!=null">CLOSED_USER=#{et.closedUser},</if>
         <if test="et.closedDateTime!=null">CLOSED_DATE_TIME=#{et.closedDateTime},</if>
         <if test="et.abnormalReason!=null">ABNORMAL_REASON=#{et.abnormalReason},</if>
@@ -538,7 +608,7 @@
                     <if test="ew.entity.routerBo!=null"> AND ROUTER_BO=#{ew.entity.routerBo}</if>
                     <if test="ew.entity.resolveShopOrder!=null"> AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder}</if>
                     <if test="ew.entity.resolveRemark!=null"> AND RESOLVE_REMARK=#{ew.entity.resolveRemark}</if>
-                    <if test="ew.entity.resolveSendUser!=null"> AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser}</if>
+                    <if test="ew.entity.resolveSendUserGroup!=null"> AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup}</if>
                     <if test="ew.entity.closedUser!=null"> AND CLOSED_USER=#{ew.entity.closedUser}</if>
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
@@ -558,6 +628,9 @@
         </if>
     </update>
 
+    <delete id="deleteById">
+        DELETE FROM Z_ABNORMAL_BILL_DISPOSE WHERE HANDLE=#{handle}
+    </delete>
 
     <delete id="deleteByMap">
         DELETE FROM Z_ABNORMAL_BILL_DISPOSE
@@ -596,7 +669,7 @@
                     <if test="ew.entity.routerBo!=null"> AND ROUTER_BO=#{ew.entity.routerBo}</if>
                     <if test="ew.entity.resolveShopOrder!=null"> AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder}</if>
                     <if test="ew.entity.resolveRemark!=null"> AND RESOLVE_REMARK=#{ew.entity.resolveRemark}</if>
-                    <if test="ew.entity.resolveSendUser!=null"> AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser}</if>
+                    <if test="ew.entity.resolveSendUserGroup!=null"> AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup}</if>
                     <if test="ew.entity.closedUser!=null"> AND CLOSED_USER=#{ew.entity.closedUser}</if>
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
@@ -616,34 +689,42 @@
         </if>
     </delete>
 
+    <delete id="deleteBatchIds">
+        DELETE FROM Z_ABNORMAL_BILL_DISPOSE WHERE HANDLE IN (
+        <foreach item="item" index="index" collection="coll" separator=",">#{item}
+        </foreach>)
+    </delete>
     <!-- BaseMapper标准查询/修改/删除 -->
+
+
     <select id="findAllByAbnormalNo" resultMap="AbnormalBillDisposeDto">
         SELECT ZAB.ABNORMAL_NO ABNORMAL_NO ,ZAB.STATUS STATUS,I.ITEM ITEM,IT.DESCRIPTION ITEM_DESCRIPTION,
-               ZAB."TYPE" "TYPE" ,ZAB.SFC SFC,ZAB.MESSAGE_TYPE MESSAGE_TYPE,ZAB.SHOP_ORDER SHOP_ORDER,
-               ZAB.WORK_CENTER WORK_CENTER,ZAB.RESRCE RESRCE, WORKORDER.VALUE WORK_ORDER,ITEMNUMBER.VALUE ITEM_NUMBER,
-               PRODUCTCATEGORY.VALUE PRODUCT_CATEGORY,listagg(NG.DESCRIPTION || '/'||NCT.DESCRIPTION || ',') within GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE_DESCRIPTION,
-               ZAB.PB_DESCRIPTION PB_DESCRIPTION ,ZAB.NC_QTY NC_QTY,
-	   ZAB.PB_GRADE PB_GRADE ,NWA.FULL_NAME PB_USER ,ZAB.PB_QTY PB_QTY ,ZAB.DISCOVER DISCOVER ,
-	   ZAB.INSPECTOR INSPECTOR ,ZAB.ENTITY_LOCATION ENTITY_LOCATION ,ZAB.REPORT_FROM REPORT_FROM ,SUBSTR(ZAB.OBJECT_BO,INSTR(ZAB.OBJECT_BO,',')+1) OBJECT_BO,
-	   ZAB.PB_PHOTOSHOP PB_PHOTOSHOP,ZABD.DUTY_CAUSE_DESCRIPTION DUTY_CAUSE_DESCRIPTION,ZABD.DUTY_CAUSE_TYPE DUTY_CAUSE_TYPE,ZABD.DUTY_DEPART DUTY_DEPART,
-	   ZABD.DUTY_SEND_USER_GROUP DUTY_SEND_USER_GROUP,ZABD.DUTY_TYPE DUTY_TYPE,ZABD.PRINCIPAL_USER PRINCIPAL_USER,ZABD.ABNORMAL_METHOD ABNORMAL_METHOD,
-	   R.ROUTER ROUTER,ZABD.RESOLVE_SHOP_ORDER RESOLVE_SHOP_ORDER,ZABD.RESOLVE_REMARK RESOLVE_REMARK,ZABD.RESOLVE_SEND_USER RESOLVE_SEND_USER,
-	   ZABD.ABNORMAL_REASON ABNORMAL_REASON,ZABD.BEFORE_MEASURE BEFORE_MEASURE,"MAP".VALUE "MAP",listagg(ZANC.NC_CODE_GROUP || '/'||ZANC.NC_CODE || ',') within GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE,
+        ZAB."TYPE" "TYPE" ,ZAB.SFC SFC,ZAB.MESSAGE_TYPE MESSAGE_TYPE,ZAB.SHOP_ORDER SHOP_ORDER,
+        ZAB.WORK_CENTER WORK_CENTER,ZAB.RESRCE RESRCE, WORKORDER.VALUE WORK_ORDER,ITEMNUMBER.VALUE ITEM_NUMBER,
+        PRODUCTCATEGORY.VALUE PRODUCT_CATEGORY,listagg(NG.DESCRIPTION || '/'||NCT.DESCRIPTION || ',') within GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE_DESCRIPTION,
+        ZAB.PB_DESCRIPTION PB_DESCRIPTION ,ZAB.NC_QTY NC_QTY,
+        ZAB.PB_GRADE PB_GRADE ,NWA.FULL_NAME PB_USER ,ZAB.PB_QTY PB_QTY ,ZAB.DISCOVER DISCOVER ,
+        NWA2.FULL_NAME INSPECTOR ,ZAB.ENTITY_LOCATION ENTITY_LOCATION ,ZAB.REPORT_FROM REPORT_FROM ,SUBSTR(ZAB.OBJECT_BO,INSTR(ZAB.OBJECT_BO,',')+1) OBJECT_BO,
+        ZAB.PB_PHOTOSHOP PB_PHOTOSHOP,ZABD.DUTY_CAUSE_DESCRIPTION DUTY_CAUSE_DESCRIPTION,ZABD.DUTY_CAUSE_TYPE DUTY_CAUSE_TYPE,ZABD.DUTY_DEPART DUTY_DEPART,
+        ZABD.DUTY_SEND_USER_GROUP DUTY_SEND_USER_GROUP,ZABD.DUTY_TYPE DUTY_TYPE,ZABD.PRINCIPAL_USER PRINCIPAL_USER,ZABD.ABNORMAL_METHOD ABNORMAL_METHOD,
+        R.ROUTER ROUTER,ZABD.RESOLVE_SHOP_ORDER RESOLVE_SHOP_ORDER,ZABD.RESOLVE_REMARK RESOLVE_REMARK,ZABD.RESOLVE_SEND_USER_GROUP RESOLVE_SEND_USER_GROUP,
+        ZABD.ABNORMAL_REASON ABNORMAL_REASON,ZABD.BEFORE_MEASURE BEFORE_MEASURE,"MAP".VALUE "MAP",listagg(ZANC.NC_CODE_GROUP || '/'||ZANC.NC_CODE || ',') within GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE,
         ZABD.ROUTER_BO ROUTER_BO,ZAB.OPERATION OPERATION,I.HANDLE ITEM_BO,ZAB.REPORT_SEND_USER_GROUP REPORT_SEND_USER_GROUP
         FROM Z_ABNORMAL_BILL ZAB
-            LEFT JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZAB.HANDLE = ZABD.ABNORMAL_BILL_BO
-            INNER JOIN ITEM I ON I.HANDLE = ZAB.ITEM_BO
-            LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE AND IT.LOCALE = #{locale}
-            INNER JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZAB.SHOP_ORDER AND SO.SITE = ZAB.SITE
-            LEFT JOIN CUSTOM_FIELDS WORKORDER ON WORKORDER.HANDLE = SO.HANDLE AND WORKORDER."ATTRIBUTE" = 'WORK_ORDER'
-            LEFT JOIN CUSTOM_FIELDS ITEMNUMBER ON ITEMNUMBER.HANDLE = SO.HANDLE AND ITEMNUMBER."ATTRIBUTE" = 'ITEM_NUMBER'
-            LEFT JOIN CUSTOM_FIELDS PRODUCTCATEGORY ON PRODUCTCATEGORY.HANDLE = SO.HANDLE AND PRODUCTCATEGORY."ATTRIBUTE" = 'PRODUCT_CATEGORY'
-            LEFT JOIN CUSTOM_FIELDS "MAP" ON "MAP".HANDLE = SO.HANDLE AND "MAP"."ATTRIBUTE" = 'MAP'
-            LEFT JOIN Z_ABNORMAL_NC_CODE ZANC ON ZAB.HANDLE = ZANC.ABNORMAL_BILL_BO
-            LEFT JOIN NC_CODE_T NCT ON ('NCCodeBO:' || ZAB.SITE || ',' || ZANC.NC_CODE) = NCT.NC_CODE_BO AND NCT.LOCALE = #{locale}
-            LEFT JOIN Z_NWA_USER NWA ON NWA.USER_NAME = ZAB.PB_USER AND NWA.SITE = ZAB.SITE
-            LEFT  JOIN NC_GROUP NG ON NG.NC_GROUP = ZANC.NC_CODE_GROUP AND NG.SITE = ZAB.SITE
-            LEFT JOIN ROUTER R ON SUBSTR(R.HANDLE,1,INSTR(R.HANDLE,',',-1)-1) = SUBSTR(ZABD.ROUTER_BO,1,INSTR(ZABD.ROUTER_BO,',',-1)-1) AND R.CURRENT_REVISION = 'true'
+        LEFT JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZAB.HANDLE = ZABD.ABNORMAL_BILL_BO
+        INNER JOIN ITEM I ON I.HANDLE = ZAB.ITEM_BO
+        LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE AND IT.LOCALE = #{locale}
+        INNER JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZAB.SHOP_ORDER AND SO.SITE = ZAB.SITE
+        LEFT JOIN CUSTOM_FIELDS WORKORDER ON WORKORDER.HANDLE = SO.HANDLE AND WORKORDER."ATTRIBUTE" = 'WORK_ORDER'
+        LEFT JOIN CUSTOM_FIELDS ITEMNUMBER ON ITEMNUMBER.HANDLE = SO.HANDLE AND ITEMNUMBER."ATTRIBUTE" = 'ITEM_NUMBER'
+        LEFT JOIN CUSTOM_FIELDS PRODUCTCATEGORY ON PRODUCTCATEGORY.HANDLE = SO.HANDLE AND PRODUCTCATEGORY."ATTRIBUTE" = 'PRODUCT_CATEGORY'
+        LEFT JOIN CUSTOM_FIELDS "MAP" ON "MAP".HANDLE = SO.HANDLE AND "MAP"."ATTRIBUTE" = 'MAP'
+        LEFT JOIN Z_ABNORMAL_NC_CODE ZANC ON ZAB.HANDLE = ZANC.ABNORMAL_BILL_BO
+        LEFT JOIN NC_CODE_T NCT ON ('NCCodeBO:' || ZAB.SITE || ',' || ZANC.NC_CODE) = NCT.NC_CODE_BO AND NCT.LOCALE = #{locale}
+        LEFT JOIN Z_NWA_USER NWA ON NWA.USER_NAME = ZAB.PB_USER AND NWA.SITE = ZAB.SITE
+        LEFT JOIN Z_NWA_USER NWA2 ON NWA2.USER_NAME = ZAB.INSPECTOR AND NWA2.SITE = ZAB.SITE
+        LEFT  JOIN NC_GROUP NG ON NG.NC_GROUP = ZANC.NC_CODE_GROUP AND NG.SITE = ZAB.SITE
+        LEFT JOIN ROUTER R ON SUBSTR(R.HANDLE,1,INSTR(R.HANDLE,',',-1)-1) = SUBSTR(ZABD.ROUTER_BO,1,INSTR(ZABD.ROUTER_BO,',',-1)-1) AND R.CURRENT_REVISION = 'true'
         <where>
             <if test="abnormalBill != null">
                 <if test="abnormalBill.site != null and abnormalBill.site != ''">
@@ -655,17 +736,17 @@
             </if>
         </where>
         GROUP BY
-            ZAB.ABNORMAL_NO  ,ZAB.STATUS ,I.ITEM ,IT.DESCRIPTION ,
-            ZAB."TYPE"  ,ZAB.SFC ,ZAB.MESSAGE_TYPE ,ZAB.SHOP_ORDER ,
-            ZAB.WORK_CENTER ,ZAB.RESRCE , WORKORDER.VALUE ,ITEMNUMBER.VALUE ,
-            PRODUCTCATEGORY.VALUE, ZAB.PB_DESCRIPTION  ,ZAB.NC_QTY ,
-            ZAB.PB_GRADE  ,NWA.FULL_NAME  ,ZAB.PB_QTY  ,ZAB.DISCOVER  ,
-            ZAB.INSPECTOR  ,ZAB.ENTITY_LOCATION  ,ZAB.REPORT_FROM  ,SUBSTR(ZAB.OBJECT_BO,INSTR(ZAB.OBJECT_BO,',')+1),
-            ZAB.PB_PHOTOSHOP ,ZABD.DUTY_CAUSE_DESCRIPTION ,ZABD.DUTY_CAUSE_TYPE ,ZABD.DUTY_DEPART ,
-            ZABD.DUTY_SEND_USER_GROUP ,ZABD.DUTY_TYPE ,ZABD.PRINCIPAL_USER ,ZABD.ABNORMAL_METHOD ,
-            R.ROUTER ,ZABD.RESOLVE_SHOP_ORDER ,ZABD.RESOLVE_REMARK ,ZABD.RESOLVE_SEND_USER ,
-            ZABD.ABNORMAL_REASON ,ZABD.BEFORE_MEASURE ,"MAP".VALUE,ZABD.ROUTER_BO,ZAB.OPERATION,I.HANDLE,
-            ZAB.REPORT_SEND_USER_GROUP
+        ZAB.ABNORMAL_NO  ,ZAB.STATUS ,I.ITEM ,IT.DESCRIPTION ,
+        ZAB."TYPE"  ,ZAB.SFC ,ZAB.MESSAGE_TYPE ,ZAB.SHOP_ORDER ,
+        ZAB.WORK_CENTER ,ZAB.RESRCE , WORKORDER.VALUE ,ITEMNUMBER.VALUE ,
+        PRODUCTCATEGORY.VALUE, ZAB.PB_DESCRIPTION  ,ZAB.NC_QTY ,
+        ZAB.PB_GRADE  ,NWA.FULL_NAME  ,ZAB.PB_QTY  ,ZAB.DISCOVER  ,
+        NWA2.FULL_NAME  ,ZAB.ENTITY_LOCATION  ,ZAB.REPORT_FROM  ,SUBSTR(ZAB.OBJECT_BO,INSTR(ZAB.OBJECT_BO,',')+1),
+        ZAB.PB_PHOTOSHOP ,ZABD.DUTY_CAUSE_DESCRIPTION ,ZABD.DUTY_CAUSE_TYPE ,ZABD.DUTY_DEPART ,
+        ZABD.DUTY_SEND_USER_GROUP ,ZABD.DUTY_TYPE ,ZABD.PRINCIPAL_USER ,ZABD.ABNORMAL_METHOD ,
+        R.ROUTER ,ZABD.RESOLVE_SHOP_ORDER ,ZABD.RESOLVE_REMARK ,ZABD.RESOLVE_SEND_USER_GROUP ,
+        ZABD.ABNORMAL_REASON ,ZABD.BEFORE_MEASURE ,"MAP".VALUE,ZABD.ROUTER_BO,ZAB.OPERATION,I.HANDLE,
+        ZAB.REPORT_SEND_USER_GROUP
     </select>
 
 
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml
index e0fe68f7..28ec07f0 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml
@@ -51,7 +51,7 @@
         <result column="ROUTER_BO" property="routerBo" />
         <result column="RESOLVE_SHOP_ORDER" property="resolveShopOrder" />
         <result column="RESOLVE_REMARK" property="resolveRemark" />
-        <result column="RESOLVE_SEND_USER" property="resolveSendUser" />
+        <result column="RESOLVE_SEND_USER_GROUP" property="resolveSendUserGroup" />
         <result column="CLOSED_USER" property="closedUser" />
         <result column="CLOSED_DATE_TIME" property="closedDateTime" />
         <result column="ABNORMAL_REASON" property="abnormalReason" />
@@ -66,7 +66,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        HANDLE, SITE, ABNORMAL_NO, STATUS, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, NC_CODE_GROUP, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, DUTY_USER, DUTY_DATE_TIME, DUTY_DEPART, PRINCIPAL_USER, DUTY_CAUSE_DESCRIPTION, DUTY_CAUSE_TYPE, DUTY_TYPE, DUTY_SEND_USER_GROUP, RESOLVE_USER, RESOLVE_DATE_TIME, ABNORMAL_METHOD, ROUTER_BO, RESOLVE_SHOP_ORDER, RESOLVE_REMARK, RESOLVE_SEND_USER, CLOSED_USER, CLOSED_DATE_TIME, ABNORMAL_REASON, BEFORE_MEASURE, REPORT_SEND_USER_GROUP, CANCEL_SEND_USER_GROUP, CREATED_USER, CREATED_DATA_TIME, MODIFIED_USER, MODIFIED_DATE_TIME
+        HANDLE, SITE, ABNORMAL_NO, STATUS, TYPE, ITEM_BO, SFC, OPERATION, WORK_CENTER, SHOP_ORDER, MESSAGE_TYPE, RESRCE, NC_CODE, NC_CODE_GROUP, SHUT_DOWN, RESPONSE_USER, RESPONSE_DATE_TIME, PB_DESCRIPTION, NC_QTY, PB_GRADE, PB_USER, PB_QTY, REPAIR_DATE_TIME, DISCOVER, INSPECTOR, ENTITY_LOCATION, REPORT_FROM, OBJECT_BO, PB_PHOTOSHOP, CANCEL_CODE, CANCEL_REASON, CANCEL_DATE_TIME, CANCEL_USER, DUTY_USER, DUTY_DATE_TIME, DUTY_DEPART, PRINCIPAL_USER, DUTY_CAUSE_DESCRIPTION, DUTY_CAUSE_TYPE, DUTY_TYPE, DUTY_SEND_USER_GROUP, RESOLVE_USER, RESOLVE_DATE_TIME, ABNORMAL_METHOD, ROUTER_BO, RESOLVE_SHOP_ORDER, RESOLVE_REMARK, RESOLVE_SEND_USER_GROUP, CLOSED_USER, CLOSED_DATE_TIME, ABNORMAL_REASON, BEFORE_MEASURE, REPORT_SEND_USER_GROUP, CANCEL_SEND_USER_GROUP, CREATED_USER, CREATED_DATA_TIME, MODIFIED_USER, MODIFIED_DATE_TIME
     </sql>
 
     <!-- BaseMapper标准查询/修改/删除 -->
@@ -147,7 +147,7 @@
             <if test="ew.entity.routerBo!=null"> AND ROUTER_BO=#{ew.entity.routerBo}</if>
             <if test="ew.entity.resolveShopOrder!=null"> AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder}</if>
             <if test="ew.entity.resolveRemark!=null"> AND RESOLVE_REMARK=#{ew.entity.resolveRemark}</if>
-            <if test="ew.entity.resolveSendUser!=null"> AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser}</if>
+            <if test="ew.entity.resolveSendUserGroup!=null"> AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup}</if>
             <if test="ew.entity.closedUser!=null"> AND CLOSED_USER=#{ew.entity.closedUser}</if>
             <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
             <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
@@ -215,7 +215,7 @@
                 <if test="ew.entity.routerBo!=null"> AND ROUTER_BO=#{ew.entity.routerBo}</if>
                 <if test="ew.entity.resolveShopOrder!=null"> AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder}</if>
                 <if test="ew.entity.resolveRemark!=null"> AND RESOLVE_REMARK=#{ew.entity.resolveRemark}</if>
-                <if test="ew.entity.resolveSendUser!=null"> AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser}</if>
+                <if test="ew.entity.resolveSendUserGroup!=null"> AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup}</if>
                 <if test="ew.entity.closedUser!=null"> AND CLOSED_USER=#{ew.entity.closedUser}</if>
                 <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                 <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
@@ -291,7 +291,7 @@
                     <if test="ew.entity.routerBo!=null"> AND ROUTER_BO=#{ew.entity.routerBo}</if>
                     <if test="ew.entity.resolveShopOrder!=null"> AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder}</if>
                     <if test="ew.entity.resolveRemark!=null"> AND RESOLVE_REMARK=#{ew.entity.resolveRemark}</if>
-                    <if test="ew.entity.resolveSendUser!=null"> AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser}</if>
+                    <if test="ew.entity.resolveSendUserGroup!=null"> AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup}</if>
                     <if test="ew.entity.closedUser!=null"> AND CLOSED_USER=#{ew.entity.closedUser}</if>
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
@@ -367,7 +367,7 @@
                     <if test="ew.entity.routerBo!=null"> AND ROUTER_BO=#{ew.entity.routerBo}</if>
                     <if test="ew.entity.resolveShopOrder!=null"> AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder}</if>
                     <if test="ew.entity.resolveRemark!=null"> AND RESOLVE_REMARK=#{ew.entity.resolveRemark}</if>
-                    <if test="ew.entity.resolveSendUser!=null"> AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser}</if>
+                    <if test="ew.entity.resolveSendUserGroup!=null"> AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup}</if>
                     <if test="ew.entity.closedUser!=null"> AND CLOSED_USER=#{ew.entity.closedUser}</if>
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
@@ -443,7 +443,7 @@
                     <if test="ew.entity.routerBo!=null"> AND ROUTER_BO=#{ew.entity.routerBo}</if>
                     <if test="ew.entity.resolveShopOrder!=null"> AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder}</if>
                     <if test="ew.entity.resolveRemark!=null"> AND RESOLVE_REMARK=#{ew.entity.resolveRemark}</if>
-                    <if test="ew.entity.resolveSendUser!=null"> AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser}</if>
+                    <if test="ew.entity.resolveSendUserGroup!=null"> AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup}</if>
                     <if test="ew.entity.closedUser!=null"> AND CLOSED_USER=#{ew.entity.closedUser}</if>
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
@@ -519,7 +519,7 @@
                     <if test="ew.entity.routerBo!=null"> AND ROUTER_BO=#{ew.entity.routerBo}</if>
                     <if test="ew.entity.resolveShopOrder!=null"> AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder}</if>
                     <if test="ew.entity.resolveRemark!=null"> AND RESOLVE_REMARK=#{ew.entity.resolveRemark}</if>
-                    <if test="ew.entity.resolveSendUser!=null"> AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser}</if>
+                    <if test="ew.entity.resolveSendUserGroup!=null"> AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup}</if>
                     <if test="ew.entity.closedUser!=null"> AND CLOSED_USER=#{ew.entity.closedUser}</if>
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
@@ -595,7 +595,7 @@
                     <if test="ew.entity.routerBo!=null"> AND ROUTER_BO=#{ew.entity.routerBo}</if>
                     <if test="ew.entity.resolveShopOrder!=null"> AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder}</if>
                     <if test="ew.entity.resolveRemark!=null"> AND RESOLVE_REMARK=#{ew.entity.resolveRemark}</if>
-                    <if test="ew.entity.resolveSendUser!=null"> AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser}</if>
+                    <if test="ew.entity.resolveSendUserGroup!=null"> AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup}</if>
                     <if test="ew.entity.closedUser!=null"> AND CLOSED_USER=#{ew.entity.closedUser}</if>
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
@@ -667,7 +667,7 @@
             <if test="routerBo!=null">ROUTER_BO,</if>
             <if test="resolveShopOrder!=null">RESOLVE_SHOP_ORDER,</if>
             <if test="resolveRemark!=null">RESOLVE_REMARK,</if>
-            <if test="resolveSendUser!=null">RESOLVE_SEND_USER,</if>
+            <if test="resolveSendUserGroup!=null">RESOLVE_SEND_USER_GROUP,</if>
             <if test="closedUser!=null">CLOSED_USER,</if>
             <if test="closedDateTime!=null">CLOSED_DATE_TIME,</if>
             <if test="abnormalReason!=null">ABNORMAL_REASON,</if>
@@ -727,7 +727,7 @@
             <if test="routerBo!=null">#{routerBo},</if>
             <if test="resolveShopOrder!=null">#{resolveShopOrder},</if>
             <if test="resolveRemark!=null">#{resolveRemark},</if>
-            <if test="resolveSendUser!=null">#{resolveSendUser},</if>
+            <if test="resolveSendUserGroup!=null">#{resolveSendUserGroup},</if>
             <if test="closedUser!=null">#{closedUser},</if>
             <if test="closedDateTime!=null">#{closedDateTime},</if>
             <if test="abnormalReason!=null">#{abnormalReason},</if>
@@ -794,7 +794,7 @@
             #{routerBo},
             #{resolveShopOrder},
             #{resolveRemark},
-            #{resolveSendUser},
+            #{resolveSendUserGroup},
             #{closedUser},
             #{closedDateTime},
             #{abnormalReason},
@@ -857,7 +857,7 @@
         <if test="et.routerBo!=null">ROUTER_BO=#{et.routerBo},</if>
         <if test="et.resolveShopOrder!=null">RESOLVE_SHOP_ORDER=#{et.resolveShopOrder},</if>
         <if test="et.resolveRemark!=null">RESOLVE_REMARK=#{et.resolveRemark},</if>
-        <if test="et.resolveSendUser!=null">RESOLVE_SEND_USER=#{et.resolveSendUser},</if>
+        <if test="et.resolveSendUserGroup!=null">RESOLVE_SEND_USER_GROUP=#{et.resolveSendUserGroup},</if>
         <if test="et.closedUser!=null">CLOSED_USER=#{et.closedUser},</if>
         <if test="et.closedDateTime!=null">CLOSED_DATE_TIME=#{et.closedDateTime},</if>
         <if test="et.abnormalReason!=null">ABNORMAL_REASON=#{et.abnormalReason},</if>
@@ -920,7 +920,7 @@
         ROUTER_BO=#{et.routerBo},
         RESOLVE_SHOP_ORDER=#{et.resolveShopOrder},
         RESOLVE_REMARK=#{et.resolveRemark},
-        RESOLVE_SEND_USER=#{et.resolveSendUser},
+        RESOLVE_SEND_USER_GROUP=#{et.resolveSendUserGroup},
         CLOSED_USER=#{et.closedUser},
         CLOSED_DATE_TIME=#{et.closedDateTime},
         ABNORMAL_REASON=#{et.abnormalReason},
@@ -983,7 +983,7 @@
         <if test="et.routerBo!=null">ROUTER_BO=#{et.routerBo},</if>
         <if test="et.resolveShopOrder!=null">RESOLVE_SHOP_ORDER=#{et.resolveShopOrder},</if>
         <if test="et.resolveRemark!=null">RESOLVE_REMARK=#{et.resolveRemark},</if>
-        <if test="et.resolveSendUser!=null">RESOLVE_SEND_USER=#{et.resolveSendUser},</if>
+        <if test="et.resolveSendUserGroup!=null">RESOLVE_SEND_USER_GROUP=#{et.resolveSendUserGroup},</if>
         <if test="et.closedUser!=null">CLOSED_USER=#{et.closedUser},</if>
         <if test="et.closedDateTime!=null">CLOSED_DATE_TIME=#{et.closedDateTime},</if>
         <if test="et.abnormalReason!=null">ABNORMAL_REASON=#{et.abnormalReason},</if>
@@ -1045,7 +1045,7 @@
                     <if test="ew.entity.routerBo!=null"> AND ROUTER_BO=#{ew.entity.routerBo}</if>
                     <if test="ew.entity.resolveShopOrder!=null"> AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder}</if>
                     <if test="ew.entity.resolveRemark!=null"> AND RESOLVE_REMARK=#{ew.entity.resolveRemark}</if>
-                    <if test="ew.entity.resolveSendUser!=null"> AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser}</if>
+                    <if test="ew.entity.resolveSendUserGroup!=null"> AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup}</if>
                     <if test="ew.entity.closedUser!=null"> AND CLOSED_USER=#{ew.entity.closedUser}</if>
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
@@ -1138,7 +1138,7 @@
                     <if test="ew.entity.routerBo!=null"> AND ROUTER_BO=#{ew.entity.routerBo}</if>
                     <if test="ew.entity.resolveShopOrder!=null"> AND RESOLVE_SHOP_ORDER=#{ew.entity.resolveShopOrder}</if>
                     <if test="ew.entity.resolveRemark!=null"> AND RESOLVE_REMARK=#{ew.entity.resolveRemark}</if>
-                    <if test="ew.entity.resolveSendUser!=null"> AND RESOLVE_SEND_USER=#{ew.entity.resolveSendUser}</if>
+                    <if test="ew.entity.resolveSendUserGroup!=null"> AND RESOLVE_SEND_USER_GROUP=#{ew.entity.resolveSendUserGroup}</if>
                     <if test="ew.entity.closedUser!=null"> AND CLOSED_USER=#{ew.entity.closedUser}</if>
                     <if test="ew.entity.closedDateTime!=null"> AND CLOSED_DATE_TIME=#{ew.entity.closedDateTime}</if>
                     <if test="ew.entity.abnormalReason!=null"> AND ABNORMAL_REASON=#{ew.entity.abnormalReason}</if>
@@ -1167,7 +1167,6 @@
     </delete>
     <!-- BaseMapper标准查询/修改/删除 -->
 
-
     <select id="findAllByAbnormalNo" resultMap="BaseResultMap">
         SELECT zab.HANDLE HANDLE ,zab.SITE SITE ,zab.ABNORMAL_NO ABNORMAL_NO ,zab.STATUS STATUS ,
         zab."TYPE" "TYPE" ,zab.ITEM_BO ITEM_BO ,zab.SFC SFC ,zab.OPERATION OPERATION ,
@@ -1182,9 +1181,9 @@
         zabd.DUTY_CAUSE_TYPE DUTY_CAUSE_TYPE,zabd.DUTY_TYPE DUTY_TYPE,zabd.DUTY_SEND_USER_GROUP DUTY_SEND_USER_GROUP,
         zabd.RESOLVE_USER  RESOLVE_USER,zabd.RESOLVE_DATE_TIME RESOLVE_DATE_TIME,zabd.ABNORMAL_METHOD ABNORMAL_METHOD,
         zabd.ROUTER_BO ROUTER_BO,zabd.RESOLVE_SHOP_ORDER RESOLVE_SHOP_ORDER,zabd.RESOLVE_REMARK RESOLVE_REMARK,
-        zabd.RESOLVE_SEND_USER RESOLVE_SEND_USER,zabd.CLOSED_USER CLOSED_USER,zabd.CLOSED_DATE_TIME CLOSED_DATE_TIME,
+        zabd.RESOLVE_SEND_USER_GROUP RESOLVE_SEND_USER_GROUP,zabd.CLOSED_USER CLOSED_USER,zabd.CLOSED_DATE_TIME CLOSED_DATE_TIME,
         zabd.ABNORMAL_REASON ABNORMAL_REASON,zabd.BEFORE_MEASURE BEFORE_MEASURE,zab.REPORT_SEND_USER_GROUP REPORT_SEND_USER_GROUP,
-               zab.CANCEL_SEND_USER_GROUP CANCEL_SEND_USER_GROUP
+        zab.CANCEL_SEND_USER_GROUP CANCEL_SEND_USER_GROUP
         FROM Z_ABNORMAL_BILL zab
         INNER JOIN Z_ABNORMAL_BILL_DISPOSE zabd ON zab.HANDLE = zabd.ABNORMAL_BILL_BO
         <where>
@@ -1199,5 +1198,4 @@
         </where>
     </select>
 
-
 </mapper>
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
index 24f60e19..ed19ce64 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
@@ -987,7 +987,7 @@
         SELECT   S.SFC SFC,
         S2.STATUS STATUS,
         SUBSTR(SS.OPERATION_BO ,INSTR(SS.OPERATION_BO ,',',1)+1,(INSTR(SS.OPERATION_BO ,'#',1)-1)-(INSTR(SS.OPERATION_BO ,',',1)+1)) || '/' || SS.STEP_ID OPERATION,
-        ZSD.RESRCE RESRCE,ZSD.SHOP_ORDER SHOP_ORDER,
+        ZSD2.RESRCE RESRCE,ZSD.SHOP_ORDER SHOP_ORDER,
         CASE WHEN I.ITEM != 'NULL'  THEN I.ITEM || '/' || I.REVISION END ITEM,
         CASE WHEN R.ROUTER != 'NULL'  THEN R.ROUTER || '/' || R.REVISION END ROUTER ,
         CASE WHEN B.BOM != 'NULL'  THEN B.BOM || '/' || B.REVISION END BOM,
@@ -1001,6 +1001,8 @@
         INNER JOIN SFC_STEP SS ON SS.SFC_ROUTER_BO = ST.HANDLE AND (SS.QTY_IN_QUEUE > 0 OR SS.QTY_IN_WORK > 0)
         INNER JOIN STATUS S2 ON S2.HANDLE = S.STATUS_BO
         INNER  JOIN Z_SFC_DISPATCH ZSD ON ZSD.DISPATCH_NO = S.SFC || '-' || SS.STEP_ID
+        LEFT JOIN Z_SFC_DISPATCH ZSD2 ON ZSD2.DISPATCH_NO = S.SFC || '-' || SS.STEP_ID
+                    AND ZSD2.DISPATCH_STATUS IN ('START','COMPLETE')
         LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZSD.SHOP_ORDER AND SO.SITE = S.SITE
         LEFT JOIN ITEM I ON I.HANDLE = SO.PLANNED_ITEM_BO
         LEFT JOIN ROUTER R ON R.HANDLE  = ZSD.ROUTER_BO
diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SfcScrapServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SfcScrapServiceImpl.java
index 619c4874..d0124891 100644
--- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SfcScrapServiceImpl.java
+++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SfcScrapServiceImpl.java
@@ -223,7 +223,7 @@ public class SfcScrapServiceImpl extends ServiceImpl<SfcScrapMapper, SfcScrap> i
         }
         wordMap.put("GF",(wordMap.get("TYPE").contains("GF"))? "✔": " ");
         wordMap.put("LF",(wordMap.get("TYPE").contains("LF"))? "✔": " ");
-        wordMap.put("OT",(wordMap.get("TYPE").contains("QT"))? "✔": " ");
+        wordMap.put("OT",(wordMap.get("TYPE").contains("OT"))? "✔": " ");
         wordMap.put("OPINION","报废");
         wordMap.put("YEAR",year + "");
         wordMap.put("MONTH",month + "");
diff --git a/production/src/main/resources/mapper/SfcScrapMapper.xml b/production/src/main/resources/mapper/SfcScrapMapper.xml
index dd00b909..e9c541bb 100644
--- a/production/src/main/resources/mapper/SfcScrapMapper.xml
+++ b/production/src/main/resources/mapper/SfcScrapMapper.xml
@@ -431,7 +431,7 @@
     </delete>
     <!-- BaseMapper标准查询/修改/删除 -->
     <select id="generatorWord" resultType="hashmap">
-        SELECT DISTINCT NVL(WC.WORK_CENTER,' ') WORK_CENTER,NVL(WO.VALUE,' ') WORK_ORDER,NVL(WO2.VALUE,' ')  DWG_NO,NVL(ZSS.QTY,0) QTY,NVL(ZSS.OPERATION,' ') OPERATION,
+        SELECT DISTINCT NVL(WCT.DESCRIPTION,' ') WORK_CENTER,NVL(WO.VALUE,' ') WORK_ORDER,NVL(WO2.VALUE,' ')  DWG_NO,NVL(ZSS.QTY,0) QTY,NVL(ZSS.OPERATION,' ') OPERATION,
                         NVL(ZSS.REASON,' ') REASON,NVL(ZSS."TYPE",' ') "TYPE",
                         CASE WHEN I1.VALUE != NULL THEN NVL(I1.VALUE * I.QTY_MULTIPLIER,0)
                 WHEN I2.VALUE != NULL THEN NVL(I2.VALUE * I.QTY_MULTIPLIER,0)
@@ -440,6 +440,7 @@
         FROM
         SHOP_ORDER SO
         LEFT JOIN WORK_CENTER WC ON SO.PLANNED_WORK_CENTER_BO = WC.HANDLE
+        LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = 'zh'
         LEFT JOIN CUSTOM_FIELDS WO ON WO.HANDLE = SO.HANDLE AND WO."ATTRIBUTE" = 'WORK_ORDER'
         LEFT JOIN CUSTOM_FIELDS WO2 ON WO2.HANDLE = SO.PLANNED_ITEM_BO AND WO2."ATTRIBUTE" = 'DWG_NO'
         INNER JOIN SFC S ON S.SFC = #{sfc} AND S.SITE = #{site}