diff --git a/anomaly/pom.xml b/anomaly/pom.xml
index 53592803..061f313a 100644
--- a/anomaly/pom.xml
+++ b/anomaly/pom.xml
@@ -12,8 +12,9 @@
     <artifactId>anomaly</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
     <dependencies>
         <dependency>
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
index 31ee4964..df10842b 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
@@ -5,11 +5,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
 import com.foreverwin.mesnac.anomaly.service.AbnormalBillService;
+import com.foreverwin.mesnac.common.helper.NextNumberHelper;
+import com.foreverwin.mesnac.meapi.controller.WorkCenterController;
+import com.foreverwin.mesnac.meapi.model.NcCode;
+import com.foreverwin.mesnac.meapi.model.WorkCenter;
+import com.foreverwin.mesnac.meapi.service.NcCodeService;
+import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -24,6 +31,15 @@ public class AbnormalBillController {
     @Autowired
     public AbnormalBillService abnormalBillService;
 
+    @Autowired
+    public NcCodeService ncCodeService;
+
+    @Autowired
+    public WorkCenterController workCenterController;
+
+    @Autowired
+    public NextNumberHelper nextNumberHelper;
+
     /**
     * 根据id查询
     *
@@ -143,4 +159,27 @@ public class AbnormalBillController {
     public R removeByIds(List<String> ids){
         return R.ok(abnormalBillService.removeByIds(ids));
     }
+
+    @GetMapping("/init")
+    public R init(String messageType){
+        List<NcCode> ncByNG = ncCodeService.findNcByNG(messageType);
+        WorkCenter workCenter = new WorkCenter();
+        workCenter.setWcCategory("LEVEL4");
+        R workCenterList = workCenterController.getWorkCenterList(workCenter);
+        HashMap<String, Object> hashMap = new HashMap<>();
+        hashMap.put("ncByNG",ncByNG);
+        hashMap.put("workCenter",workCenterList);
+        return R.ok(hashMap);
+    }
+
+    @GetMapping("/findAllUserByUserGroup")
+    public R findAllUserByUserGroup(String site, String userGroups){
+        return R.ok();
+    }
+    @GetMapping("/getNextNumber")
+    public R getNextNumber(String numberType){
+        String site = CommonMethods.getSite();
+        List<String> nextNumber = nextNumberHelper.getNextNumber(site, numberType, 1, null);
+        return R.ok(nextNumber.get(0));
+    }
 }
\ No newline at end of file
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
new file mode 100644
index 00000000..3289225c
--- /dev/null
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillDisposeController.java
@@ -0,0 +1,137 @@
+package com.foreverwin.mesnac.anomaly.controller;
+
+import com.foreverwin.modular.core.util.R;
+import com.foreverwin.modular.core.util.FrontPage;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.foreverwin.mesnac.anomaly.service.AbnormalBillDisposeService;
+import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
+import java.util.List;
+
+/**
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+@RestController
+@RequestMapping("/Z-ABNORMAL-BILL-DISPOSE")
+public class AbnormalBillDisposeController {
+
+    @Autowired
+    public AbnormalBillDisposeService abnormalBillDisposeService;
+
+    /**
+    * 根据id查询
+    *
+    * @param id 主键
+    * @return
+    */
+    @ResponseBody
+    @GetMapping("/{id:.+}")
+    public R getAbnormalBillDisposeById(@PathVariable String id) {
+        return R.ok( abnormalBillDisposeService.getById(id));
+    }
+
+    /**
+     * 查询所有数据
+     *
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("")
+    public R getAbnormalBillDisposeList(AbnormalBillDispose abnormalBillDispose){
+        List<AbnormalBillDispose> result;
+        QueryWrapper<AbnormalBillDispose> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(abnormalBillDispose);
+        result = abnormalBillDisposeService.list(queryWrapper);
+        return R.ok(result);
+    }
+
+    /**
+     * 分页查询数据
+     *
+     * @param frontPage  分页信息
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("/page")
+    public R page(FrontPage<AbnormalBillDispose> frontPage, AbnormalBillDispose abnormalBillDispose){
+        IPage result;
+        QueryWrapper<AbnormalBillDispose> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(abnormalBillDispose);
+        if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
+            //TODO modify global query
+            queryWrapper.lambda().and(wrapper -> wrapper
+                .like(AbnormalBillDispose::getHandle, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillDispose::getSite, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillDispose::getAbnormalBillBo, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillDispose::getDutyUser, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillDispose::getDutyDepart, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillDispose::getPrincipalUser, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillDispose::getDutyCauseDescription, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillDispose::getDutyCauseType, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillDispose::getDutySendUserGroup, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillDispose::getResolveUser, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillDispose::getAbnormalMethod, frontPage.getGlobalQuery())
+                .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::getClosedUser, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillDispose::getAbnormalReason, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillDispose::getBeforeMeasure, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillDispose::getCreatedUser, frontPage.getGlobalQuery())
+                .or().like(AbnormalBillDispose::getModifiedUser, frontPage.getGlobalQuery())
+    );
+        }
+        result = abnormalBillDisposeService.page(frontPage.getPagePlus(), queryWrapper);
+        return R.ok(result);
+    }
+
+    /**
+     * 新增
+     * @param abnormalBillDispose  传递的实体
+     * @return  null 失败  实体成功
+     */
+    @PostMapping
+    public R save(@RequestBody AbnormalBillDispose abnormalBillDispose) {
+        return R.ok(abnormalBillDisposeService.save(abnormalBillDispose));
+    }
+
+    /**
+     * 修改
+     * @param abnormalBillDispose  传递的实体
+     * @return  null 失败  实体成功
+     */
+    @PutMapping
+    public R updateById(@RequestBody AbnormalBillDispose abnormalBillDispose) {
+        return R.ok(abnormalBillDisposeService.updateById(abnormalBillDispose));
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     * @return 0 失败  1 成功
+     */
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}")
+    public R removeById(@PathVariable("id") String id){
+        return R.ok(abnormalBillDisposeService.removeById(id));
+    }
+
+    /**
+     * 批量删除对象
+     * @param ids 实体集合ID
+     * @return  0 失败  1 成功
+     */
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.POST, value = "/delete-batch")
+    public R removeByIds(List<String> ids){
+        return R.ok(abnormalBillDisposeService.removeByIds(ids));
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 00000000..84555a7f
--- /dev/null
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillDisposeMapper.java
@@ -0,0 +1,18 @@
+package com.foreverwin.mesnac.anomaly.mapper;
+
+import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 异常单处置 Mapper 接口
+ * </p>
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+@Repository
+public interface AbnormalBillDisposeMapper extends BaseMapper<AbnormalBillDispose> {
+
+}
\ No newline at end of file
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
new file mode 100644
index 00000000..7ffe574c
--- /dev/null
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBillDispose.java
@@ -0,0 +1,438 @@
+package com.foreverwin.mesnac.anomaly.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 异常单处置
+ * </p>
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+
+@TableName("Z_ABNORMAL_BILL_DISPOSE")
+
+public class AbnormalBillDispose extends Model<AbnormalBillDispose> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+   @TableField("HANDLE")
+   private String handle;
+    /**
+     * 站点
+     */
+   @TableField("SITE")
+   private String site;
+    /**
+     * 异常单BO
+     */
+   @TableField("ABNORMAL_BILL_BO")
+   private String abnormalBillBo;
+    /**
+     * 责任划分填报人
+     */
+   @TableField("DUTY_USER")
+   private String dutyUser;
+    /**
+     * 责任划分填报时间
+     */
+   @TableField("DUTY_DATE_TIME")
+   private LocalDateTime dutyDateTime;
+    /**
+     * 责任部门
+     */
+   @TableField("DUTY_DEPART")
+   private String dutyDepart;
+    /**
+     * 责任人
+     */
+   @TableField("PRINCIPAL_USER")
+   private String principalUser;
+    /**
+     * 原因分析
+     */
+   @TableField("DUTY_CAUSE_DESCRIPTION")
+   private String dutyCauseDescription;
+    /**
+     * 原因分类
+     */
+   @TableField("DUTY_CAUSE_TYPE")
+   private String dutyCauseType;
+    /**
+     * 发送用户组
+     */
+   @TableField("DUTY_SEND_USER_GROUP")
+   private String dutySendUserGroup;
+    /**
+     * 解决方案填报人
+     */
+   @TableField("RESOLVE_USER")
+   private String resolveUser;
+    /**
+     * 解决方案填报时间
+     */
+   @TableField("RESOLVE_DATE_TIME")
+   private LocalDateTime resolveDateTime;
+    /**
+     * 异常方案
+     */
+   @TableField("ABNORMAL_METHOD")
+   private String abnormalMethod;
+    /**
+     * 返修工艺
+     */
+   @TableField("ROUTER_BO")
+   private String routerBo;
+    /**
+     * 返修工单
+     */
+   @TableField("RESOLVE_SHOP_ORDER")
+   private String resolveShopOrder;
+    /**
+     * 方案备注
+     */
+   @TableField("RESOLVE_REMARK")
+   private String resolveRemark;
+    /**
+     * 发送用户
+     */
+   @TableField("RESOLVE_SEND_USER")
+   private String resolveSendUser;
+    /**
+     * 闭环关闭填报人
+     */
+   @TableField("CLOSED_USER")
+   private String closedUser;
+    /**
+     * 闭环关闭填报时间
+     */
+   @TableField("CLOSED_DATE_TIME")
+   private LocalDateTime closedDateTime;
+    /**
+     * 异常原因
+     */
+   @TableField("ABNORMAL_REASON")
+   private String abnormalReason;
+    /**
+     * 预防措施
+     */
+   @TableField("BEFORE_MEASURE")
+   private String beforeMeasure;
+    /**
+     * 创建人
+     */
+   @TableField("CREATED_USER")
+   private String createdUser;
+    /**
+     * 创建日期
+     */
+   @TableField("CREATED_DATA_TIME")
+   private LocalDateTime createdDataTime;
+    /**
+     * 修改人
+     */
+   @TableField("MODIFIED_USER")
+   private String modifiedUser;
+    /**
+     * 修改日期
+     */
+   @TableField("MODIFIED_DATE_TIME")
+   private LocalDateTime modifiedDateTime;
+
+
+   public String getHandle() {
+      return handle;
+   }
+
+   public void setHandle(String handle) {
+      this.handle = handle;
+   }
+
+   public String getSite() {
+      return site;
+   }
+
+   public void setSite(String site) {
+      this.site = site;
+   }
+
+   public String getAbnormalBillBo() {
+      return abnormalBillBo;
+   }
+
+   public void setAbnormalBillBo(String abnormalBillBo) {
+      this.abnormalBillBo = abnormalBillBo;
+   }
+
+   public String getDutyUser() {
+      return dutyUser;
+   }
+
+   public void setDutyUser(String dutyUser) {
+      this.dutyUser = dutyUser;
+   }
+
+   public LocalDateTime getDutyDateTime() {
+      return dutyDateTime;
+   }
+
+   public void setDutyDateTime(LocalDateTime dutyDateTime) {
+      this.dutyDateTime = dutyDateTime;
+   }
+
+   public String getDutyDepart() {
+      return dutyDepart;
+   }
+
+   public void setDutyDepart(String dutyDepart) {
+      this.dutyDepart = dutyDepart;
+   }
+
+   public String getPrincipalUser() {
+      return principalUser;
+   }
+
+   public void setPrincipalUser(String principalUser) {
+      this.principalUser = principalUser;
+   }
+
+   public String getDutyCauseDescription() {
+      return dutyCauseDescription;
+   }
+
+   public void setDutyCauseDescription(String dutyCauseDescription) {
+      this.dutyCauseDescription = dutyCauseDescription;
+   }
+
+   public String getDutyCauseType() {
+      return dutyCauseType;
+   }
+
+   public void setDutyCauseType(String dutyCauseType) {
+      this.dutyCauseType = dutyCauseType;
+   }
+
+   public String getDutySendUserGroup() {
+      return dutySendUserGroup;
+   }
+
+   public void setDutySendUserGroup(String dutySendUserGroup) {
+      this.dutySendUserGroup = dutySendUserGroup;
+   }
+
+   public String getResolveUser() {
+      return resolveUser;
+   }
+
+   public void setResolveUser(String resolveUser) {
+      this.resolveUser = resolveUser;
+   }
+
+   public LocalDateTime getResolveDateTime() {
+      return resolveDateTime;
+   }
+
+   public void setResolveDateTime(LocalDateTime resolveDateTime) {
+      this.resolveDateTime = resolveDateTime;
+   }
+
+   public String getAbnormalMethod() {
+      return abnormalMethod;
+   }
+
+   public void setAbnormalMethod(String abnormalMethod) {
+      this.abnormalMethod = abnormalMethod;
+   }
+
+   public String getRouterBo() {
+      return routerBo;
+   }
+
+   public void setRouterBo(String routerBo) {
+      this.routerBo = routerBo;
+   }
+
+   public String getResolveShopOrder() {
+      return resolveShopOrder;
+   }
+
+   public void setResolveShopOrder(String resolveShopOrder) {
+      this.resolveShopOrder = resolveShopOrder;
+   }
+
+   public String getResolveRemark() {
+      return resolveRemark;
+   }
+
+   public void setResolveRemark(String resolveRemark) {
+      this.resolveRemark = resolveRemark;
+   }
+
+   public String getResolveSendUser() {
+      return resolveSendUser;
+   }
+
+   public void setResolveSendUser(String resolveSendUser) {
+      this.resolveSendUser = resolveSendUser;
+   }
+
+   public String getClosedUser() {
+      return closedUser;
+   }
+
+   public void setClosedUser(String closedUser) {
+      this.closedUser = closedUser;
+   }
+
+   public LocalDateTime getClosedDateTime() {
+      return closedDateTime;
+   }
+
+   public void setClosedDateTime(LocalDateTime closedDateTime) {
+      this.closedDateTime = closedDateTime;
+   }
+
+   public String getAbnormalReason() {
+      return abnormalReason;
+   }
+
+   public void setAbnormalReason(String abnormalReason) {
+      this.abnormalReason = abnormalReason;
+   }
+
+   public String getBeforeMeasure() {
+      return beforeMeasure;
+   }
+
+   public void setBeforeMeasure(String beforeMeasure) {
+      this.beforeMeasure = beforeMeasure;
+   }
+
+   public String getCreatedUser() {
+      return createdUser;
+   }
+
+   public void setCreatedUser(String createdUser) {
+      this.createdUser = createdUser;
+   }
+
+   public LocalDateTime getCreatedDataTime() {
+      return createdDataTime;
+   }
+
+   public void setCreatedDataTime(LocalDateTime createdDataTime) {
+      this.createdDataTime = createdDataTime;
+   }
+
+   public String getModifiedUser() {
+      return modifiedUser;
+   }
+
+   public void setModifiedUser(String modifiedUser) {
+      this.modifiedUser = modifiedUser;
+   }
+
+   public LocalDateTime getModifiedDateTime() {
+      return modifiedDateTime;
+   }
+
+   public void setModifiedDateTime(LocalDateTime modifiedDateTime) {
+      this.modifiedDateTime = modifiedDateTime;
+   }
+
+public static final String HANDLE = "HANDLE";
+
+public static final String SITE = "SITE";
+
+public static final String ABNORMAL_BILL_BO = "ABNORMAL_BILL_BO";
+
+public static final String DUTY_USER = "DUTY_USER";
+
+public static final String DUTY_DATE_TIME = "DUTY_DATE_TIME";
+
+public static final String DUTY_DEPART = "DUTY_DEPART";
+
+public static final String PRINCIPAL_USER = "PRINCIPAL_USER";
+
+public static final String DUTY_CAUSE_DESCRIPTION = "DUTY_CAUSE_DESCRIPTION";
+
+public static final String DUTY_CAUSE_TYPE = "DUTY_CAUSE_TYPE";
+
+public static final String DUTY_SEND_USER_GROUP = "DUTY_SEND_USER_GROUP";
+
+public static final String RESOLVE_USER = "RESOLVE_USER";
+
+public static final String RESOLVE_DATE_TIME = "RESOLVE_DATE_TIME";
+
+public static final String ABNORMAL_METHOD = "ABNORMAL_METHOD";
+
+public static final String ROUTER_BO = "ROUTER_BO";
+
+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 CLOSED_USER = "CLOSED_USER";
+
+public static final String CLOSED_DATE_TIME = "CLOSED_DATE_TIME";
+
+public static final String ABNORMAL_REASON = "ABNORMAL_REASON";
+
+public static final String BEFORE_MEASURE = "BEFORE_MEASURE";
+
+public static final String CREATED_USER = "CREATED_USER";
+
+public static final String CREATED_DATA_TIME = "CREATED_DATA_TIME";
+
+public static final String MODIFIED_USER = "MODIFIED_USER";
+
+public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
+
+
+   @Override
+   protected Serializable pkVal() {
+      return this.handle;
+   }
+
+   @Override
+   public String toString() {
+      return "AbnormalBillDispose{" +
+         "handle = " + handle +
+         ", site = " + site +
+         ", abnormalBillBo = " + abnormalBillBo +
+         ", dutyUser = " + dutyUser +
+         ", dutyDateTime = " + dutyDateTime +
+         ", dutyDepart = " + dutyDepart +
+         ", principalUser = " + principalUser +
+         ", dutyCauseDescription = " + dutyCauseDescription +
+         ", dutyCauseType = " + dutyCauseType +
+         ", dutySendUserGroup = " + dutySendUserGroup +
+         ", resolveUser = " + resolveUser +
+         ", resolveDateTime = " + resolveDateTime +
+         ", abnormalMethod = " + abnormalMethod +
+         ", routerBo = " + routerBo +
+         ", resolveShopOrder = " + resolveShopOrder +
+         ", resolveRemark = " + resolveRemark +
+         ", resolveSendUser = " + resolveSendUser +
+         ", closedUser = " + closedUser +
+         ", closedDateTime = " + closedDateTime +
+         ", abnormalReason = " + abnormalReason +
+         ", beforeMeasure = " + beforeMeasure +
+         ", createdUser = " + createdUser +
+         ", createdDataTime = " + createdDataTime +
+         ", modifiedUser = " + modifiedUser +
+         ", modifiedDateTime = " + modifiedDateTime +
+         "}";
+   }
+}
\ No newline at end of file
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
new file mode 100644
index 00000000..a8018ed9
--- /dev/null
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillDisposeService.java
@@ -0,0 +1,28 @@
+package com.foreverwin.mesnac.anomaly.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.modular.core.util.FrontPage;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 异常单处置 服务类
+ * </p>
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+public interface AbnormalBillDisposeService extends IService<AbnormalBillDispose> {
+
+    /**
+     *  分页查询
+     * @param frontPage
+     * @return
+     */
+    IPage<AbnormalBillDispose> selectPage(FrontPage<AbnormalBillDispose> frontPage, AbnormalBillDispose abnormalBillDispose);
+
+    List<AbnormalBillDispose> selectList(AbnormalBillDispose abnormalBillDispose);
+}
\ No newline at end of file
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
new file mode 100644
index 00000000..ebb7af58
--- /dev/null
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillDisposeServiceImpl.java
@@ -0,0 +1,46 @@
+package com.foreverwin.mesnac.anomaly.service.impl;
+
+import com.foreverwin.modular.core.util.FrontPage;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
+import com.foreverwin.mesnac.anomaly.mapper.AbnormalBillDisposeMapper;
+import com.foreverwin.mesnac.anomaly.service.AbnormalBillDisposeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+/**
+ * <p>
+ * 异常单处置 服务实现类
+ * </p>
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class AbnormalBillDisposeServiceImpl extends ServiceImpl<AbnormalBillDisposeMapper, AbnormalBillDispose> implements AbnormalBillDisposeService {
+
+
+    @Autowired
+    private AbnormalBillDisposeMapper abnormalBillDisposeMapper;
+
+    @Override
+    public IPage<AbnormalBillDispose> selectPage(FrontPage<AbnormalBillDispose> frontPage, AbnormalBillDispose abnormalBillDispose) {
+        QueryWrapper<AbnormalBillDispose> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(abnormalBillDispose);
+        return super.page(frontPage.getPagePlus(), queryWrapper);
+    }
+
+    @Override
+    public List<AbnormalBillDispose> selectList(AbnormalBillDispose abnormalBillDispose) {
+        QueryWrapper<AbnormalBillDispose> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(abnormalBillDispose);
+        return super.list(queryWrapper);
+    }
+
+
+}
\ No newline at end of file
diff --git a/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml
new file mode 100644
index 00000000..f08518a1
--- /dev/null
+++ b/anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml
@@ -0,0 +1,570 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.foreverwin.mesnac.anomaly.mapper.AbnormalBillDisposeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose">
+        <result column="HANDLE" property="handle" />
+        <result column="SITE" property="site" />
+        <result column="ABNORMAL_BILL_BO" property="abnormalBillBo" />
+        <result column="DUTY_USER" property="dutyUser" />
+        <result column="DUTY_DATE_TIME" property="dutyDateTime" />
+        <result column="DUTY_DEPART" property="dutyDepart" />
+        <result column="PRINCIPAL_USER" property="principalUser" />
+        <result column="DUTY_CAUSE_DESCRIPTION" property="dutyCauseDescription" />
+        <result column="DUTY_CAUSE_TYPE" property="dutyCauseType" />
+        <result column="DUTY_SEND_USER_GROUP" property="dutySendUserGroup" />
+        <result column="RESOLVE_USER" property="resolveUser" />
+        <result column="RESOLVE_DATE_TIME" property="resolveDateTime" />
+        <result column="ABNORMAL_METHOD" property="abnormalMethod" />
+        <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="CLOSED_USER" property="closedUser" />
+        <result column="CLOSED_DATE_TIME" property="closedDateTime" />
+        <result column="ABNORMAL_REASON" property="abnormalReason" />
+        <result column="BEFORE_MEASURE" property="beforeMeasure" />
+        <result column="CREATED_USER" property="createdUser" />
+        <result column="CREATED_DATA_TIME" property="createdDataTime" />
+        <result column="MODIFIED_USER" property="modifiedUser" />
+        <result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        HANDLE, SITE, ABNORMAL_BILL_BO, DUTY_USER, DUTY_DATE_TIME, DUTY_DEPART, 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
+    </sql>
+
+    <!-- BaseMapper标准查询/修改/删除 -->
+
+    <select id="selectByMap" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include>
+        FROM Z_ABNORMAL_BILL_DISPOSE
+        <if test="cm!=null and !cm.isEmpty">
+            <where>
+                <foreach collection="cm.keys" item="k" separator="AND">
+                    <if test="cm[k] != null">
+                        ${k} = #{cm[${k}]}
+                    </if>
+                </foreach>
+            </where>
+        </if>
+    </select>
+
+
+    <select id="selectOne" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include> FROM Z_ABNORMAL_BILL_DISPOSE
+        <where>
+            <if test="ew.entity.handle!=null">
+              HANDLE=#{ew.handle}
+            </if>
+            <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+            <if test="ew.entity.abnormalBillBo!=null"> AND ABNORMAL_BILL_BO=#{ew.entity.abnormalBillBo}</if>
+            <if test="ew.entity.dutyUser!=null"> AND DUTY_USER=#{ew.entity.dutyUser}</if>
+            <if test="ew.entity.dutyDateTime!=null"> AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime}</if>
+            <if test="ew.entity.dutyDepart!=null"> AND DUTY_DEPART=#{ew.entity.dutyDepart}</if>
+            <if test="ew.entity.principalUser!=null"> AND PRINCIPAL_USER=#{ew.entity.principalUser}</if>
+            <if test="ew.entity.dutyCauseDescription!=null"> AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription}</if>
+            <if test="ew.entity.dutyCauseType!=null"> AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType}</if>
+            <if test="ew.entity.dutySendUserGroup!=null"> AND DUTY_SEND_USER_GROUP=#{ew.entity.dutySendUserGroup}</if>
+            <if test="ew.entity.resolveUser!=null"> AND RESOLVE_USER=#{ew.entity.resolveUser}</if>
+            <if test="ew.entity.resolveDateTime!=null"> AND RESOLVE_DATE_TIME=#{ew.entity.resolveDateTime}</if>
+            <if test="ew.entity.abnormalMethod!=null"> AND ABNORMAL_METHOD=#{ew.entity.abnormalMethod}</if>
+            <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.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>
+            <if test="ew.entity.beforeMeasure!=null"> AND BEFORE_MEASURE=#{ew.entity.beforeMeasure}</if>
+            <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
+            <if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if>
+            <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
+            <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+        </where>
+    </select>
+
+    <select id="selectCount" resultType="Integer">
+        SELECT COUNT(1) FROM Z_ABNORMAL_BILL_DISPOSE
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                <if test="ew.entity.handle!=null">
+                    HANDLE=#{ew.entity.handle}
+                </if>
+                <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                <if test="ew.entity.abnormalBillBo!=null"> AND ABNORMAL_BILL_BO=#{ew.entity.abnormalBillBo}</if>
+                <if test="ew.entity.dutyUser!=null"> AND DUTY_USER=#{ew.entity.dutyUser}</if>
+                <if test="ew.entity.dutyDateTime!=null"> AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime}</if>
+                <if test="ew.entity.dutyDepart!=null"> AND DUTY_DEPART=#{ew.entity.dutyDepart}</if>
+                <if test="ew.entity.principalUser!=null"> AND PRINCIPAL_USER=#{ew.entity.principalUser}</if>
+                <if test="ew.entity.dutyCauseDescription!=null"> AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription}</if>
+                <if test="ew.entity.dutyCauseType!=null"> AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType}</if>
+                <if test="ew.entity.dutySendUserGroup!=null"> AND DUTY_SEND_USER_GROUP=#{ew.entity.dutySendUserGroup}</if>
+                <if test="ew.entity.resolveUser!=null"> AND RESOLVE_USER=#{ew.entity.resolveUser}</if>
+                <if test="ew.entity.resolveDateTime!=null"> AND RESOLVE_DATE_TIME=#{ew.entity.resolveDateTime}</if>
+                <if test="ew.entity.abnormalMethod!=null"> AND ABNORMAL_METHOD=#{ew.entity.abnormalMethod}</if>
+                <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.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>
+                <if test="ew.entity.beforeMeasure!=null"> AND BEFORE_MEASURE=#{ew.entity.beforeMeasure}</if>
+                <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
+                <if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if>
+                <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
+                <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectList" resultMap="BaseResultMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_ABNORMAL_BILL_DISPOSE
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.abnormalBillBo!=null"> AND ABNORMAL_BILL_BO=#{ew.entity.abnormalBillBo}</if>
+                    <if test="ew.entity.dutyUser!=null"> AND DUTY_USER=#{ew.entity.dutyUser}</if>
+                    <if test="ew.entity.dutyDateTime!=null"> AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime}</if>
+                    <if test="ew.entity.dutyDepart!=null"> AND DUTY_DEPART=#{ew.entity.dutyDepart}</if>
+                    <if test="ew.entity.principalUser!=null"> AND PRINCIPAL_USER=#{ew.entity.principalUser}</if>
+                    <if test="ew.entity.dutyCauseDescription!=null"> AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription}</if>
+                    <if test="ew.entity.dutyCauseType!=null"> AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType}</if>
+                    <if test="ew.entity.dutySendUserGroup!=null"> AND DUTY_SEND_USER_GROUP=#{ew.entity.dutySendUserGroup}</if>
+                    <if test="ew.entity.resolveUser!=null"> AND RESOLVE_USER=#{ew.entity.resolveUser}</if>
+                    <if test="ew.entity.resolveDateTime!=null"> AND RESOLVE_DATE_TIME=#{ew.entity.resolveDateTime}</if>
+                    <if test="ew.entity.abnormalMethod!=null"> AND ABNORMAL_METHOD=#{ew.entity.abnormalMethod}</if>
+                    <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.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>
+                    <if test="ew.entity.beforeMeasure!=null"> AND BEFORE_MEASURE=#{ew.entity.beforeMeasure}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
+                    <if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectMaps" resultType="HashMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_ABNORMAL_BILL_DISPOSE
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.abnormalBillBo!=null"> AND ABNORMAL_BILL_BO=#{ew.entity.abnormalBillBo}</if>
+                    <if test="ew.entity.dutyUser!=null"> AND DUTY_USER=#{ew.entity.dutyUser}</if>
+                    <if test="ew.entity.dutyDateTime!=null"> AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime}</if>
+                    <if test="ew.entity.dutyDepart!=null"> AND DUTY_DEPART=#{ew.entity.dutyDepart}</if>
+                    <if test="ew.entity.principalUser!=null"> AND PRINCIPAL_USER=#{ew.entity.principalUser}</if>
+                    <if test="ew.entity.dutyCauseDescription!=null"> AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription}</if>
+                    <if test="ew.entity.dutyCauseType!=null"> AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType}</if>
+                    <if test="ew.entity.dutySendUserGroup!=null"> AND DUTY_SEND_USER_GROUP=#{ew.entity.dutySendUserGroup}</if>
+                    <if test="ew.entity.resolveUser!=null"> AND RESOLVE_USER=#{ew.entity.resolveUser}</if>
+                    <if test="ew.entity.resolveDateTime!=null"> AND RESOLVE_DATE_TIME=#{ew.entity.resolveDateTime}</if>
+                    <if test="ew.entity.abnormalMethod!=null"> AND ABNORMAL_METHOD=#{ew.entity.abnormalMethod}</if>
+                    <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.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>
+                    <if test="ew.entity.beforeMeasure!=null"> AND BEFORE_MEASURE=#{ew.entity.beforeMeasure}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
+                    <if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectObjs" resultType="Object">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_ABNORMAL_BILL_DISPOSE
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.abnormalBillBo!=null"> AND ABNORMAL_BILL_BO=#{ew.entity.abnormalBillBo}</if>
+                    <if test="ew.entity.dutyUser!=null"> AND DUTY_USER=#{ew.entity.dutyUser}</if>
+                    <if test="ew.entity.dutyDateTime!=null"> AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime}</if>
+                    <if test="ew.entity.dutyDepart!=null"> AND DUTY_DEPART=#{ew.entity.dutyDepart}</if>
+                    <if test="ew.entity.principalUser!=null"> AND PRINCIPAL_USER=#{ew.entity.principalUser}</if>
+                    <if test="ew.entity.dutyCauseDescription!=null"> AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription}</if>
+                    <if test="ew.entity.dutyCauseType!=null"> AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType}</if>
+                    <if test="ew.entity.dutySendUserGroup!=null"> AND DUTY_SEND_USER_GROUP=#{ew.entity.dutySendUserGroup}</if>
+                    <if test="ew.entity.resolveUser!=null"> AND RESOLVE_USER=#{ew.entity.resolveUser}</if>
+                    <if test="ew.entity.resolveDateTime!=null"> AND RESOLVE_DATE_TIME=#{ew.entity.resolveDateTime}</if>
+                    <if test="ew.entity.abnormalMethod!=null"> AND ABNORMAL_METHOD=#{ew.entity.abnormalMethod}</if>
+                    <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.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>
+                    <if test="ew.entity.beforeMeasure!=null"> AND BEFORE_MEASURE=#{ew.entity.beforeMeasure}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
+                    <if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectPage" resultMap="BaseResultMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_ABNORMAL_BILL_DISPOSE
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.abnormalBillBo!=null"> AND ABNORMAL_BILL_BO=#{ew.entity.abnormalBillBo}</if>
+                    <if test="ew.entity.dutyUser!=null"> AND DUTY_USER=#{ew.entity.dutyUser}</if>
+                    <if test="ew.entity.dutyDateTime!=null"> AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime}</if>
+                    <if test="ew.entity.dutyDepart!=null"> AND DUTY_DEPART=#{ew.entity.dutyDepart}</if>
+                    <if test="ew.entity.principalUser!=null"> AND PRINCIPAL_USER=#{ew.entity.principalUser}</if>
+                    <if test="ew.entity.dutyCauseDescription!=null"> AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription}</if>
+                    <if test="ew.entity.dutyCauseType!=null"> AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType}</if>
+                    <if test="ew.entity.dutySendUserGroup!=null"> AND DUTY_SEND_USER_GROUP=#{ew.entity.dutySendUserGroup}</if>
+                    <if test="ew.entity.resolveUser!=null"> AND RESOLVE_USER=#{ew.entity.resolveUser}</if>
+                    <if test="ew.entity.resolveDateTime!=null"> AND RESOLVE_DATE_TIME=#{ew.entity.resolveDateTime}</if>
+                    <if test="ew.entity.abnormalMethod!=null"> AND ABNORMAL_METHOD=#{ew.entity.abnormalMethod}</if>
+                    <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.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>
+                    <if test="ew.entity.beforeMeasure!=null"> AND BEFORE_MEASURE=#{ew.entity.beforeMeasure}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
+                    <if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectMapsPage" resultType="HashMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_ABNORMAL_BILL_DISPOSE
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.abnormalBillBo!=null"> AND ABNORMAL_BILL_BO=#{ew.entity.abnormalBillBo}</if>
+                    <if test="ew.entity.dutyUser!=null"> AND DUTY_USER=#{ew.entity.dutyUser}</if>
+                    <if test="ew.entity.dutyDateTime!=null"> AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime}</if>
+                    <if test="ew.entity.dutyDepart!=null"> AND DUTY_DEPART=#{ew.entity.dutyDepart}</if>
+                    <if test="ew.entity.principalUser!=null"> AND PRINCIPAL_USER=#{ew.entity.principalUser}</if>
+                    <if test="ew.entity.dutyCauseDescription!=null"> AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription}</if>
+                    <if test="ew.entity.dutyCauseType!=null"> AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType}</if>
+                    <if test="ew.entity.dutySendUserGroup!=null"> AND DUTY_SEND_USER_GROUP=#{ew.entity.dutySendUserGroup}</if>
+                    <if test="ew.entity.resolveUser!=null"> AND RESOLVE_USER=#{ew.entity.resolveUser}</if>
+                    <if test="ew.entity.resolveDateTime!=null"> AND RESOLVE_DATE_TIME=#{ew.entity.resolveDateTime}</if>
+                    <if test="ew.entity.abnormalMethod!=null"> AND ABNORMAL_METHOD=#{ew.entity.abnormalMethod}</if>
+                    <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.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>
+                    <if test="ew.entity.beforeMeasure!=null"> AND BEFORE_MEASURE=#{ew.entity.beforeMeasure}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
+                    <if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <insert id="insert" parameterType="com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose">
+        INSERT INTO Z_ABNORMAL_BILL_DISPOSE
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            HANDLE,
+            <if test="site!=null">SITE,</if>
+            <if test="abnormalBillBo!=null">ABNORMAL_BILL_BO,</if>
+            <if test="dutyUser!=null">DUTY_USER,</if>
+            <if test="dutyDateTime!=null">DUTY_DATE_TIME,</if>
+            <if test="dutyDepart!=null">DUTY_DEPART,</if>
+            <if test="principalUser!=null">PRINCIPAL_USER,</if>
+            <if test="dutyCauseDescription!=null">DUTY_CAUSE_DESCRIPTION,</if>
+            <if test="dutyCauseType!=null">DUTY_CAUSE_TYPE,</if>
+            <if test="dutySendUserGroup!=null">DUTY_SEND_USER_GROUP,</if>
+            <if test="resolveUser!=null">RESOLVE_USER,</if>
+            <if test="resolveDateTime!=null">RESOLVE_DATE_TIME,</if>
+            <if test="abnormalMethod!=null">ABNORMAL_METHOD,</if>
+            <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="closedUser!=null">CLOSED_USER,</if>
+            <if test="closedDateTime!=null">CLOSED_DATE_TIME,</if>
+            <if test="abnormalReason!=null">ABNORMAL_REASON,</if>
+            <if test="beforeMeasure!=null">BEFORE_MEASURE,</if>
+            <if test="createdUser!=null">CREATED_USER,</if>
+            <if test="createdDataTime!=null">CREATED_DATA_TIME,</if>
+            <if test="modifiedUser!=null">MODIFIED_USER,</if>
+            <if test="modifiedDateTime!=null">MODIFIED_DATE_TIME,</if>
+        </trim> VALUES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            #{handle},
+            <if test="site!=null">#{site},</if>
+            <if test="abnormalBillBo!=null">#{abnormalBillBo},</if>
+            <if test="dutyUser!=null">#{dutyUser},</if>
+            <if test="dutyDateTime!=null">#{dutyDateTime},</if>
+            <if test="dutyDepart!=null">#{dutyDepart},</if>
+            <if test="principalUser!=null">#{principalUser},</if>
+            <if test="dutyCauseDescription!=null">#{dutyCauseDescription},</if>
+            <if test="dutyCauseType!=null">#{dutyCauseType},</if>
+            <if test="dutySendUserGroup!=null">#{dutySendUserGroup},</if>
+            <if test="resolveUser!=null">#{resolveUser},</if>
+            <if test="resolveDateTime!=null">#{resolveDateTime},</if>
+            <if test="abnormalMethod!=null">#{abnormalMethod},</if>
+            <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="closedUser!=null">#{closedUser},</if>
+            <if test="closedDateTime!=null">#{closedDateTime},</if>
+            <if test="abnormalReason!=null">#{abnormalReason},</if>
+            <if test="beforeMeasure!=null">#{beforeMeasure},</if>
+            <if test="createdUser!=null">#{createdUser},</if>
+            <if test="createdDataTime!=null">#{createdDataTime},</if>
+            <if test="modifiedUser!=null">#{modifiedUser},</if>
+            <if test="modifiedDateTime!=null">#{modifiedDateTime},</if>
+        </trim>
+    </insert>
+
+    <insert id="insertAllColumn" parameterType="com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose">
+        INSERT INTO Z_ABNORMAL_BILL_DISPOSE
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <include refid="Base_Column_List"></include>
+        </trim> VALUES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            #{handle},
+            #{site},
+            #{abnormalBillBo},
+            #{dutyUser},
+            #{dutyDateTime},
+            #{dutyDepart},
+            #{principalUser},
+            #{dutyCauseDescription},
+            #{dutyCauseType},
+            #{dutySendUserGroup},
+            #{resolveUser},
+            #{resolveDateTime},
+            #{abnormalMethod},
+            #{routerBo},
+            #{resolveShopOrder},
+            #{resolveRemark},
+            #{resolveSendUser},
+            #{closedUser},
+            #{closedDateTime},
+            #{abnormalReason},
+            #{beforeMeasure},
+            #{createdUser},
+            #{createdDataTime},
+            #{modifiedUser},
+            #{modifiedDateTime},
+        </trim>
+    </insert>
+
+
+
+
+
+
+    <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>
+        <if test="et.dutyDateTime!=null">DUTY_DATE_TIME=#{et.dutyDateTime},</if>
+        <if test="et.dutyDepart!=null">DUTY_DEPART=#{et.dutyDepart},</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.resolveSendUser!=null">RESOLVE_SEND_USER=#{et.resolveSendUser},</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>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    HANDLE=#{ew.entity.handle}
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.abnormalBillBo!=null"> AND ABNORMAL_BILL_BO=#{ew.entity.abnormalBillBo}</if>
+                    <if test="ew.entity.dutyUser!=null"> AND DUTY_USER=#{ew.entity.dutyUser}</if>
+                    <if test="ew.entity.dutyDateTime!=null"> AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime}</if>
+                    <if test="ew.entity.dutyDepart!=null"> AND DUTY_DEPART=#{ew.entity.dutyDepart}</if>
+                    <if test="ew.entity.principalUser!=null"> AND PRINCIPAL_USER=#{ew.entity.principalUser}</if>
+                    <if test="ew.entity.dutyCauseDescription!=null"> AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription}</if>
+                    <if test="ew.entity.dutyCauseType!=null"> AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType}</if>
+                    <if test="ew.entity.dutySendUserGroup!=null"> AND DUTY_SEND_USER_GROUP=#{ew.entity.dutySendUserGroup}</if>
+                    <if test="ew.entity.resolveUser!=null"> AND RESOLVE_USER=#{ew.entity.resolveUser}</if>
+                    <if test="ew.entity.resolveDateTime!=null"> AND RESOLVE_DATE_TIME=#{ew.entity.resolveDateTime}</if>
+                    <if test="ew.entity.abnormalMethod!=null"> AND ABNORMAL_METHOD=#{ew.entity.abnormalMethod}</if>
+                    <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.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>
+                    <if test="ew.entity.beforeMeasure!=null"> AND BEFORE_MEASURE=#{ew.entity.beforeMeasure}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
+                    <if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </update>
+
+
+    <delete id="deleteByMap">
+        DELETE FROM Z_ABNORMAL_BILL_DISPOSE
+        <if test="cm!=null and !cm.isEmpty">
+            <where>
+                <foreach collection="cm.keys" item="k" separator="AND">
+                    <if test="cm[k] != null">
+                        ${k} = #{cm[${k}]}
+                    </if>
+                </foreach>
+            </where>
+        </if>
+    </delete>
+
+    <delete id="delete">
+        DELETE FROM Z_ABNORMAL_BILL_DISPOSE
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.abnormalBillBo!=null"> AND ABNORMAL_BILL_BO=#{ew.entity.abnormalBillBo}</if>
+                    <if test="ew.entity.dutyUser!=null"> AND DUTY_USER=#{ew.entity.dutyUser}</if>
+                    <if test="ew.entity.dutyDateTime!=null"> AND DUTY_DATE_TIME=#{ew.entity.dutyDateTime}</if>
+                    <if test="ew.entity.dutyDepart!=null"> AND DUTY_DEPART=#{ew.entity.dutyDepart}</if>
+                    <if test="ew.entity.principalUser!=null"> AND PRINCIPAL_USER=#{ew.entity.principalUser}</if>
+                    <if test="ew.entity.dutyCauseDescription!=null"> AND DUTY_CAUSE_DESCRIPTION=#{ew.entity.dutyCauseDescription}</if>
+                    <if test="ew.entity.dutyCauseType!=null"> AND DUTY_CAUSE_TYPE=#{ew.entity.dutyCauseType}</if>
+                    <if test="ew.entity.dutySendUserGroup!=null"> AND DUTY_SEND_USER_GROUP=#{ew.entity.dutySendUserGroup}</if>
+                    <if test="ew.entity.resolveUser!=null"> AND RESOLVE_USER=#{ew.entity.resolveUser}</if>
+                    <if test="ew.entity.resolveDateTime!=null"> AND RESOLVE_DATE_TIME=#{ew.entity.resolveDateTime}</if>
+                    <if test="ew.entity.abnormalMethod!=null"> AND ABNORMAL_METHOD=#{ew.entity.abnormalMethod}</if>
+                    <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.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>
+                    <if test="ew.entity.beforeMeasure!=null"> AND BEFORE_MEASURE=#{ew.entity.beforeMeasure}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
+                    <if test="ew.entity.createdDataTime!=null"> AND CREATED_DATA_TIME=#{ew.entity.createdDataTime}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </delete>
+
+    <!-- BaseMapper标准查询/修改/删除 -->
+
+</mapper>
diff --git a/console/pom.xml b/console/pom.xml
index d8584653..f65c57fb 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -59,6 +59,11 @@
             <artifactId>production</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.foreverwin.mesnac</groupId>
+            <artifactId>anomaly</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.foreverwin.mesnac</groupId>
             <artifactId>quartz</artifactId>
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldController.java
new file mode 100644
index 00000000..e3c65c62
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldController.java
@@ -0,0 +1,131 @@
+package com.foreverwin.mesnac.meapi.controller;
+
+import com.foreverwin.modular.core.util.R;
+import com.foreverwin.modular.core.util.FrontPage;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.foreverwin.mesnac.meapi.service.DataFieldService;
+import com.foreverwin.mesnac.meapi.model.DataField;
+import java.util.List;
+
+/**
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+@RestController
+@RequestMapping("/DATA-FIELD")
+public class DataFieldController {
+
+    @Autowired
+    public DataFieldService dataFieldService;
+
+    /**
+    * 根据id查询
+    *
+    * @param id 主键
+    * @return
+    */
+    @ResponseBody
+    @GetMapping("/{id:.+}")
+    public R getDataFieldById(@PathVariable String id) {
+        return R.ok( dataFieldService.getById(id));
+    }
+
+    /**
+     * 查询所有数据
+     *
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("")
+    public R getDataFieldList(DataField dataField){
+        List<DataField> result;
+        QueryWrapper<DataField> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(dataField);
+        result = dataFieldService.list(queryWrapper);
+        return R.ok(result);
+    }
+
+    /**
+     * 分页查询数据
+     *
+     * @param frontPage  分页信息
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("/page")
+    public R page(FrontPage<DataField> frontPage, DataField dataField){
+        IPage result;
+        QueryWrapper<DataField> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(dataField);
+        if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
+            //TODO modify global query
+            queryWrapper.lambda().and(wrapper -> wrapper
+                .like(DataField::getHandle, frontPage.getGlobalQuery())
+                .or().like(DataField::getDataTypeBo, frontPage.getGlobalQuery())
+                .or().like(DataField::getDataField, frontPage.getGlobalQuery())
+                .or().like(DataField::getFieldType, frontPage.getGlobalQuery())
+                .or().like(DataField::getValidationType, frontPage.getGlobalQuery())
+                .or().like(DataField::getDataDefault, frontPage.getGlobalQuery())
+                .or().like(DataField::getSite, frontPage.getGlobalQuery())
+                .or().like(DataField::getBrowseActivityBo, frontPage.getGlobalQuery())
+                .or().like(DataField::getIsBrowse, frontPage.getGlobalQuery())
+                .or().like(DataField::getIsErp, frontPage.getGlobalQuery())
+                .or().like(DataField::getMaskGroupBo, frontPage.getGlobalQuery())
+                .or().like(DataField::getDescription, frontPage.getGlobalQuery())
+                .or().like(DataField::getValidationActivityBo, frontPage.getGlobalQuery())
+                .or().like(DataField::getCategory, frontPage.getGlobalQuery())
+    );
+        }
+        result = dataFieldService.page(frontPage.getPagePlus(), queryWrapper);
+        return R.ok(result);
+    }
+
+    /**
+     * 新增
+     * @param dataField  传递的实体
+     * @return  null 失败  实体成功
+     */
+    @PostMapping
+    public R save(@RequestBody DataField dataField) {
+        return R.ok(dataFieldService.save(dataField));
+    }
+
+    /**
+     * 修改
+     * @param dataField  传递的实体
+     * @return  null 失败  实体成功
+     */
+    @PutMapping
+    public R updateById(@RequestBody DataField dataField) {
+        return R.ok(dataFieldService.updateById(dataField));
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     * @return 0 失败  1 成功
+     */
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}")
+    public R removeById(@PathVariable("id") String id){
+        return R.ok(dataFieldService.removeById(id));
+    }
+
+    /**
+     * 批量删除对象
+     * @param ids 实体集合ID
+     * @return  0 失败  1 成功
+     */
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.POST, value = "/delete-batch")
+    public R removeByIds(List<String> ids){
+        return R.ok(dataFieldService.removeByIds(ids));
+    }
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldListController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldListController.java
new file mode 100644
index 00000000..f704488a
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DataFieldListController.java
@@ -0,0 +1,123 @@
+package com.foreverwin.mesnac.meapi.controller;
+
+import com.foreverwin.modular.core.util.R;
+import com.foreverwin.modular.core.util.FrontPage;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.foreverwin.mesnac.meapi.service.DataFieldListService;
+import com.foreverwin.mesnac.meapi.model.DataFieldList;
+import java.util.List;
+
+/**
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+@RestController
+@RequestMapping("/DATA-FIELD-LIST")
+public class DataFieldListController {
+
+    @Autowired
+    public DataFieldListService dataFieldListService;
+
+    /**
+    * 根据id查询
+    *
+    * @param id 主键
+    * @return
+    */
+    @ResponseBody
+    @GetMapping("/{id:.+}")
+    public R getDataFieldListById(@PathVariable String id) {
+        return R.ok( dataFieldListService.getById(id));
+    }
+
+    /**
+     * 查询所有数据
+     *
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("")
+    public R getDataFieldListList(DataFieldList dataFieldList){
+        List<DataFieldList> result;
+        QueryWrapper<DataFieldList> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(dataFieldList);
+        result = dataFieldListService.list(queryWrapper);
+        return R.ok(result);
+    }
+
+    /**
+     * 分页查询数据
+     *
+     * @param frontPage  分页信息
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("/page")
+    public R page(FrontPage<DataFieldList> frontPage, DataFieldList dataFieldList){
+        IPage result;
+        QueryWrapper<DataFieldList> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(dataFieldList);
+        if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
+            //TODO modify global query
+            queryWrapper.lambda().and(wrapper -> wrapper
+                .like(DataFieldList::getHandle, frontPage.getGlobalQuery())
+                .or().like(DataFieldList::getDataFieldBo, frontPage.getGlobalQuery())
+                .or().like(DataFieldList::getDataValue, frontPage.getGlobalQuery())
+                .or().like(DataFieldList::getIsDefault, frontPage.getGlobalQuery())
+                .or().like(DataFieldList::getValuation, frontPage.getGlobalQuery())
+                .or().like(DataFieldList::getErpCodeGroup, frontPage.getGlobalQuery())
+    );
+        }
+        result = dataFieldListService.page(frontPage.getPagePlus(), queryWrapper);
+        return R.ok(result);
+    }
+
+    /**
+     * 新增
+     * @param dataFieldList  传递的实体
+     * @return  null 失败  实体成功
+     */
+    @PostMapping
+    public R save(@RequestBody DataFieldList dataFieldList) {
+        return R.ok(dataFieldListService.save(dataFieldList));
+    }
+
+    /**
+     * 修改
+     * @param dataFieldList  传递的实体
+     * @return  null 失败  实体成功
+     */
+    @PutMapping
+    public R updateById(@RequestBody DataFieldList dataFieldList) {
+        return R.ok(dataFieldListService.updateById(dataFieldList));
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     * @return 0 失败  1 成功
+     */
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}")
+    public R removeById(@PathVariable("id") String id){
+        return R.ok(dataFieldListService.removeById(id));
+    }
+
+    /**
+     * 批量删除对象
+     * @param ids 实体集合ID
+     * @return  0 失败  1 成功
+     */
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.POST, value = "/delete-batch")
+    public R removeByIds(List<String> ids){
+        return R.ok(dataFieldListService.removeByIds(ids));
+    }
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java
index d926d80d..e14d5200 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java
@@ -90,4 +90,9 @@ public class ItemController {
         return R.ok(itemService.updateById(item));
     }
 
