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 7721b6bf..e83c38b7 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
@@ -16,7 +16,7 @@ import java.util.List;
 /**
  *
  * @author zjw
- * @since 2021-08-12
+ * @since 2021-09-15
  */
 @RestController
 @RequestMapping("/Z-ABNORMAL-BILL-LOG")
@@ -117,6 +117,10 @@ public class AbnormalBillLogController {
                 .or().like(AbnormalBillLog::getCancelSendUserGroup, frontPage.getGlobalQuery())
                 .or().like(AbnormalBillLog::getCreatedUser, frontPage.getGlobalQuery())
                 .or().like(AbnormalBillLog::getModifiedUser, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillLog::getProductCategory, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillLog::getStepId, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillLog::getWorkOrder, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillLog::getItemNumber, frontPage.getGlobalQuery())
     );
         }
         result = abnormalBillLogService.page(frontPage.getPagePlus(), queryWrapper);
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 65273f8b..e65f93f6 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
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
  * </p>
  *
  * @author zjw
- * @since 2021-08-12
+ * @since 2021-09-15
  */
 @Repository
 public interface AbnormalBillLogMapper extends BaseMapper<AbnormalBillLog> {
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 51b2b912..8b9de2af 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
@@ -1,13 +1,14 @@
 package com.foreverwin.mesnac.anomaly.model;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
 
 /**
  * <p>
@@ -15,7 +16,7 @@ import java.time.LocalDateTime;
  * </p>
  *
  * @author zjw
- * @since 2021-08-12
+ * @since 2021-09-15
  */
 
 @TableName("Z_ABNORMAL_BILL_LOG")
@@ -314,18 +315,26 @@ public class AbnormalBillLog extends Model<AbnormalBillLog> {
      */
    @TableField("MODIFIED_DATE_TIME")
    private LocalDateTime modifiedDateTime;
-
-   /**
-    * 产品型号
-    */
+    /**
+     * 产品型号
+     */
    @TableField("PRODUCT_CATEGORY")
    private String productCategory;
-
-   /**
-    * 工步
-    */
+    /**
+     * 工步
+     */
    @TableField("STEP_ID")
    private String stepId;
+    /**
+     * 工作令
+     */
+   @TableField("WORK_ORDER")
+   private String workOrder;
+    /**
+     * 项目号
+     */
+   @TableField("ITEM_NUMBER")
+   private String itemNumber;
 
 
    public String getHandle() {
@@ -808,7 +817,23 @@ public class AbnormalBillLog extends Model<AbnormalBillLog> {
       this.stepId = stepId;
    }
 
-   public static final String HANDLE = "HANDLE";
+   public String getWorkOrder() {
+      return workOrder;
+   }
+
+   public void setWorkOrder(String workOrder) {
+      this.workOrder = workOrder;
+   }
+
+   public String getItemNumber() {
+      return itemNumber;
+   }
+
+   public void setItemNumber(String itemNumber) {
+      this.itemNumber = itemNumber;
+   }
+
+public static final String HANDLE = "HANDLE";
 
 public static final String SITE = "SITE";
 
@@ -924,6 +949,14 @@ public static final String MODIFIED_USER = "MODIFIED_USER";
 
 public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
 
+public static final String PRODUCT_CATEGORY = "PRODUCT_CATEGORY";
+
+public static final String STEP_ID = "STEP_ID";
+
+public static final String WORK_ORDER = "WORK_ORDER";
+
+public static final String ITEM_NUMBER = "ITEM_NUMBER";
+
 
    @Override
    protected Serializable pkVal() {
@@ -991,6 +1024,10 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
          ", createdDataTime = " + createdDataTime +
          ", modifiedUser = " + modifiedUser +
          ", modifiedDateTime = " + modifiedDateTime +
+         ", productCategory = " + productCategory +
+         ", stepId = " + stepId +
+         ", workOrder = " + workOrder +
+         ", itemNumber = " + itemNumber +
          "}";
    }
 }
\ No newline at end of file
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 1b91b704..2517413b 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
@@ -16,7 +16,7 @@ import java.util.List;
  * </p>
  *
  * @author zjw
- * @since 2021-08-12
+ * @since 2021-09-15
  */
 public interface AbnormalBillLogService extends IService<AbnormalBillLog> {
 
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 8ade73d2..6d088050 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
@@ -12,7 +12,6 @@ import com.foreverwin.mesnac.anomaly.model.AbnormalNcCode;
 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.ShopOrderMapper;
 import com.foreverwin.mesnac.meapi.model.Router;
 import com.foreverwin.mesnac.meapi.model.ShopOrder;
@@ -21,6 +20,7 @@ import com.foreverwin.mesnac.meapi.service.RouterService;
 import com.foreverwin.modular.core.exception.BusinessException;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
+import org.eclipse.jetty.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,7 +35,7 @@ import java.util.List;
  * </p>
  *
  * @author zjw
- * @since 2021-08-12
+ * @since 2021-09-15
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -45,8 +45,6 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
     @Autowired
     private AbnormalBillLogMapper abnormalBillLogMapper;
 
-
-
     @Autowired
     private AbnormalNcCodeService abnormalNcCodeService;
 
@@ -86,7 +84,6 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
         queryWrapper.setEntity(abnormalBillLog);
         return super.list(queryWrapper);
     }
-
     @Override
     public void saveAndUpdate(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose, List<String> ncGroupAndNcCodes, List<String> dutyCauseType, List<String> dutyType) {
         String user = CommonMethods.getUser();
@@ -94,7 +91,7 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
         String site = CommonMethods.getSite();
         AbnormalBillLog abnormalBillLog = abnormalBillLogMapper.findAllByAbnormalNo(abnormalBill);
 
-        if(!StringUtil.isBlank(abnormalBillDispose.getRouterBo())){
+        if (!StringUtil.isBlank(abnormalBillDispose.getRouterBo())) {
             //分割该工艺路线
             String[] routerSplit = abnormalBillDispose.getRouterBo().split(",");
             //判断该返修工艺是否正确
@@ -104,51 +101,51 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
             router.setRouterType(routerSplit[2]);
             router.setCurrentRevision("true");
             List<Router> routers = routerService.selectList(router);
-            if(routers == null || routers.size() == 0){
+            if (routers == null || routers.size() == 0) {
                 throw BusinessException.build("该返修工艺不存在");
             }
         }
         //判断返修工单是否正确
-        if(!StringUtil.isBlank(abnormalBillDispose.getResolveShopOrder())){
+        if (!StringUtil.isBlank(abnormalBillDispose.getResolveShopOrder())) {
             ShopOrder shopOrder = shopOrderMapper.selectById(HandleEnum.SHOP_ORDER.getHandle(site, abnormalBillDispose.getResolveShopOrder()));
-            if(shopOrder == null){
+            if (shopOrder == null) {
                 throw BusinessException.build("该返修工单不存在");
             }
         }
         //发送用户
-        if(!StringUtil.isBlank(abnormalBill.getReportSendUserGroup())){
+        if (!StringUtil.isBlank(abnormalBill.getReportSendUserGroup())) {
             nwaUserService.checkUserGroup(site, abnormalBill.getReportSendUserGroup());
-        }else if(!StringUtil.isBlank(abnormalBillDispose.getDutySendUserGroup())){
+        } else if (!StringUtil.isBlank(abnormalBillDispose.getDutySendUserGroup())) {
             nwaUserService.checkUserGroup(site, abnormalBillDispose.getDutySendUserGroup());
-        }else if(!StringUtil.isBlank(abnormalBillDispose.getResolveSendUserGroup())){
+        } else if (!StringUtil.isBlank(abnormalBillDispose.getResolveSendUserGroup())) {
             nwaUserService.checkUserGroup(site, abnormalBillDispose.getResolveSendUserGroup());
         }
 
-        if(abnormalBillLogMapper.selectById(abnormalBillLog.getHandle()) == null){
+        if (abnormalBillLogMapper.selectById(abnormalBillLog.getHandle()) == null) {
             //根据abnormalNo找到不合格代码组
             StringBuilder ncGroup = new StringBuilder();
             AbnormalNcCode abnormalNcCode = new AbnormalNcCode();
             abnormalNcCode.setAbnormalBillBo(abnormalBillLog.getHandle());
 
             QueryWrapper<AbnormalNcCode> abnormalNcCodeQueryWrapper = new QueryWrapper<>();
-            abnormalNcCodeQueryWrapper.eq("ABNORMAL_BILL_BO",abnormalBillLog.getHandle());
+            abnormalNcCodeQueryWrapper.eq("ABNORMAL_BILL_BO", abnormalBillLog.getHandle());
             List<AbnormalNcCode> abnormalNcCodes = abnormalNcCodeMapper.selectList(abnormalNcCodeQueryWrapper);
-            if(abnormalNcCodes != null && abnormalNcCodes.size() > 0){
-                for(AbnormalNcCode abnormalNcGroup : abnormalNcCodes){
+            if (abnormalNcCodes != null && abnormalNcCodes.size() > 0) {
+                for (AbnormalNcCode abnormalNcGroup : abnormalNcCodes) {
                     ncGroup.append(abnormalNcGroup.getNcCodeGroup()).append(",");
                 }
             }
-            List<String> ncGroups =new ArrayList<>();
-            if(!StringUtil.isBlank(ncGroup.toString())){
+            List<String> ncGroups = new ArrayList<>();
+            if (!StringUtil.isBlank(ncGroup.toString())) {
                 ncGroup = new StringBuilder(ncGroup.substring(0, ncGroup.length() - 1));
                 List<String> ncGroupList = Arrays.asList(ncGroup.toString().split(","));
                 ncGroups.add(ncGroupList.get(0));
                 for (int i = 1; i < ncGroupList.size(); i++) {
-                    for(int j = 0; j < ncGroups.size(); j++){
-                        if(j == (ncGroups.size() - 1) && !ncGroups.get(j).equals(ncGroupList.get(i))){
+                    for (int j = 0; j < ncGroups.size(); j++) {
+                        if (j == (ncGroups.size() - 1) && !ncGroups.get(j).equals(ncGroupList.get(i))) {
                             ncGroups.add(ncGroupList.get(i));
                         }
-                        if(ncGroups.get(j).equals(ncGroupList.get(i))){
+                        if (ncGroups.get(j).equals(ncGroupList.get(i))) {
                             break;
                         }
                     }
@@ -156,9 +153,9 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
             }
             ncGroup = new StringBuilder();
             for (int i = 0; i < ncGroups.size(); i++) {
-                if(i == (ncGroups.size() - 1)){
+                if (i == (ncGroups.size() - 1)) {
                     ncGroup.append(ncGroups.get(i));
-                }else{
+                } else {
                     ncGroup.append(ncGroups.get(i)).append(",");
                 }
             }
@@ -168,19 +165,17 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
             abnormalBillLog.setModifiedUser(user);
             abnormalBillLog.setModifiedDateTime(now);
 
-            this.save(abnormalBillLog);;
+            this.save(abnormalBillLog);
+            ;
         }
 
 
-        if(Constants.ABNORMAL_QUALITY.equals(abnormalBill.getType())){
-            abnormalPlanService.saveAbnormalPlan(abnormalBill,abnormalBillDispose,now);
-            abnormalBillService.anomalyReport(abnormalBill,abnormalBillDispose,ncGroupAndNcCodes,dutyCauseType,dutyType);
-        }else if(Constants.ABNORMAL_OTHER.equals(abnormalBill.getType())){
-            abnormalBillService.anomalyReportOther(abnormalBill,abnormalBillDispose,dutyCauseType,dutyType);
+        if (Constants.ABNORMAL_QUALITY.equals(abnormalBill.getType())) {
+            abnormalPlanService.saveAbnormalPlan(abnormalBill, abnormalBillDispose, now);
+            abnormalBillService.anomalyReport(abnormalBill, abnormalBillDispose, ncGroupAndNcCodes, dutyCauseType, dutyType);
+        } else if (Constants.ABNORMAL_OTHER.equals(abnormalBill.getType())) {
+            abnormalBillService.anomalyReportOther(abnormalBill, abnormalBillDispose, dutyCauseType, dutyType);
         }
-    }
-
-
-
 
+    }
 }
\ 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 b48bce07..840c1198 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
@@ -1092,9 +1092,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
             abnormalMessage.setStatus("Y");
         }
 
-        //得到升级的用户组、升级的时间和等级
-        //新建有、响应没有、纠防确认有、方案确认没有、取消没有、关闭没有
-        if(Constants.NEW.equals(abnormalBill.getStatus()) || Constants.CORRECTION_CONFIRM.equals(abnormalBill.getStatus())){
+        //得到升级的用户组、升级的时间和等级、升级的消息
+        //新建有、响应没有、纠防确认没有、方案确认没有、取消没有、关闭没有
+        if(Constants.NEW.equals(abnormalBill.getStatus()) ){
             abnormalMessage.setUpUserGroup(abnormalMessage.getSendUserGroup()+"_SJ");
             //得到升级的时间和等级
             UserGroup customFieldByGroup = userGroupMapper.getCustomFieldByGroup(site, abnormalMessage.getSendUserGroup());
@@ -1347,6 +1347,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         //根据异常单的状态找到对应的用户组
         switch (status){
             case Constants.NEW:
+            case Constants.RESPONSE:
                 userGroup = abnormalBill.getReportSendUserGroup();
                 break;
             case Constants.PROGRAM_CONFIRM:
@@ -1360,8 +1361,8 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
                 break;
             default:
         }
-        //如果异常单的状态为关闭或者响应中，则直接返回true，因为这两个状态不需要发送消息
-        if(Constants.RESPONSE.equals(status) || Constants.SHUT_DOWN.equals(status)){
+        //如果异常单的状态为关闭，则直接返回true，因为这两个状态不需要发送消息
+        if(Constants.SHUT_DOWN.equals(status)){
             return null;
         }
         if(StringUtils.isBlank(userGroup)){
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml
index fbef2903..536b62c2 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml
@@ -711,7 +711,9 @@
     <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,
+        ZAB.WORK_CENTER WORK_CENTER,ZAB.RESRCE RESRCE,
+      /*  WORKORDER.VALUE WORK_ORDER,ITEMNUMBER.VALUE ITEM_NUMBER,*/
+        ZAB.WORK_ORDER WORK_ORDER,ZAB.ITEM_NUMBER ITEM_NUMBER,
         ZAB.PRODUCT_CATEGORY 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,
@@ -760,7 +762,7 @@
         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 ,
+        ZAB.WORK_CENTER ,ZAB.RESRCE , /*WORKORDER.VALUE ,ITEMNUMBER.VALUE ,*/ZAB.WORK_ORDER ,ZAB.ITEM_NUMBER ,
         ZAB.PB_DESCRIPTION  ,ZAB.NC_QTY ,ZAB.PRODUCT_CATEGORY,
         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),
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml
index 1e614a85..8116731b 100644
--- a/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml
+++ b/anomaly/src/main/resources/mapper/AbnormalBillLogMapper.xml
@@ -64,11 +64,13 @@
         <result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
         <result column="PRODUCT_CATEGORY" property="productCategory" />
         <result column="STEP_ID" property="stepId" />
+        <result column="WORK_ORDER" property="workOrder" />
+        <result column="ITEM_NUMBER" property="itemNumber" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <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_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, PRODUCT_CATEGORY, STEP_ID
+        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, PRODUCT_CATEGORY, STEP_ID, WORK_ORDER, ITEM_NUMBER
     </sql>
 
     <!-- BaseMapper标准查询/修改/删除 -->
@@ -162,6 +164,8 @@
             <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
             <if test="ew.entity.productCategory!=null"> AND PRODUCT_CATEGORY=#{ew.entity.productCategory}</if>
             <if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
+            <if test="ew.entity.workOrder!=null"> AND WORK_ORDER=#{ew.entity.workOrder}</if>
+            <if test="ew.entity.itemNumber!=null"> AND ITEM_NUMBER=#{ew.entity.itemNumber}</if>
         </where>
     </select>
 
@@ -232,6 +236,8 @@
                 <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                 <if test="ew.entity.productCategory!=null"> AND PRODUCT_CATEGORY=#{ew.entity.productCategory}</if>
                 <if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
+                <if test="ew.entity.workOrder!=null"> AND WORK_ORDER=#{ew.entity.workOrder}</if>
+                <if test="ew.entity.itemNumber!=null"> AND ITEM_NUMBER=#{ew.entity.itemNumber}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
                     ${ew.sqlSegment}
@@ -310,6 +316,8 @@
                     <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                     <if test="ew.entity.productCategory!=null"> AND PRODUCT_CATEGORY=#{ew.entity.productCategory}</if>
                     <if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
+                    <if test="ew.entity.workOrder!=null"> AND WORK_ORDER=#{ew.entity.workOrder}</if>
+                    <if test="ew.entity.itemNumber!=null"> AND ITEM_NUMBER=#{ew.entity.itemNumber}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
                     ${ew.sqlSegment}
@@ -388,6 +396,8 @@
                     <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                     <if test="ew.entity.productCategory!=null"> AND PRODUCT_CATEGORY=#{ew.entity.productCategory}</if>
                     <if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
+                    <if test="ew.entity.workOrder!=null"> AND WORK_ORDER=#{ew.entity.workOrder}</if>
+                    <if test="ew.entity.itemNumber!=null"> AND ITEM_NUMBER=#{ew.entity.itemNumber}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
                     ${ew.sqlSegment}
@@ -466,6 +476,8 @@
                     <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                     <if test="ew.entity.productCategory!=null"> AND PRODUCT_CATEGORY=#{ew.entity.productCategory}</if>
                     <if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
+                    <if test="ew.entity.workOrder!=null"> AND WORK_ORDER=#{ew.entity.workOrder}</if>
+                    <if test="ew.entity.itemNumber!=null"> AND ITEM_NUMBER=#{ew.entity.itemNumber}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
                     ${ew.sqlSegment}
@@ -544,6 +556,8 @@
                     <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                     <if test="ew.entity.productCategory!=null"> AND PRODUCT_CATEGORY=#{ew.entity.productCategory}</if>
                     <if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
+                    <if test="ew.entity.workOrder!=null"> AND WORK_ORDER=#{ew.entity.workOrder}</if>
+                    <if test="ew.entity.itemNumber!=null"> AND ITEM_NUMBER=#{ew.entity.itemNumber}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
                     ${ew.sqlSegment}
@@ -622,6 +636,8 @@
                     <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                     <if test="ew.entity.productCategory!=null"> AND PRODUCT_CATEGORY=#{ew.entity.productCategory}</if>
                     <if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
+                    <if test="ew.entity.workOrder!=null"> AND WORK_ORDER=#{ew.entity.workOrder}</if>
+                    <if test="ew.entity.itemNumber!=null"> AND ITEM_NUMBER=#{ew.entity.itemNumber}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
                     ${ew.sqlSegment}
@@ -696,6 +712,8 @@
             <if test="modifiedDateTime!=null">MODIFIED_DATE_TIME,</if>
             <if test="productCategory!=null">PRODUCT_CATEGORY,</if>
             <if test="stepId!=null">STEP_ID,</if>
+            <if test="workOrder!=null">WORK_ORDER,</if>
+            <if test="itemNumber!=null">ITEM_NUMBER,</if>
         </trim> VALUES
         <trim prefix="(" suffix=")" suffixOverrides=",">
             #{handle},
@@ -758,6 +776,8 @@
             <if test="modifiedDateTime!=null">#{modifiedDateTime},</if>
             <if test="productCategory!=null">#{productCategory},</if>
             <if test="stepId!=null">#{stepId},</if>
+            <if test="workOrder!=null">#{workOrder},</if>
+            <if test="itemNumber!=null">#{itemNumber},</if>
         </trim>
     </insert>
 
@@ -827,6 +847,8 @@
             #{modifiedDateTime},
             #{productCategory},
             #{stepId},
+            #{workOrder},
+            #{itemNumber},
         </trim>
     </insert>
 
@@ -892,6 +914,8 @@
         <if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
         <if test="et.productCategory!=null">PRODUCT_CATEGORY=#{et.productCategory},</if>
         <if test="et.stepId!=null">STEP_ID=#{et.stepId},</if>
+        <if test="et.workOrder!=null">WORK_ORDER=#{et.workOrder},</if>
+        <if test="et.itemNumber!=null">ITEM_NUMBER=#{et.itemNumber},</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>
 
@@ -957,6 +981,8 @@
         MODIFIED_DATE_TIME=#{et.modifiedDateTime},
         PRODUCT_CATEGORY=#{et.productCategory},
         STEP_ID=#{et.stepId},
+        WORK_ORDER=#{et.workOrder},
+        ITEM_NUMBER=#{et.itemNumber},
      </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>
 
@@ -1022,6 +1048,8 @@
         <if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
         <if test="et.productCategory!=null">PRODUCT_CATEGORY=#{et.productCategory},</if>
         <if test="et.stepId!=null">STEP_ID=#{et.stepId},</if>
+        <if test="et.workOrder!=null">WORK_ORDER=#{et.workOrder},</if>
+        <if test="et.itemNumber!=null">ITEM_NUMBER=#{et.itemNumber},</if>
     </trim>
         <where>
             <if test="ew!=null">
@@ -1086,6 +1114,8 @@
                     <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                     <if test="ew.entity.productCategory!=null"> AND PRODUCT_CATEGORY=#{ew.entity.productCategory}</if>
                     <if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
+                    <if test="ew.entity.workOrder!=null"> AND WORK_ORDER=#{ew.entity.workOrder}</if>
+                    <if test="ew.entity.itemNumber!=null"> AND ITEM_NUMBER=#{ew.entity.itemNumber}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
                     ${ew.sqlSegment}
@@ -1181,6 +1211,8 @@
                     <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
                     <if test="ew.entity.productCategory!=null"> AND PRODUCT_CATEGORY=#{ew.entity.productCategory}</if>
                     <if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
+                    <if test="ew.entity.workOrder!=null"> AND WORK_ORDER=#{ew.entity.workOrder}</if>
+                    <if test="ew.entity.itemNumber!=null"> AND ITEM_NUMBER=#{ew.entity.itemNumber}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
                     ${ew.sqlSegment}
@@ -1215,7 +1247,8 @@
         zabd.ROUTER_BO ROUTER_BO,zabd.RESOLVE_SHOP_ORDER RESOLVE_SHOP_ORDER,zabd.RESOLVE_REMARK RESOLVE_REMARK,
         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.PRODUCT_CATEGORY PRODUCT_CATEGORY,zab.STEP_ID STEP_ID
+        zab.CANCEL_SEND_USER_GROUP CANCEL_SEND_USER_GROUP,zab.PRODUCT_CATEGORY PRODUCT_CATEGORY,zab.STEP_ID STEP_ID,
+        zab.ITEM_NUMBER ITEM_NUMBER,zab.WORK_ORDER WORK_ORDER
         FROM Z_ABNORMAL_BILL zab
         INNER JOIN Z_ABNORMAL_BILL_DISPOSE zabd ON zab.HANDLE = zabd.ABNORMAL_BILL_BO
         <where>
@@ -1229,4 +1262,5 @@
             </if>
         </where>
     </select>
+
 </mapper>