+    @GetMapping("selectById")
+    public R selectById( String itemBo){
+        return R.ok(itemService.selectById(itemBo));
+    }
+
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java
index 9c9d03e3..def3b44f 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/SfcController.java
@@ -8,12 +8,11 @@ import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.foreverwin.mesnac.meapi.model.Sfc;
+import com.foreverwin.mesnac.meapi.service.SfcService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import com.foreverwin.mesnac.meapi.service.SfcService;
-import com.foreverwin.mesnac.meapi.model.Sfc;
 import java.util.List;
 
 /**
@@ -73,11 +72,9 @@ public class SfcController {
     @GetMapping("/page")
     public R page(FrontPage<Sfc> frontPage, Sfc sfc){
         IPage result;
-
         try {
             String site = CommonMethods.getSite();
             sfc.setSite(site);
-
             QueryWrapper<Sfc> queryWrapper = new QueryWrapper<>();
             queryWrapper.setEntity(sfc);
             if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
@@ -140,4 +137,11 @@ public class SfcController {
     public R removeByIds(List<String> ids){
         return R.ok(sfcService.removeByIds(ids));
     }
+
+    @GetMapping("findBySfc")
+    public R findBySfc(Sfc sfc){
+        sfc.setSite(CommonMethods.getSite());
+        return R.ok(sfcService.findBySfc(sfc));
+    }
+
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java
index 30b119f2..a856ffe0 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java
@@ -1,17 +1,18 @@
 package com.foreverwin.mesnac.meapi.controller;
 
-import com.foreverwin.modular.core.util.R;
-import com.foreverwin.modular.core.util.FrontPage;
-import com.foreverwin.modular.core.util.CommonMethods;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.meapi.model.ShopOrder;
+import com.foreverwin.mesnac.meapi.service.ShopOrderService;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.foreverwin.modular.core.util.FrontPage;
+import com.foreverwin.modular.core.util.R;
 import com.sap.me.status.StatusBOHandle;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import com.foreverwin.mesnac.meapi.service.ShopOrderService;
-import com.foreverwin.mesnac.meapi.model.ShopOrder;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  *
@@ -25,6 +26,7 @@ public class ShopOrderController {
     @Autowired
     public ShopOrderService shopOrderService;
 
+
     /**
      * 分页查询数据
      *
@@ -64,7 +66,11 @@ public class ShopOrderController {
         } catch (Exception e) {
             return R.failed(e.getMessage());
         }
-
         return R.ok(result);
     }
+
+    @GetMapping("findByIdAndPlannedItemBo")
+    public R findByIdAndPlannedItemBo(String handle,String plannedItemBo){
+        return R.ok(shopOrderService.findByIdAndPlannedItemBo(handle,plannedItemBo));
+    }
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java
new file mode 100644
index 00000000..1d905405
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java
@@ -0,0 +1,120 @@
+package com.foreverwin.mesnac.meapi.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.meapi.model.UserGroup;
+import com.foreverwin.mesnac.meapi.service.UserGroupService;
+import com.foreverwin.modular.core.util.FrontPage;
+import com.foreverwin.modular.core.util.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+@RestController
+@RequestMapping("/USER-GROUP")
+public class UserGroupController {
+
+    @Autowired
+    public UserGroupService userGroupService;
+
+    /**
+    * 根据id查询
+    *
+    * @param id 主键
+    * @return
+    */
+    @ResponseBody
+    @GetMapping("/{id:.+}")
+    public R getUserGroupById(@PathVariable String id) {
+        return R.ok( userGroupService.getById(id));
+    }
+
+    /**
+     * 查询所有数据
+     *
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("")
+    public R getUserGroupList(UserGroup userGroup){
+        List<UserGroup> result;
+        QueryWrapper<UserGroup> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(userGroup);
+        result = userGroupService.list(queryWrapper);
+        return R.ok(result);
+    }
+
+    /**
+     * 分页查询数据
+     *
+     * @param frontPage  分页信息
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("/page")
+    public R page(FrontPage<UserGroup> frontPage, UserGroup userGroup){
+        IPage result;
+        QueryWrapper<UserGroup> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(userGroup);
+        if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
+            //TODO modify global query
+            queryWrapper.lambda().and(wrapper -> wrapper
+                .like(UserGroup::getHandle, frontPage.getGlobalQuery())
+                .or().like(UserGroup::getSite, frontPage.getGlobalQuery())
+                .or().like(UserGroup::getUserGroup, frontPage.getGlobalQuery())
+                .or().like(UserGroup::getDescription, frontPage.getGlobalQuery())
+                .or().like(UserGroup::getWorkstationBo, frontPage.getGlobalQuery())
+    );
+        }
+        result = userGroupService.page(frontPage.getPagePlus(), queryWrapper);
+        return R.ok(result);
+    }
+
+    /**
+     * 新增
+     * @param userGroup  传递的实体
+     * @return  null 失败  实体成功
+     */
+    @PostMapping
+    public R save(@RequestBody UserGroup userGroup) {
+        return R.ok(userGroupService.save(userGroup));
+    }
+
+    /**
+     * 修改
+     * @param userGroup  传递的实体
+     * @return  null 失败  实体成功
+     */
+    @PutMapping
+    public R updateById(@RequestBody UserGroup userGroup) {
+        return R.ok(userGroupService.updateById(userGroup));
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     * @return 0 失败  1 成功
+     */
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}")
+    public R removeById(@PathVariable("id") String id){
+        return R.ok(userGroupService.removeById(id));
+    }
+
+    /**
+     * 批量删除对象
+     * @param ids 实体集合ID
+     * @return  0 失败  1 成功
+     */
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.POST, value = "/delete-batch")
+    public R removeByIds(List<String> ids){
+        return R.ok(userGroupService.removeByIds(ids));
+    }
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java
index d4e21678..58a18195 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/WorkCenterController.java
@@ -47,7 +47,6 @@ public class WorkCenterController {
         try {
             String site = CommonMethods.getSite();
             workCenter.setSite(site);
-
             QueryWrapper<WorkCenter> queryWrapper = new QueryWrapper<>();
             queryWrapper.setEntity(workCenter);
             result = workCenterService.list(queryWrapper);
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldListMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldListMapper.java
new file mode 100644
index 00000000..c810a7fc
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldListMapper.java
@@ -0,0 +1,18 @@
+package com.foreverwin.mesnac.meapi.mapper;
+
+import com.foreverwin.mesnac.meapi.model.DataFieldList;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+@Repository
+public interface DataFieldListMapper extends BaseMapper<DataFieldList> {
+
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldMapper.java
new file mode 100644
index 00000000..4bbb8ef3
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/DataFieldMapper.java
@@ -0,0 +1,18 @@
+package com.foreverwin.mesnac.meapi.mapper;
+
+import com.foreverwin.mesnac.meapi.model.DataField;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+@Repository
+public interface DataFieldMapper extends BaseMapper<DataField> {
+
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java
index 42dfb822..6a29bafd 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/SfcMapper.java
@@ -24,4 +24,6 @@ public interface SfcMapper extends BaseMapper<Sfc> {
     List<Sfc> getSfcListByResrceBO(String resrceBO);
 
     SfcDto findSfcData(@Param("site") String site, @Param("sfc") String sfc);
+
+    Sfc findBySfc(@Param("sfc") Sfc sfc);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ShopOrderMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ShopOrderMapper.java
index e21f0765..9d886a83 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ShopOrderMapper.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ShopOrderMapper.java
@@ -2,6 +2,7 @@ package com.foreverwin.mesnac.meapi.mapper;
 
 import com.foreverwin.mesnac.meapi.model.ShopOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -15,4 +16,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface ShopOrderMapper extends BaseMapper<ShopOrder> {
 
+    ShopOrder findByIdAndPlannedItemBo(@Param("handle")String handle,
+                                       @Param("plannedItemBo")String plannedItemBo,
+                                       @Param("status501")String status501);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java
new file mode 100644
index 00000000..2df88a6f
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java
@@ -0,0 +1,18 @@
+package com.foreverwin.mesnac.meapi.mapper;
+
+import com.foreverwin.mesnac.meapi.model.UserGroup;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+@Repository
+public interface UserGroupMapper extends BaseMapper<UserGroup> {
+
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java
index cc0a2841..e332dc53 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Bom.java
@@ -1,16 +1,15 @@
 package com.foreverwin.mesnac.meapi.model;
 
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
+
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.List;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-
 /**
  * <p>
  * 
@@ -25,7 +24,7 @@ public class Bom extends Model<Bom> {
 
     private static final long serialVersionUID = 1L;
 
-   @TableField("HANDLE")
+   @TableId(value = "HANDLE", type = IdType.INPUT)
    private String handle;
    @TableField("CHANGE_STAMP")
    private Long changeStamp;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/BomComponent.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/BomComponent.java
index 88be2eb6..09b7f80c 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/BomComponent.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/BomComponent.java
@@ -1,6 +1,8 @@
 package com.foreverwin.mesnac.meapi.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 
@@ -22,7 +24,7 @@ public class BomComponent extends Model<BomComponent> {
 
     private static final long serialVersionUID = 1L;
 
-   @TableField("HANDLE")
+   @TableId(value = "HANDLE", type = IdType.INPUT)
    private String handle;
    @TableField("BOM_BO")
    private String bomBo;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/CustomFields.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/CustomFields.java
index 5240aa79..7ff61964 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/CustomFields.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/CustomFields.java
@@ -1,15 +1,14 @@
 package com.foreverwin.mesnac.meapi.model;
 
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableField;
+
 import java.io.Serializable;
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-
 /**
  * <p>
  * 
@@ -25,7 +24,7 @@ public class CustomFields extends Model<CustomFields> {
 
     private static final long serialVersionUID = 1L;
 
-   @TableField("HANDLE")
+   @TableId(value = "HANDLE", type = IdType.INPUT)
    private String handle;
    @TableField("ATTRIBUTE")
    private String attribute;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataField.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataField.java
new file mode 100644
index 00000000..2447e486
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataField.java
@@ -0,0 +1,246 @@
+package com.foreverwin.mesnac.meapi.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+
+@TableName("DATA_FIELD")
+
+public class DataField extends Model<DataField> {
+
+    private static final long serialVersionUID = 1L;
+
+   @TableField("HANDLE")
+   private String handle;
+   @TableField("DATA_TYPE_BO")
+   private String dataTypeBo;
+   @TableField("DATA_FIELD")
+   private String dataField;
+   @TableField("FIELD_TYPE")
+   private String fieldType;
+   @TableField("VALIDATION_TYPE")
+   private String validationType;
+   @TableField("DATA_DEFAULT")
+   private String dataDefault;
+   @TableField("SITE")
+   private String site;
+   @TableField("BROWSE_ACTIVITY_BO")
+   private String browseActivityBo;
+   @TableField("IS_BROWSE")
+   private String isBrowse;
+   @TableField("IS_ERP")
+   private String isErp;
+   @TableField("MASK_GROUP_BO")
+   private String maskGroupBo;
+   @TableField("DESCRIPTION")
+   private String description;
+   @TableField("VALIDATION_ACTIVITY_BO")
+   private String validationActivityBo;
+   @TableField("CREATED_DATE_TIME")
+   private LocalDateTime createdDateTime;
+   @TableField("MODIFIED_DATE_TIME")
+   private LocalDateTime modifiedDateTime;
+   @TableField("CATEGORY")
+   private String category;
+
+
+   public String getHandle() {
+      return handle;
+   }
+
+   public void setHandle(String handle) {
+      this.handle = handle;
+   }
+
+   public String getDataTypeBo() {
+      return dataTypeBo;
+   }
+
+   public void setDataTypeBo(String dataTypeBo) {
+      this.dataTypeBo = dataTypeBo;
+   }
+
+   public String getDataField() {
+      return dataField;
+   }
+
+   public void setDataField(String dataField) {
+      this.dataField = dataField;
+   }
+
+   public String getFieldType() {
+      return fieldType;
+   }
+
+   public void setFieldType(String fieldType) {
+      this.fieldType = fieldType;
+   }
+
+   public String getValidationType() {
+      return validationType;
+   }
+
+   public void setValidationType(String validationType) {
+      this.validationType = validationType;
+   }
+
+   public String getDataDefault() {
+      return dataDefault;
+   }
+
+   public void setDataDefault(String dataDefault) {
+      this.dataDefault = dataDefault;
+   }
+
+   public String getSite() {
+      return site;
+   }
+
+   public void setSite(String site) {
+      this.site = site;
+   }
+
+   public String getBrowseActivityBo() {
+      return browseActivityBo;
+   }
+
+   public void setBrowseActivityBo(String browseActivityBo) {
+      this.browseActivityBo = browseActivityBo;
+   }
+
+   public String getIsBrowse() {
+      return isBrowse;
+   }
+
+   public void setIsBrowse(String isBrowse) {
+      this.isBrowse = isBrowse;
+   }
+
+   public String getIsErp() {
+      return isErp;
+   }
+
+   public void setIsErp(String isErp) {
+      this.isErp = isErp;
+   }
+
+   public String getMaskGroupBo() {
+      return maskGroupBo;
+   }
+
+   public void setMaskGroupBo(String maskGroupBo) {
+      this.maskGroupBo = maskGroupBo;
+   }
+
+   public String getDescription() {
+      return description;
+   }
+
+   public void setDescription(String description) {
+      this.description = description;
+   }
+
+   public String getValidationActivityBo() {
+      return validationActivityBo;
+   }
+
+   public void setValidationActivityBo(String validationActivityBo) {
+      this.validationActivityBo = validationActivityBo;
+   }
+
+   public LocalDateTime getCreatedDateTime() {
+      return createdDateTime;
+   }
+
+   public void setCreatedDateTime(LocalDateTime createdDateTime) {
+      this.createdDateTime = createdDateTime;
+   }
+
+   public LocalDateTime getModifiedDateTime() {
+      return modifiedDateTime;
+   }
+
+   public void setModifiedDateTime(LocalDateTime modifiedDateTime) {
+      this.modifiedDateTime = modifiedDateTime;
+   }
+
+   public String getCategory() {
+      return category;
+   }
+
+   public void setCategory(String category) {
+      this.category = category;
+   }
+
+public static final String HANDLE = "HANDLE";
+
+public static final String DATA_TYPE_BO = "DATA_TYPE_BO";
+
+public static final String DATA_FIELD = "DATA_FIELD";
+
+public static final String FIELD_TYPE = "FIELD_TYPE";
+
+public static final String VALIDATION_TYPE = "VALIDATION_TYPE";
+
+public static final String DATA_DEFAULT = "DATA_DEFAULT";
+
+public static final String SITE = "SITE";
+
+public static final String BROWSE_ACTIVITY_BO = "BROWSE_ACTIVITY_BO";
+
+public static final String IS_BROWSE = "IS_BROWSE";
+
+public static final String IS_ERP = "IS_ERP";
+
+public static final String MASK_GROUP_BO = "MASK_GROUP_BO";
+
+public static final String DESCRIPTION = "DESCRIPTION";
+
+public static final String VALIDATION_ACTIVITY_BO = "VALIDATION_ACTIVITY_BO";
+
+public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME";
+
+public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
+
+public static final String CATEGORY = "CATEGORY";
+
+
+   @Override
+   protected Serializable pkVal() {
+      return this.handle;
+   }
+
+   @Override
+   public String toString() {
+      return "DataField{" +
+         "handle = " + handle +
+         ", dataTypeBo = " + dataTypeBo +
+         ", dataField = " + dataField +
+         ", fieldType = " + fieldType +
+         ", validationType = " + validationType +
+         ", dataDefault = " + dataDefault +
+         ", site = " + site +
+         ", browseActivityBo = " + browseActivityBo +
+         ", isBrowse = " + isBrowse +
+         ", isErp = " + isErp +
+         ", maskGroupBo = " + maskGroupBo +
+         ", description = " + description +
+         ", validationActivityBo = " + validationActivityBo +
+         ", createdDateTime = " + createdDateTime +
+         ", modifiedDateTime = " + modifiedDateTime +
+         ", category = " + category +
+         "}";
+   }
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataFieldList.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataFieldList.java
new file mode 100644
index 00000000..d1e35879
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/DataFieldList.java
@@ -0,0 +1,157 @@
+package com.foreverwin.mesnac.meapi.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+
+@TableName("DATA_FIELD_LIST")
+
+public class DataFieldList extends Model<DataFieldList> {
+
+    private static final long serialVersionUID = 1L;
+
+   @TableField("HANDLE")
+   private String handle;
+   @TableField("SEQUENCE")
+   private Long sequence;
+   @TableField("DATA_FIELD_BO")
+   private String dataFieldBo;
+   @TableField("DATA_VALUE")
+   private String dataValue;
+   @TableField("IS_DEFAULT")
+   private String isDefault;
+   @TableField("VALUATION")
+   private String valuation;
+   @TableField("ERP_CODE_GROUP")
+   private String erpCodeGroup;
+   @TableField("CREATED_DATE_TIME")
+   private LocalDateTime createdDateTime;
+   @TableField("MODIFIED_DATE_TIME")
+   private LocalDateTime modifiedDateTime;
+
+
+   public String getHandle() {
+      return handle;
+   }
+
+   public void setHandle(String handle) {
+      this.handle = handle;
+   }
+
+   public Long getSequence() {
+      return sequence;
+   }
+
+   public void setSequence(Long sequence) {
+      this.sequence = sequence;
+   }
+
+   public String getDataFieldBo() {
+      return dataFieldBo;
+   }
+
+   public void setDataFieldBo(String dataFieldBo) {
+      this.dataFieldBo = dataFieldBo;
+   }
+
+   public String getDataValue() {
+      return dataValue;
+   }
+
+   public void setDataValue(String dataValue) {
+      this.dataValue = dataValue;
+   }
+
+   public String getIsDefault() {
+      return isDefault;
+   }
+
+   public void setIsDefault(String isDefault) {
+      this.isDefault = isDefault;
+   }
+
+   public String getValuation() {
+      return valuation;
+   }
+
+   public void setValuation(String valuation) {
+      this.valuation = valuation;
+   }
+
+   public String getErpCodeGroup() {
+      return erpCodeGroup;
+   }
+
+   public void setErpCodeGroup(String erpCodeGroup) {
+      this.erpCodeGroup = erpCodeGroup;
+   }
+
+   public LocalDateTime getCreatedDateTime() {
+      return createdDateTime;
+   }
+
+   public void setCreatedDateTime(LocalDateTime createdDateTime) {
+      this.createdDateTime = createdDateTime;
+   }
+
+   public LocalDateTime getModifiedDateTime() {
+      return modifiedDateTime;
+   }
+
+   public void setModifiedDateTime(LocalDateTime modifiedDateTime) {
+      this.modifiedDateTime = modifiedDateTime;
+   }
+
+public static final String HANDLE = "HANDLE";
+
+public static final String SEQUENCE = "SEQUENCE";
+
+public static final String DATA_FIELD_BO = "DATA_FIELD_BO";
+
+public static final String DATA_VALUE = "DATA_VALUE";
+
+public static final String IS_DEFAULT = "IS_DEFAULT";
+
+public static final String VALUATION = "VALUATION";
+
+public static final String ERP_CODE_GROUP = "ERP_CODE_GROUP";
+
+public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME";
+
+public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
+
+
+   @Override
+   protected Serializable pkVal() {
+      return this.handle;
+   }
+
+   @Override
+   public String toString() {
+      return "DataFieldList{" +
+         "handle = " + handle +
+         ", sequence = " + sequence +
+         ", dataFieldBo = " + dataFieldBo +
+         ", dataValue = " + dataValue +
+         ", isDefault = " + isDefault +
+         ", valuation = " + valuation +
+         ", erpCodeGroup = " + erpCodeGroup +
+         ", createdDateTime = " + createdDateTime +
+         ", modifiedDateTime = " + modifiedDateTime +
+         "}";
+   }
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcCode.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcCode.java
index 725fdb16..4bd7a3f2 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcCode.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcCode.java
@@ -1,6 +1,8 @@
 package com.foreverwin.mesnac.meapi.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 
@@ -22,7 +24,7 @@ public class NcCode extends Model<NcCode> {
 
     private static final long serialVersionUID = 1L;
 
-   @TableField("HANDLE")
+   @TableId(value = "HANDLE", type = IdType.INPUT)
    private String handle;
    @TableField("CHANGE_STAMP")
    private Long changeStamp;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcGroup.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcGroup.java
index 6abf54a0..6ff7f09a 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcGroup.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NcGroup.java
@@ -1,6 +1,8 @@
 package com.foreverwin.mesnac.meapi.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 
@@ -22,7 +24,7 @@ public class NcGroup extends Model<NcGroup> {
 
     private static final long serialVersionUID = 1L;
 
-   @TableField("HANDLE")
+   @TableId(value = "HANDLE", type = IdType.INPUT)
    private String handle;
    @TableField("CHANGE_STAMP")
    private Long changeStamp;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ResourceType.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ResourceType.java
index 9467618c..192d2879 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ResourceType.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ResourceType.java
@@ -1,13 +1,13 @@
 package com.foreverwin.mesnac.meapi.model;
 
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
+
 import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -22,6 +22,7 @@ public class ResourceType extends Model<ResourceType> {
 
     private static final long serialVersionUID = 1L;
 
+   @TableId(value = "HANDLE", type = IdType.INPUT)
    @TableField("HANDLE")
    private String handle;
    @TableField("CHANGE_STAMP")
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Resrce.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Resrce.java
index 874ee010..b4b3fd75 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Resrce.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Resrce.java
@@ -1,13 +1,13 @@
 package com.foreverwin.mesnac.meapi.model;
 
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
+
 import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -22,7 +22,7 @@ public class Resrce extends Model<Resrce> {
 
     private static final long serialVersionUID = 1L;
 
-   @TableField("HANDLE")
+   @TableId(value = "HANDLE", type = IdType.INPUT)
    private String handle;
    @TableField("CHANGE_STAMP")
    private Long changeStamp;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Router.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Router.java
index 633bef3a..6b498aab 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Router.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Router.java
@@ -1,12 +1,13 @@
 package com.foreverwin.mesnac.meapi.model;
 
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.io.Serializable;
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
 
 /**
  * <p>
@@ -22,7 +23,7 @@ public class Router extends Model<Router> {
 
     private static final long serialVersionUID = 1L;
 
-   @TableId("HANDLE")
+   @TableId(value = "HANDLE", type = IdType.INPUT)
    private String handle;
    @TableField("CHANGE_STAMP")
    private Long changeStamp;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterSubstep.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterSubstep.java
index 776497b0..b4cac02b 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterSubstep.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/RouterSubstep.java
@@ -1,6 +1,8 @@
 package com.foreverwin.mesnac.meapi.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 
@@ -21,7 +23,7 @@ public class RouterSubstep extends Model<RouterSubstep> {
 
     private static final long serialVersionUID = 1L;
 
-   @TableField("HANDLE")
+   @TableId(value = "HANDLE", type = IdType.INPUT)
    private String handle;
    @TableField("ROUTER_STEP_BO")
    private String routerStepBo;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Sfc.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Sfc.java
index 273b9e6a..04ffca77 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Sfc.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/Sfc.java
@@ -1,12 +1,13 @@
 package com.foreverwin.mesnac.meapi.model;
 
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.io.Serializable;
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
 
 /**
  * <p>
@@ -22,7 +23,7 @@ public class Sfc extends Model<Sfc> {
 
     private static final long serialVersionUID = 1L;
 
-   @TableId("HANDLE")
+   @TableId(value = "HANDLE", type = IdType.INPUT)
    private String handle;
    @TableField("CHANGE_STAMP")
    private Long changeStamp;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/SfcBom.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/SfcBom.java
index b52a378d..5753b517 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/SfcBom.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/SfcBom.java
@@ -1,6 +1,8 @@
 package com.foreverwin.mesnac.meapi.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 
@@ -22,7 +24,7 @@ public class SfcBom extends Model<SfcBom> {
 
     private static final long serialVersionUID = 1L;
 
-   @TableField("HANDLE")
+   @TableId(value = "HANDLE", type = IdType.INPUT)
    private String handle;
    @TableField("CHANGE_STAMP")
    private Long changeStamp;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java
index 40f77cc3..d2e8f43d 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java
@@ -24,7 +24,7 @@ public class ShopOrder extends Model<ShopOrder> {
 
    private static final long serialVersionUID = 1L;
 
-   @TableId("HANDLE")
+   @TableId(value = "HANDLE", type = IdType.INPUT)
    private String handle;
    @TableField("CHANGE_STAMP")
    private Long changeStamp;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/UserGroup.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/UserGroup.java
new file mode 100644
index 00000000..e3da2af6
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/UserGroup.java
@@ -0,0 +1,142 @@
+package com.foreverwin.mesnac.meapi.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+
+@TableName("USER_GROUP")
+
+public class UserGroup extends Model<UserGroup> {
+
+    private static final long serialVersionUID = 1L;
+
+   @TableField("HANDLE")
+   private String handle;
+   @TableField("CHANGE_STAMP")
+   private Long changeStamp;
+   @TableField("SITE")
+   private String site;
+   @TableField("USER_GROUP")
+   private String userGroup;
+   @TableField("DESCRIPTION")
+   private String description;
+   @TableField("WORKSTATION_BO")
+   private String workstationBo;
+   @TableField("CREATED_DATE_TIME")
+   private LocalDateTime createdDateTime;
+   @TableField("MODIFIED_DATE_TIME")
+   private LocalDateTime modifiedDateTime;
+
+
+   public String getHandle() {
+      return handle;
+   }
+
+   public void setHandle(String handle) {
+      this.handle = handle;
+   }
+
+   public Long getChangeStamp() {
+      return changeStamp;
+   }
+
+   public void setChangeStamp(Long changeStamp) {
+      this.changeStamp = changeStamp;
+   }
+
+   public String getSite() {
+      return site;
+   }
+
+   public void setSite(String site) {
+      this.site = site;
+   }
+
+   public String getUserGroup() {
+      return userGroup;
+   }
+
+   public void setUserGroup(String userGroup) {
+      this.userGroup = userGroup;
+   }
+
+   public String getDescription() {
+      return description;
+   }
+
+   public void setDescription(String description) {
+      this.description = description;
+   }
+
+   public String getWorkstationBo() {
+      return workstationBo;
+   }
+
+   public void setWorkstationBo(String workstationBo) {
+      this.workstationBo = workstationBo;
+   }
+
+   public LocalDateTime getCreatedDateTime() {
+      return createdDateTime;
+   }
+
+   public void setCreatedDateTime(LocalDateTime createdDateTime) {
+      this.createdDateTime = createdDateTime;
+   }
+
+   public LocalDateTime getModifiedDateTime() {
+      return modifiedDateTime;
+   }
+
+   public void setModifiedDateTime(LocalDateTime modifiedDateTime) {
+      this.modifiedDateTime = modifiedDateTime;
+   }
+
+public static final String HANDLE = "HANDLE";
+
+public static final String CHANGE_STAMP = "CHANGE_STAMP";
+
+public static final String SITE = "SITE";
+
+public static final String USER_GROUP = "USER_GROUP";
+
+public static final String DESCRIPTION = "DESCRIPTION";
+
+public static final String WORKSTATION_BO = "WORKSTATION_BO";
+
+public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME";
+
+public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
+
+
+   @Override
+   protected Serializable pkVal() {
+      return this.handle;
+   }
+
+   @Override
+   public String toString() {
+      return "UserGroup{" +
+         "handle = " + handle +
+         ", changeStamp = " + changeStamp +
+         ", site = " + site +
+         ", userGroup = " + userGroup +
+         ", description = " + description +
+         ", workstationBo = " + workstationBo +
+         ", createdDateTime = " + createdDateTime +
+         ", modifiedDateTime = " + modifiedDateTime +
+         "}";
+   }
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/WorkCenterMember.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/WorkCenterMember.java
index 2f5f59bb..ba9e76c3 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/WorkCenterMember.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/WorkCenterMember.java
@@ -1,12 +1,12 @@
 package com.foreverwin.mesnac.meapi.model;
 
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableField;
+
 import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
 
 /**
  * <p>
@@ -21,7 +21,7 @@ public class WorkCenterMember extends Model<WorkCenterMember> {
 
     private static final long serialVersionUID = 1L;
 
-   @TableField("HANDLE")
+   @TableId(value = "HANDLE", type = IdType.INPUT)
    private String handle;
    @TableField("WORK_CENTER_BO")
    private String workCenterBo;
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldListService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldListService.java
new file mode 100644
index 00000000..70518101
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldListService.java
@@ -0,0 +1,28 @@
+package com.foreverwin.mesnac.meapi.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.meapi.model.DataFieldList;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.modular.core.util.FrontPage;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+public interface DataFieldListService extends IService<DataFieldList> {
+
+    /**
+     *  分页查询
+     * @param frontPage
+     * @return
+     */
+    IPage<DataFieldList> selectPage(FrontPage<DataFieldList> frontPage, DataFieldList dataFieldList);
+
+    List<DataFieldList> selectList(DataFieldList dataFieldList);
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldService.java
new file mode 100644
index 00000000..b61eb63a
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/DataFieldService.java
@@ -0,0 +1,28 @@
+package com.foreverwin.mesnac.meapi.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.meapi.model.DataField;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.modular.core.util.FrontPage;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+public interface DataFieldService extends IService<DataField> {
+
+    /**
+     *  分页查询
+     * @param frontPage
+     * @return
+     */
+    IPage<DataField> selectPage(FrontPage<DataField> frontPage, DataField dataField);
+
+    List<DataField> selectList(DataField dataField);
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java
index 5a7f5ac7..1c815ddf 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/SfcService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.foreverwin.mesnac.meapi.dto.SfcDto;
 import com.foreverwin.mesnac.meapi.model.Sfc;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.mesnac.meapi.model.Sfc;
 import com.foreverwin.modular.core.util.FrontPage;
 
 import java.util.List;
@@ -37,6 +38,8 @@ public interface SfcService extends IService<Sfc> {
      */
     List<Sfc> getSfcListByResrceBO(String resrceBO);
 
+    Sfc findBySfc(Sfc sfc);
+
     /**
      * 查询生产批次的基本信息
      *
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java
index b86ea30a..f5ab0789 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java
@@ -1,8 +1,8 @@
 package com.foreverwin.mesnac.meapi.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.foreverwin.mesnac.meapi.model.ShopOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.mesnac.meapi.model.ShopOrder;
 import com.foreverwin.modular.core.util.FrontPage;
 
 import java.util.List;
@@ -25,4 +25,6 @@ public interface ShopOrderService extends IService<ShopOrder> {
     IPage<ShopOrder> selectPage(FrontPage<ShopOrder> frontPage, ShopOrder shopOrder);
 
     List<ShopOrder> selectList(ShopOrder shopOrder);
+
+    ShopOrder findByIdAndPlannedItemBo(String handle,String plannedItemBo);
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java
new file mode 100644
index 00000000..e5f1a6ba
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java
@@ -0,0 +1,28 @@
+package com.foreverwin.mesnac.meapi.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.meapi.model.UserGroup;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.modular.core.util.FrontPage;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+public interface UserGroupService extends IService<UserGroup> {
+
+    /**
+     *  分页查询
+     * @param frontPage
+     * @return
+     */
+    IPage<UserGroup> selectPage(FrontPage<UserGroup> frontPage, UserGroup userGroup);
+
+    List<UserGroup> selectList(UserGroup userGroup);
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldListServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldListServiceImpl.java
new file mode 100644
index 00000000..146ed9c2
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldListServiceImpl.java
@@ -0,0 +1,46 @@
+package com.foreverwin.mesnac.meapi.service.impl;
+
+import com.foreverwin.modular.core.util.FrontPage;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.meapi.model.DataFieldList;
+import com.foreverwin.mesnac.meapi.mapper.DataFieldListMapper;
+import com.foreverwin.mesnac.meapi.service.DataFieldListService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class DataFieldListServiceImpl extends ServiceImpl<DataFieldListMapper, DataFieldList> implements DataFieldListService {
+
+
+    @Autowired
+    private DataFieldListMapper dataFieldListMapper;
+
+    @Override
+    public IPage<DataFieldList> selectPage(FrontPage<DataFieldList> frontPage, DataFieldList dataFieldList) {
+        QueryWrapper<DataFieldList> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(dataFieldList);
+        return super.page(frontPage.getPagePlus(), queryWrapper);
+    }
+
+    @Override
+    public List<DataFieldList> selectList(DataFieldList dataFieldList) {
+        QueryWrapper<DataFieldList> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(dataFieldList);
+        return super.list(queryWrapper);
+    }
+
+
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldServiceImpl.java
new file mode 100644
index 00000000..9b3602c3
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/DataFieldServiceImpl.java
@@ -0,0 +1,46 @@
+package com.foreverwin.mesnac.meapi.service.impl;
+
+import com.foreverwin.modular.core.util.FrontPage;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.meapi.model.DataField;
+import com.foreverwin.mesnac.meapi.mapper.DataFieldMapper;
+import com.foreverwin.mesnac.meapi.service.DataFieldService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class DataFieldServiceImpl extends ServiceImpl<DataFieldMapper, DataField> implements DataFieldService {
+
+
+    @Autowired
+    private DataFieldMapper dataFieldMapper;
+
+    @Override
+    public IPage<DataField> selectPage(FrontPage<DataField> frontPage, DataField dataField) {
+        QueryWrapper<DataField> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(dataField);
+        return super.page(frontPage.getPagePlus(), queryWrapper);
+    }
+
+    @Override
+    public List<DataField> selectList(DataField dataField) {
+        QueryWrapper<DataField> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(dataField);
+        return super.list(queryWrapper);
+    }
+
+
+}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java
index 5871376d..58b512cc 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/SfcServiceImpl.java
@@ -4,12 +4,12 @@ import com.foreverwin.mesnac.meapi.dto.SfcDto;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.foreverwin.mesnac.meapi.model.Sfc;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mesnac.meapi.mapper.SfcMapper;
+import com.foreverwin.mesnac.meapi.model.Sfc;
 import com.foreverwin.mesnac.meapi.service.SfcService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -58,10 +58,13 @@ public class SfcServiceImpl extends ServiceImpl<SfcMapper, Sfc> implements SfcSe
         return sfc;
     }
 
+    @Override
+    public Sfc findBySfc(Sfc sfc) {
+        return sfcMapper.findBySfc(sfc);
+    }
+
     @Override
     public SfcDto findSfcData(String site, String sfc) {
         return sfcMapper.findSfcData(site, sfc);
     }
-
-
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java
index d332510e..13d828ce 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java
@@ -1,5 +1,6 @@
 package com.foreverwin.mesnac.meapi.service.impl;
 
+import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,6 +8,7 @@ import com.foreverwin.mesnac.meapi.model.ShopOrder;
 import com.foreverwin.mesnac.meapi.mapper.ShopOrderMapper;
 import com.foreverwin.mesnac.meapi.service.ShopOrderService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sap.me.status.StatusBOHandle;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -42,5 +44,12 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
         return super.list(queryWrapper);
     }
 
+    @Override
+    public ShopOrder findByIdAndPlannedItemBo(String handle, String plannedItemBo) {
+        String site = CommonMethods.getSite();
+        String status501 = new StatusBOHandle(site,"501").getValue();
+        return shopOrderMapper.findByIdAndPlannedItemBo(handle,plannedItemBo,status501);
+    }
+
 
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/UserGroupServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/UserGroupServiceImpl.java
new file mode 100644
index 00000000..ddb7b841
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/UserGroupServiceImpl.java
@@ -0,0 +1,46 @@
+package com.foreverwin.mesnac.meapi.service.impl;
+
+import com.foreverwin.modular.core.util.FrontPage;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.meapi.model.UserGroup;
+import com.foreverwin.mesnac.meapi.mapper.UserGroupMapper;
+import com.foreverwin.mesnac.meapi.service.UserGroupService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author robert
+ * @since 2021-06-29
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class UserGroupServiceImpl extends ServiceImpl<UserGroupMapper, UserGroup> implements UserGroupService {
+
+
+    @Autowired
+    private UserGroupMapper userGroupMapper;
+
+    @Override
+    public IPage<UserGroup> selectPage(FrontPage<UserGroup> frontPage, UserGroup userGroup) {
+        QueryWrapper<UserGroup> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(userGroup);
+        return super.page(frontPage.getPagePlus(), queryWrapper);
+    }
+
+    @Override
+    public List<UserGroup> selectList(UserGroup userGroup) {
+        QueryWrapper<UserGroup> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(userGroup);
+        return super.list(queryWrapper);
+    }
+
+
+}
\ No newline at end of file
diff --git a/meapi/src/main/resources/mapper/DataFieldListMapper.xml b/meapi/src/main/resources/mapper/DataFieldListMapper.xml
new file mode 100644
index 00000000..d0200842
--- /dev/null
+++ b/meapi/src/main/resources/mapper/DataFieldListMapper.xml
@@ -0,0 +1,346 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.foreverwin.mesnac.meapi.mapper.DataFieldListMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.foreverwin.mesnac.meapi.model.DataFieldList">
+        <result column="HANDLE" property="handle" />
+        <result column="SEQUENCE" property="sequence" />
+        <result column="DATA_FIELD_BO" property="dataFieldBo" />
+        <result column="DATA_VALUE" property="dataValue" />
+        <result column="IS_DEFAULT" property="isDefault" />
+        <result column="VALUATION" property="valuation" />
+        <result column="ERP_CODE_GROUP" property="erpCodeGroup" />
+        <result column="CREATED_DATE_TIME" property="createdDateTime" />
+        <result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        HANDLE, SEQUENCE, DATA_FIELD_BO, DATA_VALUE, IS_DEFAULT, VALUATION, ERP_CODE_GROUP, CREATED_DATE_TIME, MODIFIED_DATE_TIME
+    </sql>
+
+    <!-- BaseMapper标准查询/修改/删除 -->
+
+    <select id="selectByMap" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include>
+        FROM DATA_FIELD_LIST
+        <if test="cm!=null and !cm.isEmpty">
+            <where>
+                <foreach collection="cm.keys" item="k" separator="AND">
+                    <if test="cm[k] != null">
+                        ${k} = #{cm[${k}]}
+                    </if>
+                </foreach>
+            </where>
+        </if>
+    </select>
+
+
+    <select id="selectOne" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include> FROM DATA_FIELD_LIST
+        <where>
+            <if test="ew.entity.handle!=null">
+              HANDLE=#{ew.handle}
+            </if>
+            <if test="ew.entity.sequence!=null"> AND SEQUENCE=#{ew.entity.sequence}</if>
+            <if test="ew.entity.dataFieldBo!=null"> AND DATA_FIELD_BO=#{ew.entity.dataFieldBo}</if>
+            <if test="ew.entity.dataValue!=null"> AND DATA_VALUE=#{ew.entity.dataValue}</if>
+            <if test="ew.entity.isDefault!=null"> AND IS_DEFAULT=#{ew.entity.isDefault}</if>
+            <if test="ew.entity.valuation!=null"> AND VALUATION=#{ew.entity.valuation}</if>
+            <if test="ew.entity.erpCodeGroup!=null"> AND ERP_CODE_GROUP=#{ew.entity.erpCodeGroup}</if>
+            <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+            <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+        </where>
+    </select>
+
+    <select id="selectCount" resultType="Integer">
+        SELECT COUNT(1) FROM DATA_FIELD_LIST
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                <if test="ew.entity.handle!=null">
+                    HANDLE=#{ew.entity.handle}
+                </if>
+                <if test="ew.entity.sequence!=null"> AND SEQUENCE=#{ew.entity.sequence}</if>
+                <if test="ew.entity.dataFieldBo!=null"> AND DATA_FIELD_BO=#{ew.entity.dataFieldBo}</if>
+                <if test="ew.entity.dataValue!=null"> AND DATA_VALUE=#{ew.entity.dataValue}</if>
+                <if test="ew.entity.isDefault!=null"> AND IS_DEFAULT=#{ew.entity.isDefault}</if>
+                <if test="ew.entity.valuation!=null"> AND VALUATION=#{ew.entity.valuation}</if>
+                <if test="ew.entity.erpCodeGroup!=null"> AND ERP_CODE_GROUP=#{ew.entity.erpCodeGroup}</if>
+                <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectList" resultMap="BaseResultMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM DATA_FIELD_LIST
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.sequence!=null"> AND SEQUENCE=#{ew.entity.sequence}</if>
+                    <if test="ew.entity.dataFieldBo!=null"> AND DATA_FIELD_BO=#{ew.entity.dataFieldBo}</if>
+                    <if test="ew.entity.dataValue!=null"> AND DATA_VALUE=#{ew.entity.dataValue}</if>
+                    <if test="ew.entity.isDefault!=null"> AND IS_DEFAULT=#{ew.entity.isDefault}</if>
+                    <if test="ew.entity.valuation!=null"> AND VALUATION=#{ew.entity.valuation}</if>
+                    <if test="ew.entity.erpCodeGroup!=null"> AND ERP_CODE_GROUP=#{ew.entity.erpCodeGroup}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectMaps" resultType="HashMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM DATA_FIELD_LIST
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.sequence!=null"> AND SEQUENCE=#{ew.entity.sequence}</if>
+                    <if test="ew.entity.dataFieldBo!=null"> AND DATA_FIELD_BO=#{ew.entity.dataFieldBo}</if>
+                    <if test="ew.entity.dataValue!=null"> AND DATA_VALUE=#{ew.entity.dataValue}</if>
+                    <if test="ew.entity.isDefault!=null"> AND IS_DEFAULT=#{ew.entity.isDefault}</if>
+                    <if test="ew.entity.valuation!=null"> AND VALUATION=#{ew.entity.valuation}</if>
+                    <if test="ew.entity.erpCodeGroup!=null"> AND ERP_CODE_GROUP=#{ew.entity.erpCodeGroup}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectObjs" resultType="Object">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM DATA_FIELD_LIST
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.sequence!=null"> AND SEQUENCE=#{ew.entity.sequence}</if>
+                    <if test="ew.entity.dataFieldBo!=null"> AND DATA_FIELD_BO=#{ew.entity.dataFieldBo}</if>
+                    <if test="ew.entity.dataValue!=null"> AND DATA_VALUE=#{ew.entity.dataValue}</if>
+                    <if test="ew.entity.isDefault!=null"> AND IS_DEFAULT=#{ew.entity.isDefault}</if>
+                    <if test="ew.entity.valuation!=null"> AND VALUATION=#{ew.entity.valuation}</if>
+                    <if test="ew.entity.erpCodeGroup!=null"> AND ERP_CODE_GROUP=#{ew.entity.erpCodeGroup}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectPage" resultMap="BaseResultMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM DATA_FIELD_LIST
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.sequence!=null"> AND SEQUENCE=#{ew.entity.sequence}</if>
+                    <if test="ew.entity.dataFieldBo!=null"> AND DATA_FIELD_BO=#{ew.entity.dataFieldBo}</if>
+                    <if test="ew.entity.dataValue!=null"> AND DATA_VALUE=#{ew.entity.dataValue}</if>
+                    <if test="ew.entity.isDefault!=null"> AND IS_DEFAULT=#{ew.entity.isDefault}</if>
+                    <if test="ew.entity.valuation!=null"> AND VALUATION=#{ew.entity.valuation}</if>
+                    <if test="ew.entity.erpCodeGroup!=null"> AND ERP_CODE_GROUP=#{ew.entity.erpCodeGroup}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectMapsPage" resultType="HashMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM DATA_FIELD_LIST
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.sequence!=null"> AND SEQUENCE=#{ew.entity.sequence}</if>
+                    <if test="ew.entity.dataFieldBo!=null"> AND DATA_FIELD_BO=#{ew.entity.dataFieldBo}</if>
+                    <if test="ew.entity.dataValue!=null"> AND DATA_VALUE=#{ew.entity.dataValue}</if>
+                    <if test="ew.entity.isDefault!=null"> AND IS_DEFAULT=#{ew.entity.isDefault}</if>
+                    <if test="ew.entity.valuation!=null"> AND VALUATION=#{ew.entity.valuation}</if>
+                    <if test="ew.entity.erpCodeGroup!=null"> AND ERP_CODE_GROUP=#{ew.entity.erpCodeGroup}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <insert id="insert" parameterType="com.foreverwin.mesnac.meapi.model.DataFieldList">
+        INSERT INTO DATA_FIELD_LIST
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            HANDLE,
+            <if test="sequence!=null">SEQUENCE,</if>
+            <if test="dataFieldBo!=null">DATA_FIELD_BO,</if>
+            <if test="dataValue!=null">DATA_VALUE,</if>
+            <if test="isDefault!=null">IS_DEFAULT,</if>
+            <if test="valuation!=null">VALUATION,</if>
+            <if test="erpCodeGroup!=null">ERP_CODE_GROUP,</if>
+            <if test="createdDateTime!=null">CREATED_DATE_TIME,</if>
+            <if test="modifiedDateTime!=null">MODIFIED_DATE_TIME,</if>
+        </trim> VALUES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            #{handle},
+            <if test="sequence!=null">#{sequence},</if>
+            <if test="dataFieldBo!=null">#{dataFieldBo},</if>
+            <if test="dataValue!=null">#{dataValue},</if>
+            <if test="isDefault!=null">#{isDefault},</if>
+            <if test="valuation!=null">#{valuation},</if>
+            <if test="erpCodeGroup!=null">#{erpCodeGroup},</if>
+            <if test="createdDateTime!=null">#{createdDateTime},</if>
+            <if test="modifiedDateTime!=null">#{modifiedDateTime},</if>
+        </trim>
+    </insert>
+
+    <insert id="insertAllColumn" parameterType="com.foreverwin.mesnac.meapi.model.DataFieldList">
+        INSERT INTO DATA_FIELD_LIST
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <include refid="Base_Column_List"></include>
+        </trim> VALUES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            #{handle},
+            #{sequence},
+            #{dataFieldBo},
+            #{dataValue},
+            #{isDefault},
+            #{valuation},
+            #{erpCodeGroup},
+            #{createdDateTime},
+            #{modifiedDateTime},
+        </trim>
+    </insert>
+
+
+
+
+
+
+    <update id="update">
+        UPDATE DATA_FIELD_LIST <trim prefix="SET" suffixOverrides=",">
+        <if test="et.handle!=null">HANDLE=#{et.handle},</if>
+        <if test="et.sequence!=null">SEQUENCE=#{et.sequence},</if>
+        <if test="et.dataFieldBo!=null">DATA_FIELD_BO=#{et.dataFieldBo},</if>
+        <if test="et.dataValue!=null">DATA_VALUE=#{et.dataValue},</if>
+        <if test="et.isDefault!=null">IS_DEFAULT=#{et.isDefault},</if>
+        <if test="et.valuation!=null">VALUATION=#{et.valuation},</if>
+        <if test="et.erpCodeGroup!=null">ERP_CODE_GROUP=#{et.erpCodeGroup},</if>
+        <if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
+        <if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
+    </trim>
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    HANDLE=#{ew.entity.handle}
+                    <if test="ew.entity.sequence!=null"> AND SEQUENCE=#{ew.entity.sequence}</if>
+                    <if test="ew.entity.dataFieldBo!=null"> AND DATA_FIELD_BO=#{ew.entity.dataFieldBo}</if>
+                    <if test="ew.entity.dataValue!=null"> AND DATA_VALUE=#{ew.entity.dataValue}</if>
+                    <if test="ew.entity.isDefault!=null"> AND IS_DEFAULT=#{ew.entity.isDefault}</if>
+                    <if test="ew.entity.valuation!=null"> AND VALUATION=#{ew.entity.valuation}</if>
+                    <if test="ew.entity.erpCodeGroup!=null"> AND ERP_CODE_GROUP=#{ew.entity.erpCodeGroup}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </update>
+
+
+    <delete id="deleteByMap">
+        DELETE FROM DATA_FIELD_LIST
+        <if test="cm!=null and !cm.isEmpty">
+            <where>
+                <foreach collection="cm.keys" item="k" separator="AND">
+                    <if test="cm[k] != null">
+                        ${k} = #{cm[${k}]}
+                    </if>
+                </foreach>
+            </where>
+        </if>
+    </delete>
+
+    <delete id="delete">
+        DELETE FROM DATA_FIELD_LIST
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.sequence!=null"> AND SEQUENCE=#{ew.entity.sequence}</if>
+                    <if test="ew.entity.dataFieldBo!=null"> AND DATA_FIELD_BO=#{ew.entity.dataFieldBo}</if>
+                    <if test="ew.entity.dataValue!=null"> AND DATA_VALUE=#{ew.entity.dataValue}</if>
+                    <if test="ew.entity.isDefault!=null"> AND IS_DEFAULT=#{ew.entity.isDefault}</if>
+                    <if test="ew.entity.valuation!=null"> AND VALUATION=#{ew.entity.valuation}</if>
+                    <if test="ew.entity.erpCodeGroup!=null"> AND ERP_CODE_GROUP=#{ew.entity.erpCodeGroup}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </delete>
+
+    <!-- BaseMapper标准查询/修改/删除 -->
+
+</mapper>
diff --git a/meapi/src/main/resources/mapper/DataFieldMapper.xml b/meapi/src/main/resources/mapper/DataFieldMapper.xml
new file mode 100644
index 00000000..debaa0e1
--- /dev/null
+++ b/meapi/src/main/resources/mapper/DataFieldMapper.xml
@@ -0,0 +1,444 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.foreverwin.mesnac.meapi.mapper.DataFieldMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.foreverwin.mesnac.meapi.model.DataField">
+        <result column="HANDLE" property="handle" />
+        <result column="DATA_TYPE_BO" property="dataTypeBo" />
+        <result column="DATA_FIELD" property="dataField" />
+        <result column="FIELD_TYPE" property="fieldType" />
+        <result column="VALIDATION_TYPE" property="validationType" />
+        <result column="DATA_DEFAULT" property="dataDefault" />
+        <result column="SITE" property="site" />
+        <result column="BROWSE_ACTIVITY_BO" property="browseActivityBo" />
+        <result column="IS_BROWSE" property="isBrowse" />
+        <result column="IS_ERP" property="isErp" />
+        <result column="MASK_GROUP_BO" property="maskGroupBo" />
+        <result column="DESCRIPTION" property="description" />
+        <result column="VALIDATION_ACTIVITY_BO" property="validationActivityBo" />
+        <result column="CREATED_DATE_TIME" property="createdDateTime" />
+        <result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
+        <result column="CATEGORY" property="category" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        HANDLE, DATA_TYPE_BO, DATA_FIELD, FIELD_TYPE, VALIDATION_TYPE, DATA_DEFAULT, SITE, BROWSE_ACTIVITY_BO, IS_BROWSE, IS_ERP, MASK_GROUP_BO, DESCRIPTION, VALIDATION_ACTIVITY_BO, CREATED_DATE_TIME, MODIFIED_DATE_TIME, CATEGORY
+    </sql>
+
+    <!-- BaseMapper标准查询/修改/删除 -->
+
+    <select id="selectByMap" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include>
+        FROM DATA_FIELD
+        <if test="cm!=null and !cm.isEmpty">
+            <where>
+                <foreach collection="cm.keys" item="k" separator="AND">
+                    <if test="cm[k] != null">
+                        ${k} = #{cm[${k}]}
+                    </if>
+                </foreach>
+            </where>
+        </if>
+    </select>
+
+
+    <select id="selectOne" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include> FROM DATA_FIELD
+        <where>
+            <if test="ew.entity.handle!=null">
+              HANDLE=#{ew.handle}
+            </if>
+            <if test="ew.entity.dataTypeBo!=null"> AND DATA_TYPE_BO=#{ew.entity.dataTypeBo}</if>
+            <if test="ew.entity.dataField!=null"> AND DATA_FIELD=#{ew.entity.dataField}</if>
+            <if test="ew.entity.fieldType!=null"> AND FIELD_TYPE=#{ew.entity.fieldType}</if>
+            <if test="ew.entity.validationType!=null"> AND VALIDATION_TYPE=#{ew.entity.validationType}</if>
+            <if test="ew.entity.dataDefault!=null"> AND DATA_DEFAULT=#{ew.entity.dataDefault}</if>
+            <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+            <if test="ew.entity.browseActivityBo!=null"> AND BROWSE_ACTIVITY_BO=#{ew.entity.browseActivityBo}</if>
+            <if test="ew.entity.isBrowse!=null"> AND IS_BROWSE=#{ew.entity.isBrowse}</if>
+            <if test="ew.entity.isErp!=null"> AND IS_ERP=#{ew.entity.isErp}</if>
+            <if test="ew.entity.maskGroupBo!=null"> AND MASK_GROUP_BO=#{ew.entity.maskGroupBo}</if>
+            <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
+            <if test="ew.entity.validationActivityBo!=null"> AND VALIDATION_ACTIVITY_BO=#{ew.entity.validationActivityBo}</if>
+            <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+            <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+            <if test="ew.entity.category!=null"> AND CATEGORY=#{ew.entity.category}</if>
+        </where>
+    </select>
+
+    <select id="selectCount" resultType="Integer">
+        SELECT COUNT(1) FROM DATA_FIELD
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                <if test="ew.entity.handle!=null">
+                    HANDLE=#{ew.entity.handle}
+                </if>
+                <if test="ew.entity.dataTypeBo!=null"> AND DATA_TYPE_BO=#{ew.entity.dataTypeBo}</if>
+                <if test="ew.entity.dataField!=null"> AND DATA_FIELD=#{ew.entity.dataField}</if>
+                <if test="ew.entity.fieldType!=null"> AND FIELD_TYPE=#{ew.entity.fieldType}</if>
+                <if test="ew.entity.validationType!=null"> AND VALIDATION_TYPE=#{ew.entity.validationType}</if>
+                <if test="ew.entity.dataDefault!=null"> AND DATA_DEFAULT=#{ew.entity.dataDefault}</if>
+                <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                <if test="ew.entity.browseActivityBo!=null"> AND BROWSE_ACTIVITY_BO=#{ew.entity.browseActivityBo}</if>
+                <if test="ew.entity.isBrowse!=null"> AND IS_BROWSE=#{ew.entity.isBrowse}</if>
+                <if test="ew.entity.isErp!=null"> AND IS_ERP=#{ew.entity.isErp}</if>
+                <if test="ew.entity.maskGroupBo!=null"> AND MASK_GROUP_BO=#{ew.entity.maskGroupBo}</if>
+                <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
+                <if test="ew.entity.validationActivityBo!=null"> AND VALIDATION_ACTIVITY_BO=#{ew.entity.validationActivityBo}</if>
+                <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                <if test="ew.entity.category!=null"> AND CATEGORY=#{ew.entity.category}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectList" resultMap="BaseResultMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM DATA_FIELD
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.dataTypeBo!=null"> AND DATA_TYPE_BO=#{ew.entity.dataTypeBo}</if>
+                    <if test="ew.entity.dataField!=null"> AND DATA_FIELD=#{ew.entity.dataField}</if>
+                    <if test="ew.entity.fieldType!=null"> AND FIELD_TYPE=#{ew.entity.fieldType}</if>
+                    <if test="ew.entity.validationType!=null"> AND VALIDATION_TYPE=#{ew.entity.validationType}</if>
+                    <if test="ew.entity.dataDefault!=null"> AND DATA_DEFAULT=#{ew.entity.dataDefault}</if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.browseActivityBo!=null"> AND BROWSE_ACTIVITY_BO=#{ew.entity.browseActivityBo}</if>
+                    <if test="ew.entity.isBrowse!=null"> AND IS_BROWSE=#{ew.entity.isBrowse}</if>
+                    <if test="ew.entity.isErp!=null"> AND IS_ERP=#{ew.entity.isErp}</if>
+                    <if test="ew.entity.maskGroupBo!=null"> AND MASK_GROUP_BO=#{ew.entity.maskGroupBo}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
+                    <if test="ew.entity.validationActivityBo!=null"> AND VALIDATION_ACTIVITY_BO=#{ew.entity.validationActivityBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                    <if test="ew.entity.category!=null"> AND CATEGORY=#{ew.entity.category}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectMaps" resultType="HashMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM DATA_FIELD
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.dataTypeBo!=null"> AND DATA_TYPE_BO=#{ew.entity.dataTypeBo}</if>
+                    <if test="ew.entity.dataField!=null"> AND DATA_FIELD=#{ew.entity.dataField}</if>
+                    <if test="ew.entity.fieldType!=null"> AND FIELD_TYPE=#{ew.entity.fieldType}</if>
+                    <if test="ew.entity.validationType!=null"> AND VALIDATION_TYPE=#{ew.entity.validationType}</if>
+                    <if test="ew.entity.dataDefault!=null"> AND DATA_DEFAULT=#{ew.entity.dataDefault}</if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.browseActivityBo!=null"> AND BROWSE_ACTIVITY_BO=#{ew.entity.browseActivityBo}</if>
+                    <if test="ew.entity.isBrowse!=null"> AND IS_BROWSE=#{ew.entity.isBrowse}</if>
+                    <if test="ew.entity.isErp!=null"> AND IS_ERP=#{ew.entity.isErp}</if>
+                    <if test="ew.entity.maskGroupBo!=null"> AND MASK_GROUP_BO=#{ew.entity.maskGroupBo}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
+                    <if test="ew.entity.validationActivityBo!=null"> AND VALIDATION_ACTIVITY_BO=#{ew.entity.validationActivityBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                    <if test="ew.entity.category!=null"> AND CATEGORY=#{ew.entity.category}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectObjs" resultType="Object">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM DATA_FIELD
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.dataTypeBo!=null"> AND DATA_TYPE_BO=#{ew.entity.dataTypeBo}</if>
+                    <if test="ew.entity.dataField!=null"> AND DATA_FIELD=#{ew.entity.dataField}</if>
+                    <if test="ew.entity.fieldType!=null"> AND FIELD_TYPE=#{ew.entity.fieldType}</if>
+                    <if test="ew.entity.validationType!=null"> AND VALIDATION_TYPE=#{ew.entity.validationType}</if>
+                    <if test="ew.entity.dataDefault!=null"> AND DATA_DEFAULT=#{ew.entity.dataDefault}</if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.browseActivityBo!=null"> AND BROWSE_ACTIVITY_BO=#{ew.entity.browseActivityBo}</if>
+                    <if test="ew.entity.isBrowse!=null"> AND IS_BROWSE=#{ew.entity.isBrowse}</if>
+                    <if test="ew.entity.isErp!=null"> AND IS_ERP=#{ew.entity.isErp}</if>
+                    <if test="ew.entity.maskGroupBo!=null"> AND MASK_GROUP_BO=#{ew.entity.maskGroupBo}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
+                    <if test="ew.entity.validationActivityBo!=null"> AND VALIDATION_ACTIVITY_BO=#{ew.entity.validationActivityBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                    <if test="ew.entity.category!=null"> AND CATEGORY=#{ew.entity.category}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectPage" resultMap="BaseResultMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM DATA_FIELD
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.dataTypeBo!=null"> AND DATA_TYPE_BO=#{ew.entity.dataTypeBo}</if>
+                    <if test="ew.entity.dataField!=null"> AND DATA_FIELD=#{ew.entity.dataField}</if>
+                    <if test="ew.entity.fieldType!=null"> AND FIELD_TYPE=#{ew.entity.fieldType}</if>
+                    <if test="ew.entity.validationType!=null"> AND VALIDATION_TYPE=#{ew.entity.validationType}</if>
+                    <if test="ew.entity.dataDefault!=null"> AND DATA_DEFAULT=#{ew.entity.dataDefault}</if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.browseActivityBo!=null"> AND BROWSE_ACTIVITY_BO=#{ew.entity.browseActivityBo}</if>
+                    <if test="ew.entity.isBrowse!=null"> AND IS_BROWSE=#{ew.entity.isBrowse}</if>
+                    <if test="ew.entity.isErp!=null"> AND IS_ERP=#{ew.entity.isErp}</if>
+                    <if test="ew.entity.maskGroupBo!=null"> AND MASK_GROUP_BO=#{ew.entity.maskGroupBo}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
+                    <if test="ew.entity.validationActivityBo!=null"> AND VALIDATION_ACTIVITY_BO=#{ew.entity.validationActivityBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                    <if test="ew.entity.category!=null"> AND CATEGORY=#{ew.entity.category}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectMapsPage" resultType="HashMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM DATA_FIELD
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.dataTypeBo!=null"> AND DATA_TYPE_BO=#{ew.entity.dataTypeBo}</if>
+                    <if test="ew.entity.dataField!=null"> AND DATA_FIELD=#{ew.entity.dataField}</if>
+                    <if test="ew.entity.fieldType!=null"> AND FIELD_TYPE=#{ew.entity.fieldType}</if>
+                    <if test="ew.entity.validationType!=null"> AND VALIDATION_TYPE=#{ew.entity.validationType}</if>
+                    <if test="ew.entity.dataDefault!=null"> AND DATA_DEFAULT=#{ew.entity.dataDefault}</if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.browseActivityBo!=null"> AND BROWSE_ACTIVITY_BO=#{ew.entity.browseActivityBo}</if>
+                    <if test="ew.entity.isBrowse!=null"> AND IS_BROWSE=#{ew.entity.isBrowse}</if>
+                    <if test="ew.entity.isErp!=null"> AND IS_ERP=#{ew.entity.isErp}</if>
+                    <if test="ew.entity.maskGroupBo!=null"> AND MASK_GROUP_BO=#{ew.entity.maskGroupBo}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
+                    <if test="ew.entity.validationActivityBo!=null"> AND VALIDATION_ACTIVITY_BO=#{ew.entity.validationActivityBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                    <if test="ew.entity.category!=null"> AND CATEGORY=#{ew.entity.category}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <insert id="insert" parameterType="com.foreverwin.mesnac.meapi.model.DataField">
+        INSERT INTO DATA_FIELD
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            HANDLE,
+            <if test="dataTypeBo!=null">DATA_TYPE_BO,</if>
+            <if test="dataField!=null">DATA_FIELD,</if>
+            <if test="fieldType!=null">FIELD_TYPE,</if>
+            <if test="validationType!=null">VALIDATION_TYPE,</if>
+            <if test="dataDefault!=null">DATA_DEFAULT,</if>
+            <if test="site!=null">SITE,</if>
+            <if test="browseActivityBo!=null">BROWSE_ACTIVITY_BO,</if>
+            <if test="isBrowse!=null">IS_BROWSE,</if>
+            <if test="isErp!=null">IS_ERP,</if>
+            <if test="maskGroupBo!=null">MASK_GROUP_BO,</if>
+            <if test="description!=null">DESCRIPTION,</if>
+            <if test="validationActivityBo!=null">VALIDATION_ACTIVITY_BO,</if>
+            <if test="createdDateTime!=null">CREATED_DATE_TIME,</if>
+            <if test="modifiedDateTime!=null">MODIFIED_DATE_TIME,</if>
+            <if test="category!=null">CATEGORY,</if>
+        </trim> VALUES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            #{handle},
+            <if test="dataTypeBo!=null">#{dataTypeBo},</if>
+            <if test="dataField!=null">#{dataField},</if>
+            <if test="fieldType!=null">#{fieldType},</if>
+            <if test="validationType!=null">#{validationType},</if>
+            <if test="dataDefault!=null">#{dataDefault},</if>
+            <if test="site!=null">#{site},</if>
+            <if test="browseActivityBo!=null">#{browseActivityBo},</if>
+            <if test="isBrowse!=null">#{isBrowse},</if>
+            <if test="isErp!=null">#{isErp},</if>
+            <if test="maskGroupBo!=null">#{maskGroupBo},</if>
+            <if test="description!=null">#{description},</if>
+            <if test="validationActivityBo!=null">#{validationActivityBo},</if>
+            <if test="createdDateTime!=null">#{createdDateTime},</if>
+            <if test="modifiedDateTime!=null">#{modifiedDateTime},</if>
+            <if test="category!=null">#{category},</if>
+        </trim>
+    </insert>
+
+    <insert id="insertAllColumn" parameterType="com.foreverwin.mesnac.meapi.model.DataField">
+        INSERT INTO DATA_FIELD
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <include refid="Base_Column_List"></include>
+        </trim> VALUES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            #{handle},
+            #{dataTypeBo},
+            #{dataField},
+            #{fieldType},
+            #{validationType},
+            #{dataDefault},
+            #{site},
+            #{browseActivityBo},
+            #{isBrowse},
+            #{isErp},
+            #{maskGroupBo},
+            #{description},
+            #{validationActivityBo},
+            #{createdDateTime},
+            #{modifiedDateTime},
+            #{category},
+        </trim>
+    </insert>
+
+
+
+
+
+
+    <update id="update">
+        UPDATE DATA_FIELD <trim prefix="SET" suffixOverrides=",">
+        <if test="et.handle!=null">HANDLE=#{et.handle},</if>
+        <if test="et.dataTypeBo!=null">DATA_TYPE_BO=#{et.dataTypeBo},</if>
+        <if test="et.dataField!=null">DATA_FIELD=#{et.dataField},</if>
+        <if test="et.fieldType!=null">FIELD_TYPE=#{et.fieldType},</if>
+        <if test="et.validationType!=null">VALIDATION_TYPE=#{et.validationType},</if>
+        <if test="et.dataDefault!=null">DATA_DEFAULT=#{et.dataDefault},</if>
+        <if test="et.site!=null">SITE=#{et.site},</if>
+        <if test="et.browseActivityBo!=null">BROWSE_ACTIVITY_BO=#{et.browseActivityBo},</if>
+        <if test="et.isBrowse!=null">IS_BROWSE=#{et.isBrowse},</if>
+        <if test="et.isErp!=null">IS_ERP=#{et.isErp},</if>
+        <if test="et.maskGroupBo!=null">MASK_GROUP_BO=#{et.maskGroupBo},</if>
+        <if test="et.description!=null">DESCRIPTION=#{et.description},</if>
+        <if test="et.validationActivityBo!=null">VALIDATION_ACTIVITY_BO=#{et.validationActivityBo},</if>
+        <if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
+        <if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
+        <if test="et.category!=null">CATEGORY=#{et.category},</if>
+    </trim>
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    HANDLE=#{ew.entity.handle}
+                    <if test="ew.entity.dataTypeBo!=null"> AND DATA_TYPE_BO=#{ew.entity.dataTypeBo}</if>
+                    <if test="ew.entity.dataField!=null"> AND DATA_FIELD=#{ew.entity.dataField}</if>
+                    <if test="ew.entity.fieldType!=null"> AND FIELD_TYPE=#{ew.entity.fieldType}</if>
+                    <if test="ew.entity.validationType!=null"> AND VALIDATION_TYPE=#{ew.entity.validationType}</if>
+                    <if test="ew.entity.dataDefault!=null"> AND DATA_DEFAULT=#{ew.entity.dataDefault}</if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.browseActivityBo!=null"> AND BROWSE_ACTIVITY_BO=#{ew.entity.browseActivityBo}</if>
+                    <if test="ew.entity.isBrowse!=null"> AND IS_BROWSE=#{ew.entity.isBrowse}</if>
+                    <if test="ew.entity.isErp!=null"> AND IS_ERP=#{ew.entity.isErp}</if>
+                    <if test="ew.entity.maskGroupBo!=null"> AND MASK_GROUP_BO=#{ew.entity.maskGroupBo}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
+                    <if test="ew.entity.validationActivityBo!=null"> AND VALIDATION_ACTIVITY_BO=#{ew.entity.validationActivityBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                    <if test="ew.entity.category!=null"> AND CATEGORY=#{ew.entity.category}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </update>
+
+
+    <delete id="deleteByMap">
+        DELETE FROM DATA_FIELD
+        <if test="cm!=null and !cm.isEmpty">
+            <where>
+                <foreach collection="cm.keys" item="k" separator="AND">
+                    <if test="cm[k] != null">
+                        ${k} = #{cm[${k}]}
+                    </if>
+                </foreach>
+            </where>
+        </if>
+    </delete>
+
+    <delete id="delete">
+        DELETE FROM DATA_FIELD
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.dataTypeBo!=null"> AND DATA_TYPE_BO=#{ew.entity.dataTypeBo}</if>
+                    <if test="ew.entity.dataField!=null"> AND DATA_FIELD=#{ew.entity.dataField}</if>
+                    <if test="ew.entity.fieldType!=null"> AND FIELD_TYPE=#{ew.entity.fieldType}</if>
+                    <if test="ew.entity.validationType!=null"> AND VALIDATION_TYPE=#{ew.entity.validationType}</if>
+                    <if test="ew.entity.dataDefault!=null"> AND DATA_DEFAULT=#{ew.entity.dataDefault}</if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.browseActivityBo!=null"> AND BROWSE_ACTIVITY_BO=#{ew.entity.browseActivityBo}</if>
+                    <if test="ew.entity.isBrowse!=null"> AND IS_BROWSE=#{ew.entity.isBrowse}</if>
+                    <if test="ew.entity.isErp!=null"> AND IS_ERP=#{ew.entity.isErp}</if>
+                    <if test="ew.entity.maskGroupBo!=null"> AND MASK_GROUP_BO=#{ew.entity.maskGroupBo}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
+                    <if test="ew.entity.validationActivityBo!=null"> AND VALIDATION_ACTIVITY_BO=#{ew.entity.validationActivityBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                    <if test="ew.entity.category!=null"> AND CATEGORY=#{ew.entity.category}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </delete>
+
+    <!-- BaseMapper标准查询/修改/删除 -->
+
+</mapper>
diff --git a/meapi/src/main/resources/mapper/SfcMapper.xml b/meapi/src/main/resources/mapper/SfcMapper.xml
index e61d6e16..956aed19 100644
--- a/meapi/src/main/resources/mapper/SfcMapper.xml
+++ b/meapi/src/main/resources/mapper/SfcMapper.xml
@@ -644,7 +644,28 @@
         WHERE RES.HANDLE = #{resrceBO}
         ORDER BY IW.DATE_STARTED DESC
     </select>
-    
+
+    <select id="findBySfc" resultType="com.foreverwin.mesnac.meapi.model.Sfc">
+        SELECT <include refid="Base_Column_List"></include>
+        FROM SFC
+        <where>
+            <if test="sfc != null">
+                <if test="sfc.site != null and sfc.site != ''">
+                    SITE = #{sfc.site}
+                </if>
+                <if test="sfc.handle != null and sfc.handle != ''">
+                    AND HANDLE = #{sfc.handle}
+                </if>
+                <if test="sfc.itemBo != null and sfc.itemBo != ''">
+                    AND ITEM_BO = #{sfc.itemBo}
+                </if>
+                <if test="sfc.shopOrderBo != null and sfc.shopOrderBo != ''">
+                    AND SHOP_ORDER_BO = #{sfc.shopOrderBo}
+                </if>
+            </if>
+        </where>
+    </select>
+
     <select id="findSfcData" resultMap="FullResultMap">
         SELECT SC.SITE, SC.SFC, SO.SHOP_ORDER, SC.QTY, SC.QTY_DONE, ST.STATUS, IM.ITEM, IT.DESCRIPTION ITEM_DESCRIPTION, OP.OPERATION, OT.DESCRIPTION OPERATION_DESCRIPTION, OTT.DESCRIPTION PREPOSITION_OPERATION
         FROM SFC SC
diff --git a/meapi/src/main/resources/mapper/ShopOrderMapper.xml b/meapi/src/main/resources/mapper/ShopOrderMapper.xml
index 6a841b71..aad78059 100644
--- a/meapi/src/main/resources/mapper/ShopOrderMapper.xml
+++ b/meapi/src/main/resources/mapper/ShopOrderMapper.xml
@@ -986,5 +986,17 @@
     </delete>
 
     <!-- BaseMapper标准查询/修改/删除 -->
-
+    <select id="findByIdAndPlannedItemBo" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include>
+        FROM SHOP_ORDER
+        <where>
+            STATUS_BO =  #{status501}
+            <if test="handle != null and handle != ''">
+               AND HANDLE = #{handle}
+            </if>
+            <if test="plannedItemBo != null and plannedItemBo != ''">
+               AND PLANNED_ITEM_BO = #{plannedItemBo}
+            </if>
+        </where>
+    </select>
 </mapper>
diff --git a/meapi/src/main/resources/mapper/UserGroupMapper.xml b/meapi/src/main/resources/mapper/UserGroupMapper.xml
new file mode 100644
index 00000000..0fe9eea3
--- /dev/null
+++ b/meapi/src/main/resources/mapper/UserGroupMapper.xml
@@ -0,0 +1,332 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.foreverwin.mesnac.meapi.mapper.UserGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.foreverwin.mesnac.meapi.model.UserGroup">
+        <result column="HANDLE" property="handle" />
+        <result column="CHANGE_STAMP" property="changeStamp" />
+        <result column="SITE" property="site" />
+        <result column="USER_GROUP" property="userGroup" />
+        <result column="DESCRIPTION" property="description" />
+        <result column="WORKSTATION_BO" property="workstationBo" />
+        <result column="CREATED_DATE_TIME" property="createdDateTime" />
+        <result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        HANDLE, CHANGE_STAMP, SITE, USER_GROUP, DESCRIPTION, WORKSTATION_BO, CREATED_DATE_TIME, MODIFIED_DATE_TIME
+    </sql>
+
+    <!-- BaseMapper标准查询/修改/删除 -->
+
+    <select id="selectByMap" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include>
+        FROM USER_GROUP
+        <if test="cm!=null and !cm.isEmpty">
+            <where>
+                <foreach collection="cm.keys" item="k" separator="AND">
+                    <if test="cm[k] != null">
+                        ${k} = #{cm[${k}]}
+                    </if>
+                </foreach>
+            </where>
+        </if>
+    </select>
+
+
+    <select id="selectOne" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include> FROM USER_GROUP
+        <where>
+            <if test="ew.entity.handle!=null">
+              HANDLE=#{ew.handle}
+            </if>
+            <if test="ew.entity.changeStamp!=null"> AND CHANGE_STAMP=#{ew.entity.changeStamp}</if>
+            <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+            <if test="ew.entity.userGroup!=null"> AND USER_GROUP=#{ew.entity.userGroup}</if>
+            <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
+            <if test="ew.entity.workstationBo!=null"> AND WORKSTATION_BO=#{ew.entity.workstationBo}</if>
+            <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+            <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+        </where>
+    </select>
+
+    <select id="selectCount" resultType="Integer">
+        SELECT COUNT(1) FROM USER_GROUP
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                <if test="ew.entity.handle!=null">
+                    HANDLE=#{ew.entity.handle}
+                </if>
+                <if test="ew.entity.changeStamp!=null"> AND CHANGE_STAMP=#{ew.entity.changeStamp}</if>
+                <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                <if test="ew.entity.userGroup!=null"> AND USER_GROUP=#{ew.entity.userGroup}</if>
+                <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
+                <if test="ew.entity.workstationBo!=null"> AND WORKSTATION_BO=#{ew.entity.workstationBo}</if>
+                <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectList" resultMap="BaseResultMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM USER_GROUP
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.changeStamp!=null"> AND CHANGE_STAMP=#{ew.entity.changeStamp}</if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.userGroup!=null"> AND USER_GROUP=#{ew.entity.userGroup}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
+                    <if test="ew.entity.workstationBo!=null"> AND WORKSTATION_BO=#{ew.entity.workstationBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectMaps" resultType="HashMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM USER_GROUP
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.changeStamp!=null"> AND CHANGE_STAMP=#{ew.entity.changeStamp}</if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.userGroup!=null"> AND USER_GROUP=#{ew.entity.userGroup}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
+                    <if test="ew.entity.workstationBo!=null"> AND WORKSTATION_BO=#{ew.entity.workstationBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectObjs" resultType="Object">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM USER_GROUP
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.changeStamp!=null"> AND CHANGE_STAMP=#{ew.entity.changeStamp}</if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.userGroup!=null"> AND USER_GROUP=#{ew.entity.userGroup}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
+                    <if test="ew.entity.workstationBo!=null"> AND WORKSTATION_BO=#{ew.entity.workstationBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectPage" resultMap="BaseResultMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM USER_GROUP
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.changeStamp!=null"> AND CHANGE_STAMP=#{ew.entity.changeStamp}</if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.userGroup!=null"> AND USER_GROUP=#{ew.entity.userGroup}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
+                    <if test="ew.entity.workstationBo!=null"> AND WORKSTATION_BO=#{ew.entity.workstationBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectMapsPage" resultType="HashMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM USER_GROUP
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.changeStamp!=null"> AND CHANGE_STAMP=#{ew.entity.changeStamp}</if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.userGroup!=null"> AND USER_GROUP=#{ew.entity.userGroup}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
+                    <if test="ew.entity.workstationBo!=null"> AND WORKSTATION_BO=#{ew.entity.workstationBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <insert id="insert" parameterType="com.foreverwin.mesnac.meapi.model.UserGroup">
+        INSERT INTO USER_GROUP
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            HANDLE,
+            <if test="changeStamp!=null">CHANGE_STAMP,</if>
+            <if test="site!=null">SITE,</if>
+            <if test="userGroup!=null">USER_GROUP,</if>
+            <if test="description!=null">DESCRIPTION,</if>
+            <if test="workstationBo!=null">WORKSTATION_BO,</if>
+            <if test="createdDateTime!=null">CREATED_DATE_TIME,</if>
+            <if test="modifiedDateTime!=null">MODIFIED_DATE_TIME,</if>
+        </trim> VALUES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            #{handle},
+            <if test="changeStamp!=null">#{changeStamp},</if>
+            <if test="site!=null">#{site},</if>
+            <if test="userGroup!=null">#{userGroup},</if>
+            <if test="description!=null">#{description},</if>
+            <if test="workstationBo!=null">#{workstationBo},</if>
+            <if test="createdDateTime!=null">#{createdDateTime},</if>
+            <if test="modifiedDateTime!=null">#{modifiedDateTime},</if>
+        </trim>
+    </insert>
+
+    <insert id="insertAllColumn" parameterType="com.foreverwin.mesnac.meapi.model.UserGroup">
+        INSERT INTO USER_GROUP
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <include refid="Base_Column_List"></include>
+        </trim> VALUES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            #{handle},
+            #{changeStamp},
+            #{site},
+            #{userGroup},
+            #{description},
+            #{workstationBo},
+            #{createdDateTime},
+            #{modifiedDateTime},
+        </trim>
+    </insert>
+
+
+
+
+
+
+    <update id="update">
+        UPDATE USER_GROUP <trim prefix="SET" suffixOverrides=",">
+        <if test="et.handle!=null">HANDLE=#{et.handle},</if>
+        <if test="et.changeStamp!=null">CHANGE_STAMP=#{et.changeStamp},</if>
+        <if test="et.site!=null">SITE=#{et.site},</if>
+        <if test="et.userGroup!=null">USER_GROUP=#{et.userGroup},</if>
+        <if test="et.description!=null">DESCRIPTION=#{et.description},</if>
+        <if test="et.workstationBo!=null">WORKSTATION_BO=#{et.workstationBo},</if>
+        <if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
+        <if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
+    </trim>
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    HANDLE=#{ew.entity.handle}
+                    <if test="ew.entity.changeStamp!=null"> AND CHANGE_STAMP=#{ew.entity.changeStamp}</if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.userGroup!=null"> AND USER_GROUP=#{ew.entity.userGroup}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
+                    <if test="ew.entity.workstationBo!=null"> AND WORKSTATION_BO=#{ew.entity.workstationBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </update>
+
+
+    <delete id="deleteByMap">
+        DELETE FROM USER_GROUP
+        <if test="cm!=null and !cm.isEmpty">
+            <where>
+                <foreach collection="cm.keys" item="k" separator="AND">
+                    <if test="cm[k] != null">
+                        ${k} = #{cm[${k}]}
+                    </if>
+                </foreach>
+            </where>
+        </if>
+    </delete>
+
+    <delete id="delete">
+        DELETE FROM USER_GROUP
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.changeStamp!=null"> AND CHANGE_STAMP=#{ew.entity.changeStamp}</if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.userGroup!=null"> AND USER_GROUP=#{ew.entity.userGroup}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
+                    <if test="ew.entity.workstationBo!=null"> AND WORKSTATION_BO=#{ew.entity.workstationBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </delete>
+
+    <!-- BaseMapper标准查询/修改/删除 -->
+
+</mapper>
diff --git a/pom.xml b/pom.xml
index 4f4134a2..abc37b8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,6 +156,12 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.foreverwin.mesnac</groupId>
+                <artifactId>anomaly</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>