diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index 3411cbc..7d22a0b 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -15,6 +15,37 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <!-- 简化方法 -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <!-- swagger -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.swagger</groupId>
+                    <artifactId>swagger-models</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-core</artifactId>
         </dependency>
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/annotation/BusiColumn.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/annotation/BusiColumn.java
new file mode 100644
index 0000000..e2f025a
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/annotation/BusiColumn.java
@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.cdm.annotation;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Api("业务字段描述")
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface BusiColumn {
+    @ApiParam("是否业务主键")
+    boolean isPrimary() default false;
+    @ApiParam("是否必须")
+    boolean isRequired() default false;
+    @ApiParam("是否唯一")
+    boolean isUnique() default false;
+    @ApiParam("日期格式,默认空表示非日期类型,*表示匹配多种日期格式")
+    String dateFormat() default "";
+    @ApiParam("导入Excel对应列")
+    int importExcelColumn() default -1;
+    @ApiParam("导入自定义获取业务方法名,null为执行,空字符串为'get+字段名'")
+    String importGetMethod() default "null";
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/annotation/BusiTable.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/annotation/BusiTable.java
new file mode 100644
index 0000000..41dd0dc
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/annotation/BusiTable.java
@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.cdm.annotation;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Api("业务表描述")
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface BusiTable {
+    @ApiParam("导入读取的工作簿数")
+    int importReadSheetNum() default 3;
+    @ApiParam("导入读取的总行数")
+    int importReadRowNum() default 0;
+    @ApiParam("导入读取的开始行")
+    int importReadRowStart() default 1;
+    @ApiParam("只导入标注Excel对应列的字段")
+    boolean importExcelColumnOnly() default true;
+    @ApiParam("导入时主键字段数据存在抛出异常")
+    boolean importPrimaryExistThrow() default false;
+    @ApiParam("导入前执行自定义逻辑")
+    boolean importCustomLogicBefore() default false;
+    @ApiParam("导入后执行自定义逻辑")
+    boolean importCustomLogicAfter() default false;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmBasCustomer.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmBasCustomer.java
new file mode 100644
index 0000000..4f59da7
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmBasCustomer.java
@@ -0,0 +1,71 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 客户信息
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/18 0:45
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_BAS_CUSTOMER")
+@Api("客户信息")
+public class CdmBasCustomer extends BaseBean {
+
+    @Column(name = "CUST_NO")
+    @ApiParam("客户编码")
+    private String custNo;
+
+    @Column(name = "CUST_NAME")
+    @ApiParam("客户简称")
+    private String custName;
+
+    @Column(name = "CUST_DESC")
+    @ApiParam("客户全称")
+    private String custDesc;
+
+    @Column(name = "CUST_DESC_OF_ENGLISH")
+    @ApiParam("客户英文全称")
+    private String custDescOfEnglish;
+
+    @Column(name = "CUST_ADDR")
+    @ApiParam("客户地址")
+    private String custAddr;
+
+    @Column(name = "CUST_ADDR_OF_ENGLISH")
+    @ApiParam("客户英文地址")
+    private String custAddrOfEnglish;
+
+    @Column(name = "CUST_OWNER")
+    @ApiParam("联系人")
+    private String custOwner;
+
+    @Column(name = "CUST_EMAIL")
+    @ApiParam("邮箱")
+    private String custEmail;
+
+    @Column(name = "CUST_TEL")
+    @ApiParam("电话号码")
+    private String custTel;
+
+    @Column(name = "CUST_FAX")
+    @ApiParam("传真")
+    private String custFax;
+
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmBasVendor.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmBasVendor.java
new file mode 100644
index 0000000..2622344
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmBasVendor.java
@@ -0,0 +1,126 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 供应商
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name="CDM_BAS_VENDOR")
+@Api("供应商信息")
+public class CdmBasVendor extends BaseBean{
+
+    @Column(name="VENDOR_NO")
+    @ApiParam("供应商编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String vendorNo;
+
+    @Column(name="VENDOR_NAME")
+    @ApiParam("供应商简称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String vendorName;
+
+    @Column(name="VENDOR_DESC")
+    @ApiParam("供应商全称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String vendorDesc;
+
+    @Column(name = "USER_NAME")
+    @ApiParam("用户名")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            dataSrc = "/impp/operate/sys-user/query-user-by-pager",
+            searchColumnName = "userName",listColumnName = "userLoginName,userName", explicitColumnName = "userName")
+    private String userName;
+
+    @Column(name="VENDOR_ADDR")
+    @ApiParam("供应商地址")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String vendorAddr;
+
+    @Column(name="VENDOR_OWNER")
+    @ApiParam("联系人")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String vendorOwner;
+
+    @Column(name="VENDOR_EMAIL")
+    @ApiParam("邮箱")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String vendorEmail;
+
+    @Column(name = "IS_ASN")
+    @ApiParam(value = "是否发ASN", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
+    private Integer isAsn;
+
+    @Column(name = "PASSWORD")
+    @ApiParam(value = "密码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String password;
+
+    @Column(name = "VENDOR_CALL")
+    @ApiParam("供应商电话")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String vendorCall;
+
+    @Column(name = "VENDOR_FAX")
+    @ApiParam("传真")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String vendorFax;
+
+    @Column(name = "VENDOR_PHONE")
+    @ApiParam("手机")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String vendorPhone;
+
+    @Column(name = "KILOBIT")
+    @ApiParam("千位符号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String kilobit;
+
+    @Column(name = "DECIMALS")
+    @ApiParam("小数位符号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String decimals;
+
+    @Column(name = "VENDOR_TYPE")
+    @ApiParam("供应商类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "VENDOR_TYPE")
+    private Integer vendorType;
+
+    @Column(name = "MAP_LOCATION")
+    @ApiParam("经纬度")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String mapLocation;
+
+    @Column(name = "FIRST_LOGIN")
+    @ApiParam("是否首次登录")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Integer firstLogin;
+
+    public CdmBasVendor() {
+    }
+
+    public CdmBasVendor(Long id, String userName) {
+        this.id = id;
+        this.userName = userName;
+    }
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmConfig.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmConfig.java
new file mode 100644
index 0000000..46064c4
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmConfig.java
@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description :配置表
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_CONFIG", indexes = {
+        @Index(columnList = "CFG_CODE"),
+        @Index(columnList = "CFG_CODE, CFG_KEY")
+})
+@Api("配置表")
+public class CdmConfig extends BaseBean {
+
+    @Column(name = "CFG_CODE")
+    @ApiParam("配置代码")
+    private String cfgCode;
+
+    @Column(name = "CFG_NAME")
+    @ApiParam("配置名称")
+    private String cfgName;
+
+    @Column(name = "CFG_TYPE")
+    @ApiParam("配置类型")
+    private String cfgType;
+
+    @Column(name = "CFG_KEY")
+    @ApiParam("配置key")
+    private String cfgKey;
+
+    @Column(name = "CFG_VALUE")
+    @ApiParam("配置value")
+    private String cfgValue;
+
+    @Column(name = "CFG_VAULE_DESC")
+    @ApiParam("配置value描述")
+    private String cfgValueDesc;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmCustomCheckDetail.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmCustomCheckDetail.java
new file mode 100644
index 0000000..edf9763
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmCustomCheckDetail.java
@@ -0,0 +1,121 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.annotation.Transient;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 海关核注清单明细
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/26 13:42
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_CUSTOM_CHECK_DETAIL")
+@Api("海关核注清单明细")
+public class CdmCustomCheckDetail extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("预录入统一编号")
+    private String orderNo;
+
+    @Column(name = "RECORD_SERIAL_NUMBER")
+    @ApiParam("备案序号")
+    private String recordSerialNumber;
+
+    @Column(name = "CUSTOMS_COMMODITY_NO")
+    @ApiParam("商品料号")
+    private String customsCommodityNo;
+
+    @Column(name = "COMMODITY_NO")
+    @ApiParam("商品编码")
+    private String commodityNo;
+
+    @Column(name = "COMMODITY_NAME")
+    @ApiParam("商品名称")
+    private String commodityName;
+
+    @Column(name = "COMMODITY_MODEL")
+    @ApiParam("规格型号")
+    private String commodityModel;
+
+    @Column(name = "COUNTRY_OF_ORIGIN")
+    @ApiParam("原产国")
+    private String countryOfOrigin;
+
+    @Column(name = "DESTINATION")
+    @ApiParam("最终目的地")
+    private String destination;
+
+    @Column(name = "CURRENCY")
+    @ApiParam("币制")
+    private String currency;
+
+
+    @Column(name = "DECLARED_UNIT_PRICE")
+    @ApiParam("申报单价")
+    private Double declaredUnitPrice;
+
+
+    @Column(name = "DECLARED_QTY")
+    @ApiParam("申报数量")
+    private Double declaredQty;
+
+
+    @Column(name = "DECLARE_UNIT")
+    @ApiParam("申报计量单位")
+    private String declareUnit;
+
+
+    @Column(name = "DECLARED_TOTAL_PRICE")
+    @ApiParam("申报总价")
+    private Double declaredTotalPrice;
+
+
+    @Column(name = "LEGAL_QUANTITY")
+    @ApiParam("法定数量")
+    private Double legalQuantity;
+
+
+    @Column(name = "LEGAL_MEASUREMENT_UNIT")
+    @ApiParam("法定计量单位")
+    private String legalMeasurementUnit;
+
+    @Column(name = "LEGAL_SECOND_QUANTITY")
+    @ApiParam("第二法定数量")
+    private Double legalSecondQuantity;
+
+
+    @Column(name = "LEGAL_MEASUREMENT_SECOND_UNIT")
+    @ApiParam("第二法定计量单位")
+    private String legalMeasurementSecondUnit;
+
+    @Column(name = "GROSS_WEIGHT")
+    @ApiParam("毛重")
+    private Double grossWeight;
+
+    @Column(name = "NET_WEIGHT")
+    @ApiParam("净重")
+    private Double netWeight;
+
+    @Column(name = "EXEMPTION_METHOD")
+    @ApiParam("征免方式")
+    private String exemptionMethod;
+
+    @Transient
+    @ApiParam("申报要素")
+    private String declareElement;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmCustomCheckMaster.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmCustomCheckMaster.java
new file mode 100644
index 0000000..278aca5
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmCustomCheckMaster.java
@@ -0,0 +1,208 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 海关核注清单
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/26 13:42
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_CUSTOM_CHECK_MASTER")
+@Api("海关核注清单主表")
+public class CdmCustomCheckMaster extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("预录入统一编号")
+    private String orderNo;
+
+    @Column(name = "BILL_NO")
+    @ApiParam("清单编号")
+    private String billNo;
+
+    @Column(name = "ACCOUNT_NO")
+    @ApiParam("手(帐)册编号")
+    private String accountNo;
+
+    @Column(name = "BUSINESS_CODE")
+    @ApiParam("经营企业编码")
+    private String businessCode;
+
+    @Column(name = "SOCIAL_CREDIT_CODE")
+    @ApiParam("经营企业社会信用代码")
+    private String socialCreditCode;
+
+    @Column(name = "BUSINESS_NAME")
+    @ApiParam("经营企业名称")
+    private String businessName;
+
+    @Column(name = "PROCESS_CODE")
+    @ApiParam("加工企业编码")
+    private String processCode;
+
+    @Column(name = "PROCESS_CREDIT_CODE")
+    @ApiParam("加工企业社会信用代码")
+    private String processCreditCode;
+
+    @Column(name = "PROCESS_NAME")
+    @ApiParam("加工企业名称")
+    private String processName;
+
+
+    @Column(name = "DECLARE_UNIT_CODE")
+    @ApiParam("申报单位代码")
+    private String declareUnitCode;
+
+
+    @Column(name = "DECLARE_UNIT_CREDIT_CODE")
+    @ApiParam("申报单位社会信用代码")
+    private String declareUnitCreditCode;
+
+
+    @Column(name = "DECLARE_UNIT_NAME")
+    @ApiParam("申报单位名称")
+    private String declareUnitName;
+
+
+    @Column(name = "ENTRY_UNIT_CODE")
+    @ApiParam("录入单位代码")
+    private String entryUnitCode;
+
+
+    @Column(name = "ENTRY_UNIT_CREDIT_CODE")
+    @ApiParam("录入单位社会信用代码")
+    private String entryUnitCreditCode;
+
+
+    @Column(name = "ENTRY_UNIT_NAME")
+    @ApiParam("录入单位名称")
+    private String entryUnitName;
+
+    @Column(name = "ENTERPRISE_NUMBER")
+    @ApiParam("企业内部编号")
+    private String enterpriseNumber;
+
+
+    @Column(name = "ENTRY_DATE")
+    @ApiParam("录入日期")
+    private String entryDate;
+
+
+    @Column(name = "BILL_DECLARE_DATE")
+    @ApiParam("清单申报日期")
+    private String billDeclareDate;
+
+
+    @Column(name = "PART_TYPE")
+    @ApiParam("料件成品标志")
+    private String partType;
+
+
+    @Column(name = "MODE_OPERATION")
+    @ApiParam("经营方式")
+    private String modeOperation;
+
+    @Column(name = "TRANS_PORT_TYPE")
+    @ApiParam("运输方式")
+    private String transPortType;
+
+
+    @Column(name = "ENTRY_ADRRESS")
+    @ApiParam("进境关别")
+    private String entryAdrress;
+
+    @Column(name = "COMPETENT_CUSTOMS")
+    @ApiParam("主管海关")
+    private String competentCustoms;
+
+
+    @Column(name = "FROM_CITY")
+    @ApiParam("启远国(地区)")
+    private String orignCity;
+
+
+    @Column(name = "BILL_TYPE")
+    @ApiParam("清单类型")
+    private String billType;
+
+
+    @Column(name = "CHECK_MARK")
+    @ApiParam("核扣标志")
+    private String checkMark;
+
+
+
+    @Column(name = "BAYONET_STATU")
+    @ApiParam("清单进出卡口状态")
+    private String bayonetStatu;
+
+
+    @Column(name = "DECLARE_NO")
+    @ApiParam("申报表编号")
+    private String declareNo;
+
+
+    @Column(name = "EXCHANGE_TYPE")
+    @ApiParam("流转类型")
+    private String exchangeType;
+
+
+
+    @Column(name = "DECLARE_MARK")
+    @ApiParam("报关标志")
+    private String declareMark;
+
+
+    @Column(name = "CUSTOM_TYPE")
+    @ApiParam("报关类型")
+    private String customType;
+
+
+    @Column(name = "CUSTOM_ORDER_TYPE")
+    @ApiParam("报关单类型")
+    private String customOrderType;
+
+
+    @Column(name = "CUSTOM_BILL_NO")
+    @ApiParam("报关清单编号")
+    private String customBillNo;
+
+
+    @Column(name = "REF_RECORD_NUMBER")
+    @ApiParam("关联手(帐)册备案号")
+    private String refRecordNumber;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name = "OPERATOR_CARD")
+    @ApiParam("操作员卡号")
+    private String operatorCard;
+
+    @Column(name = "IS_FINAL_REVIEW")
+    @ApiParam("是否终审核")
+    private String isFinalReview;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("核注类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.CHECK_TYPE.class,refForeignKey = "value", value = "description")
+    private Integer checkType;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmCustomsDetail.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmCustomsDetail.java
new file mode 100644
index 0000000..dac61d8
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmCustomsDetail.java
@@ -0,0 +1,209 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.cdm.annotation.BusiColumn;
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_CUSTOMS_DETAIL",indexes = {@Index(columnList = "ORDER_NO")})
+@Api("报关单明细")
+public class CdmCustomsDetail extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    @BusiColumn(importGetMethod = "getCustomsDetailOrderNo")
+    private String orderNo;
+
+    @Column(name = "SAP_ORDER_NO")
+    @ApiParam("SAP单号")
+    private String sapOrderNo;
+
+    @Column(name = "REF_ORDER_NO")
+    @ApiParam("业务单号")
+    private String refOrderNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    @BusiColumn(importExcelColumn = 1)
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    @BusiColumn(importExcelColumn = 0)
+    private String partNameRdd;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "QTY")
+    @ApiParam("申报数量")
+    @BusiColumn(importExcelColumn = 2)
+    private Integer qty;
+
+    @Column(name = "INVOICE_NO")
+    @ApiParam("进出口发票")
+    private String invoiceNo;
+
+    /*取值来源为字典：ORIGIN_COUNTRY*/
+    @Column(name = "PRODUCE_FRO")
+    @ApiParam("原产国代号")
+    @BusiColumn(importExcelColumn = 9)
+    private Integer produceFro;
+
+    /*取值来源为字典：PACKAGE_TYPE_DICTIONARY */
+    @Column(name = "PACKAGE_TYPE")
+    @ApiParam("包装类型")
+    private String packageType;
+
+    @Column(name = "TRADE_TYPE")
+    @ApiParam("贸易类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.TRADE_TYPE.class,refForeignKey = "value", value = "description")
+    private Integer tradeType;
+
+    @Column(name = "TRADE_CODE")
+    @ApiParam("贸易编码")
+    private String tradeCode;
+
+    @Column(name = "NOTE_BOOK_NO")
+    @ApiParam("手册编号")
+    private String noteBookNo;
+
+    @Column(name = "REF_ORDER_TYPE")
+    @ApiParam("单据类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.CUSTOMS_PART_PUT_REF_ORDER_TYPE.class,refForeignKey = "value", value = "description")
+    private Integer refOrderType;
+
+    @Column(name = "CUSTOMS_COMMODITY_NO")
+    @ApiParam("海关商品料号")
+    private String customsCommodityNo;
+
+    @Column(name = "UNIT_PRICE")
+    @ApiParam("单价")
+    @BusiColumn(importExcelColumn = 3)
+    private Double unitPrice;
+
+    @Column(name = "CURRENCY")
+    @ApiParam("币种")
+    @BusiColumn(importExcelColumn = 4)
+    private String currency;
+
+    @Column(name = "LEGAL_MEASURE_NUMBER")
+    @ApiParam("法定计量数量")
+    @BusiColumn(importExcelColumn = 5)
+    private Double legalMeasureNumber;
+
+    @Column(name = "LEGAL_MEASURE_UNIT_NAME")
+    @ApiParam("法定计量单位")
+    @BusiColumn(importExcelColumn = 6)
+    private String legalMeasureUnitName;
+
+    @Column(name = "LEGAL2_MEASURE_NUMBER")
+    @ApiParam("法定二计量数量")
+    @BusiColumn(importExcelColumn = 7)
+    private Double legal2MeasureNumber;
+
+    @Column(name = "LEGAL2_MEASURE_UNIT_NAME")
+    @ApiParam("法定二计量单位")
+    @BusiColumn(importExcelColumn = 8)
+    private String legal2MeasureUnitName;
+
+    @Column(name = "CAR_NO")
+    @ApiParam("车牌号码")
+    @BusiColumn(importExcelColumn = 10)
+    private String carNo;
+
+    @Column(name = "GROSS_WEIGHT")
+    @ApiParam("毛重")
+    @BusiColumn(importExcelColumn = 11)
+    private String grossWeight;
+
+    @Column(name = "NET_WEIGHT")
+    @ApiParam("净重")
+    private String netWeight;
+
+    @Column(name = "BOX_QTY")
+    @ApiParam("箱数")
+    private Integer boxQty;
+
+    @Column(name = "RECORD_SERIAL_NUMBER")
+    @ApiParam("备案序号")
+    private Integer recordSerialNumber;
+
+    @Column(name = "DIMENSIONS")
+    @ApiParam("外形尺寸 mm")
+    private String dimensions;
+
+    @Column(name = "VOLUME")
+    @ApiParam("体积")
+    private String volume;
+
+    @Column(name = "ORDER_STATUS",columnDefinition = "int(11) default 10")
+    @ApiParam("报关状态")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.GENERATE.class,refForeignKey = "value", value = "description")
+    private Integer orderStatus;
+
+    @Column(name = "REF_QTY")
+    @ApiParam("关联业务单数量")
+    private Double refQty;
+
+    @Column(name = "REF_ID")
+    @ApiParam("关联业务单ID")
+    private Long refId;
+
+    /*取值来源为字典：SHIPPING_TYPE */
+    @Column(name = "TRANS_PORT_TYPE")
+    @ApiParam("运输方式")
+    private String transPortType;
+
+    @Column(name = "FINAL_COUNTRY_CODE")
+    @ApiParam("目的国代号")
+    private Integer finalCountryCode;
+
+    @Column(name = "SUB_VENDOR_NO")
+    @ApiParam("子供应商编码")
+    private String subVendorNo;
+
+    @Column(name = "SUB_VENDOR_NAME")
+    @ApiParam("子供应商名称")
+    private String subVendorName;
+
+    @Column(name = "CUST_NO")
+    @ApiParam("客户编码")
+    private String custNo;
+
+    @Column(name = "CUST_NAME")
+    @ApiParam("客户名称")
+    private String custName;
+
+    @Transient
+    @ApiParam("出发港")
+    private String fromPort;
+
+    @Transient
+    @ApiParam("目的港")
+    private String toPort;
+
+    @Transient
+    @ApiParam("现有数量")
+    private String existingQty;
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmCustomsMaster.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmCustomsMaster.java
new file mode 100644
index 0000000..de47a79
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmCustomsMaster.java
@@ -0,0 +1,330 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.cdm.annotation.BusiColumn;
+import cn.estsh.i3plus.pojo.cdm.annotation.BusiTable;
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_CUSTOMS_MASTER",indexes = {@Index(columnList = "ORDER_NO")})
+@Api("报关单主表")
+@BusiTable(importCustomLogicBefore = true)
+public class CdmCustomsMaster extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    @BusiColumn(isPrimary = true,importGetMethod = "getCustomsOrderNo")
+    private String orderNo;
+
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.CUSTOMS_BUSI_TYPE.class,refForeignKey = "value", value = "description")
+    @BusiColumn(importExcelColumn = 0,isRequired = true)
+    private Integer busiType;
+
+    @Column(name = "CUSTOMS_TYPE")
+    @ApiParam("报关类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.CUSTOMS_TYPE.class,refForeignKey = "value", value = "description")
+    @BusiColumn(importExcelColumn = 3)
+    private Integer customsType;
+
+    @Column(name = "COMPNAY_LEVEL")
+    @ApiParam("公司级别")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.COMPNAY_LEVEL.class,refForeignKey = "value", value = "description")
+    private Integer compnayLevel;
+
+    @Column(name = "GOODS_TYPE")
+    @ApiParam("材料成品标志")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.GOODS_TYPE.class)
+    private Integer goodsType;
+
+    @Column(name = "UP_LOAD_STATUS",columnDefinition = "int(11) default 10")
+    @ApiParam("核放单上传状态")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.UPLOAD.class,refForeignKey = "value", value = "description")
+    private Integer upLoadStatus;
+
+    @Column(name = "ORDER_STATUS",columnDefinition = "int(11) default 10")
+    @ApiParam("报关状态")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.GENERATE.class,refForeignKey = "value", value = "description")
+    private Integer orderStatus;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "CARD_ENTRY_DATE")
+    @ApiParam("进出卡日期")
+    private String cardEntryDate;
+
+    @Column(name = "CAR_NO")
+    @ApiParam("车牌号码")
+    @BusiColumn(importExcelColumn = 11)
+    private String carNo;
+
+    @Column(name = "NET_WEIGHT")
+    @ApiParam("车自重")
+    @BusiColumn(importExcelColumn = 12)
+    private Double netWeight;
+
+    @Column(name = "CONTAINER_WEIGHT")
+    @ApiParam("车架重")
+    @BusiColumn(importExcelColumn = 13)
+    private Double containerWeight;
+
+    @Column(name = "INVOICE_NO")
+    @ApiParam("发票号")
+    @BusiColumn(importExcelColumn = 9)
+    private String invoiceNo;
+
+    @Column(name = "IS_CARPOOL")
+    @ApiParam("是否总公司分公司拼车")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value", value = "description")
+    private Integer isCarpool;
+
+    @Column(name = "GOODS_ACCESS_TYPE")
+    @ApiParam("货物进出类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.GOODS_PUT_OUT_TYPE.class,refForeignKey = "value", value = "description")
+    @BusiColumn(importExcelColumn = 8)
+    private Integer goodsAccessType;
+
+    @Column(name = "QR_TYPE")
+    @ApiParam("车辆二维码入关申请")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.CAR_QR_CODE_ENTRY_APPLICATION.class,refForeignKey = "value", value = "description")
+    private Integer qrType;
+
+    @Column(name = "CAR_ACCESS_TYPE")
+    @ApiParam("车辆进出类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.CAR_PUT_OUT_TYPE.class,refForeignKey = "value", value = "description")
+    @BusiColumn(importExcelColumn = 7)
+    private Integer carAccessType;
+
+    @Column(name = "TRAIN_NUMBER")
+    @ApiParam("送货车次")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.DELIVERY_TRAIN_NUMBER.class,refForeignKey = "value", value = "description")
+    private Integer trainNumber;
+
+    @Column(name = "PRODUCT_EXIT_ENTRY_DATE")
+    @ApiParam("原产品出入区日期")
+    private String productExitEntryDate;
+
+    /*取值来源为字典：SHIPPING_TYPE */
+    @Column(name = "TRANS_PORT_TYPE")
+    @ApiParam("运输方式")
+    private String transPortType;
+
+    @Column(name = "DELIVERY_DATE")
+    @ApiParam("交货日期")
+    @BusiColumn(importExcelColumn = 6)
+    private String deliveryDate;
+
+    @Column(name = "HEAD_CT_TYPE")
+    @ApiParam("总公司托盘类型")
+    private Integer headCtType;
+
+    @Column(name = "HEAD_CT_QTY")
+    @ApiParam("总公司托盘数量")
+    private Integer headCtQty;
+
+    @Column(name = "BRANCH_CT_TYPE")
+    @ApiParam("分公司托盘类型")
+    private Integer branchCtType;
+
+    @Column(name = "BRANCH_CT_QTY")
+    @ApiParam("分公司托盘数量")
+    private Integer branchCtQty;
+
+    @Column(name = "REMARK")
+    @ApiParam("周转箱类型及数量")
+    @BusiColumn(importExcelColumn = 18)
+    private String remark;
+
+    /**成品发运字段 start **/
+
+    @Column(name = "CUST_NO")
+    @ApiParam("客户编码")
+    private String custNo;
+
+    @Column(name = "CUST_NAME")
+    @ApiParam("客户名称")
+    private String custName;
+
+    @Column(name = "contractNo")
+    @ApiParam("合同号")
+    private String contractNo;
+
+    @Column(name = "BILL_NO")
+    @ApiParam("提单号")
+    private String billNo;
+
+    @Column(name = "CONTAINER_TYPE")
+    @ApiParam("集装箱类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.CONTAINER_TYPE.class,refForeignKey = "value", value = "description")
+    private Integer containerType;
+
+    /**取值来源为 字典SHIP_COMPNAY_DICTIONARY**/
+    @Column(name = "SHIP_COMPNAY_CODE")
+    @ApiParam("船公司编码")
+    private String shipCompnayCode;
+
+
+    /**取值来源为 字典SHIP_COMPNAY_DICTIONARY**/
+    @Column(name = "SHIP_COMPNAY_NAME")
+    @ApiParam("船公司名称")
+    private String shipCompnayName;
+
+
+    /**取值来源为 字典PAY_TYPE_DICTIONARY**/
+    @Column(name = "PAY_TYPE")
+    @ApiParam("付款方式类型")
+    private String payType;
+
+
+    @Column(name = "DEPARTURE_DAY")
+    @ApiParam("出港日")
+    private String departureDay;
+
+    @Column(name = "DEST_CITY")
+    @ApiParam("运抵国")
+    private String destCity;
+
+    @Column(name = "PACKAGE_QTY")
+    @ApiParam("包装数量")
+    private Integer packageQty;
+
+    @Column(name = "FROM_PORT")
+    @ApiParam("出发港")
+    private String fromPort;
+
+    @Column(name = "TO_PORT")
+    @ApiParam("目的港")
+    private String toPort;
+
+    /**字典：PAYMENT_DICTIONARY**/
+    @Column(name = "PAYMENT")
+    @ApiParam("成交方式")
+    private String payment;
+
+    /**成品发运字段 end **/
+
+    /**字典维护：PRODUCT_GROUP_DICTIONARY**/
+    @Column(name = "PRODUCT_GROUP")
+    @ApiParam("产品组(物料主线别)")
+    private String productGroup;
+
+    /** 物流/设备字段 start **/
+
+    @Column(name = "COUNTERPARTY_CODE")
+    @ApiParam("交易方代码")
+    @BusiColumn(importExcelColumn = 2)
+    private String counterpartyCode;
+
+    @Column(name = "COUNTERPARTY_NAME")
+    @ApiParam("交易方名称")
+    @BusiColumn(importExcelColumn = 1)
+    private String counterpartyName;
+
+    @Column(name = "TRADE_TYPE")
+    @ApiParam("贸易类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.TRADE_TYPE.class,refForeignKey = "value", value = "description")
+    @BusiColumn(importExcelColumn = 4)
+    private Integer tradeType;
+
+    @Column(name = "BUSI_DECLARE_NO")
+    @ApiParam("业务申报表编号")
+    @BusiColumn(importExcelColumn = 5)
+    private String busiDeclareNo;
+
+    @Column(name = "BIND_TYPE")
+    @ApiParam("绑定类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.BIND_TYPE.class)
+    @BusiColumn(importExcelColumn = 10)
+    private Integer bindType;
+
+    @Column(name = "TOTAL_GROSS_WEIGHT")
+    @ApiParam("总毛重")
+    @BusiColumn(importExcelColumn = 14)
+    private Double totalGrossWeight;
+
+    @Column(name = "TOTAL_NET_WEIGHT")
+    @ApiParam("总净重")
+    @BusiColumn(importExcelColumn = 15)
+    private Double totalNetWeight;
+
+    @Column(name = "TOTAL_NUMBER")
+    @ApiParam("总件数")
+    @BusiColumn(importExcelColumn = 16)
+    private Double totalNumber;
+
+    // 字典维护 CURRENCY_SYSTEM_DICTIONARY
+    @Column(name = "PACKAGE_TYPE")
+    @ApiParam("包装类型")
+    @BusiColumn(importExcelColumn = 17)
+    private String packageType;
+
+    @Column(name = "IS_BONDED_GOODS_CARPOOL")
+    @ApiParam("是否与保税货物拼车")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value", value = "description")
+    @BusiColumn(importExcelColumn = 18)
+    private Integer isBondedGoodsCarpool;
+
+    @Column(name = "IS_GENERATE_EXPORT_TASK" ,columnDefinition = "int(11) default 2")
+    @ApiParam("是否已生成导出任务")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value", value = "description")
+    private Integer isGenerateExportTask;
+
+    //使用合同号字段
+//    @Column(name = "TRANSACTION_NO")
+//    @ApiParam("P/O NO单号")
+//    private String transactionNo;
+
+    @Column(name = "OUT_AREA_DATE")
+    @ApiParam("出区日期")
+    private String outAreaDate;
+
+    @Column(name = "MARK")
+    @ApiParam("唛头;发货标记;装运标志")
+    private String mark;
+
+    /**查询参数 start **/
+
+    @Transient
+    @ApiParam("查询参数，开始交货日期")
+    private String deliveryDateStart;
+
+    @Transient
+    @ApiParam("查询参数，结束交货日期")
+    private String deliveryDateEnd;
+
+    @Transient
+    @ApiParam("查询参数，进出卡开始日期")
+    private String cardEntryDateStart;
+
+    @Transient
+    @ApiParam("查询参数，进出卡结束日期")
+    private String cardEntryDateEnd;
+
+    @Transient
+    @ApiParam("付款方式")
+    private String payTypeDesc;
+
+
+    /**查询参数 end **/
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmEnum.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmEnum.java
new file mode 100644
index 0000000..7004506
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmEnum.java
@@ -0,0 +1,72 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 数据字典-枚举
+ * @Reference :
+ * @Author : PUXIAO
+ * @CreateDate : 2022-02-16
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_ENUM")
+@Api("数据字典-枚举")
+public class CdmEnum extends BaseBean {
+
+    //枚举名称
+    @Column(name = "ENUM_TYPE")
+    @ApiParam(value = "枚举类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    @AnnoOutputColumn(refClass = CdmEnumUtil.CDM_DICTIONARY_TYPE.class,refForeignKey = "value", value = "description")
+    private String enumType;
+
+    @Column(name = "ENUM_TYPE_DESC")
+    @ApiParam(value = "枚举类型描述")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String enumTypeDesc;
+
+    //value
+    @Column(name = "ENUM_VALUE_SEQ")
+    @ApiParam(value = "枚举值序号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer enumValueSeq;
+
+
+    @Column(name = "ENUM_VALUE")
+    @ApiParam(value = "枚举值")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String enumValue;
+
+    @Column(name = "ENUM_VALUE_DESC")
+    @ApiParam(value = "枚举值描述")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String enumValueDesc;
+
+    @Column(name = "ENUM_VALUE_ENG_DESC")
+    @ApiParam(value = "枚举值英文描述")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String enumValueEngDesc;
+
+    @Column(name = "ENUM_VALUE_SEQ_CODE")
+    @ApiParam(value = "枚举值序号编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String enumValueSeqCode;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportModule.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportModule.java
new file mode 100644
index 0000000..60348e0
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportModule.java
@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 导出模块
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/10 22:48
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_EXPORT_MODULE",indexes = {@Index(columnList = "MODULE_CODE")})
+@Api("导出模块")
+public class CdmExportModule extends BaseBean {
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("模块编码")
+    private String moduleCode;
+
+    @Column(name = "MODULE_NAME")
+    @ApiParam("模块名称")
+    private String moduleName;
+
+
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.CUSTOMS_BUSI_TYPE.class,refForeignKey = "value", value = "description")
+    private Integer busiType;
+
+    @Column(name = "COMPNAY_LEVEL")
+    @ApiParam("公司级别")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.COMPNAY_LEVEL.class,refForeignKey = "value", value = "description")
+    private Integer compnayLevel;
+
+    @Column(name = "CUSTOMS_TYPE")
+    @ApiParam("报关类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.CUSTOMS_TYPE.class,refForeignKey = "value", value = "description")
+    private Integer customsType;
+
+
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportModuleDetail.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportModuleDetail.java
new file mode 100644
index 0000000..18ec373
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportModuleDetail.java
@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 导出模块明细
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/10 22:48
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_EXPORT_MODULE_DETAIL",indexes = {@Index(columnList = "MODULE_CODE,TEMPLATE_CODE")})
+@Api("导出模块明细")
+public class CdmExportModuleDetail extends BaseBean {
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("模块编码")
+    private String moduleCode;
+
+    @Column(name = "TEMPLATE_CODE")
+    @ApiParam("模板编码")
+    private String templateCode;
+
+    @Column(name = "MODULE_CLASS")
+    @ApiParam("模块实现类")
+    private String moduleClass;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTask.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTask.java
new file mode 100644
index 0000000..e7b4311
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTask.java
@@ -0,0 +1,118 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 导出任务
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/10 22:48
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_EXPORT_TASK",indexes = {@Index(columnList = "TASK_NO,REF_ORDER_NO,MODULE_CODE")})
+@Api("导出任务")
+public class CdmExportTask extends BaseBean {
+
+    @Column(name = "TASK_NO")
+    @ApiParam("任务编码")
+    private String taskNo;
+
+    @Column(name = "REF_ORDER_NO")
+    @ApiParam("关联单号")
+    private String refOrderNo;
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("模块编码")
+    private String moduleCode;
+
+    @Column(name = "PARAMS",columnDefinition="TEXT")
+    @ApiParam("参数")
+    private String params;
+
+    @Column(name = "PARAMS_CLASS_NAME")
+    @ApiParam("参数类")
+    private String paramsClassName;
+
+    @Column(name = "TASK_STATUS")
+    @ApiParam("状态")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.EXPORT_TASK_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer taskStatus;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Transient
+    @ApiParam("报关类型")
+    private Integer customsType;
+
+    @Transient
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Transient
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Transient
+    @ApiParam("车牌号码")
+    private String carNo;
+
+    @Transient
+    @ApiParam("送货车次")
+    private String trainNumber;
+
+    public CdmExportTask(Long id, String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String taskNo, String refOrderNo, String moduleCode, String params, String paramsClassName, Integer taskStatus, String remark, Integer customsType, String vendorNo, String vendorName, String carNo) {
+        this.taskNo = taskNo;
+        this.refOrderNo = refOrderNo;
+        this.moduleCode = moduleCode;
+        this.params = params;
+        this.paramsClassName = paramsClassName;
+        this.taskStatus = taskStatus;
+        this.remark = remark;
+        this.customsType = customsType;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.carNo = carNo;
+        this.id = id;
+        this.organizeCode = organizeCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
+
+    public CdmExportTask(String taskNo, String refOrderNo, String moduleCode, String params, String paramsClassName, Integer taskStatus, String remark, Integer customsType, String vendorNo, String vendorName, String carNo, String trainNumber) {
+        this.taskNo = taskNo;
+        this.refOrderNo = refOrderNo;
+        this.moduleCode = moduleCode;
+        this.params = params;
+        this.paramsClassName = paramsClassName;
+        this.taskStatus = taskStatus;
+        this.remark = remark;
+        this.customsType = customsType;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.carNo = carNo;
+        this.trainNumber = trainNumber;
+    }
+
+    public CdmExportTask() {
+    }
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTaskDetail.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTaskDetail.java
new file mode 100644
index 0000000..bf2d366
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTaskDetail.java
@@ -0,0 +1,106 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.util.List;
+
+/**
+ * @Description : 导出任务明细
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/10 22:48
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_EXPORT_TASK_DETAIL",indexes = {@Index(columnList = "TASK_NO")})
+@Api("导出任务明细")
+public class CdmExportTaskDetail extends BaseBean {
+
+    @Column(name = "TASK_NO")
+    @ApiParam("任务编码")
+    private String taskNo;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    private Integer item;
+
+    @Column(name = "TEMPLATE_CODE")
+    @ApiParam("模板编码")
+    private String templateCode;
+
+    @Column(name = "MODULE_CLASS")
+    @ApiParam("模块实现类")
+    private String moduleClass;
+
+    @Column(name = "ITEM_STATUS")
+    @ApiParam("状态")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.EXPORT_TASK_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer itemStatus;
+
+    @Column(name = "FILE_NAME")
+    @ApiParam("文件名称")
+    private String fileName;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Column(name = "GROUP_NAME")
+    @ApiParam("组名")
+    private String groupName;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件原名")
+    private String fileOriginName;
+
+    @Column(name = "FILE_SIZE")
+    @ApiParam("文件大小")
+    private String fileSize;
+
+    @Column(name = "FILE_TYPE")
+    @ApiParam("文件类型")
+    private String fileType;
+
+    @Column(name = "ERROR_MSG",columnDefinition="TEXT")
+    @ApiParam("异常信息")
+    private String errorMsg;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name = "PARAMS",columnDefinition="TEXT")
+    @ApiParam("参数")
+    private String params;
+
+    @Column(name = "PARAMS_CLASS_NAME")
+    @ApiParam("参数类")
+    private String paramsClassName;
+
+    @Column(name = "JOINT_FILE_NAME")
+    @ApiParam("组合文件名称")
+    private String jointFileName;
+
+    @Transient
+    @ApiParam("下载任务单号集合")
+    private List<String> taskNoList;
+
+    @Transient
+    @ApiParam("下载文件URL集合")
+    private List<String> fileUrlList;
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTemplate.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTemplate.java
new file mode 100644
index 0000000..510c40e
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTemplate.java
@@ -0,0 +1,74 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 导出模板
+ * @Reference : TODO
+ * @Author : puxiao
+ * @CreateDate : 2022/5/10 22:48
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_EXPORT_TEMPLATE",indexes = {@Index(columnList = "TEMPLATE_CODE")})
+@Api("导出模板")
+public class CdmExportTemplate extends BaseBean {
+
+    @Column(name = "TEMPLATE_CODE")
+    @ApiParam("模板编码")
+    private String templateCode;
+
+    @Column(name = "TEMPLATE_NAME")
+    @ApiParam("模板名称")
+    private String templateName;
+
+    @Column(name = "TEMPLATE_DESC")
+    @ApiParam("模板描述")
+    private String templateDesc;
+
+    @Column(name = "FILE_NAME")
+    @ApiParam("文件名称")
+    private String fileName;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件原名")
+    private String fileOriginName;
+
+    @Column(name = "FILE_SIZE")
+    @ApiParam("文件大小")
+    private String fileSize;
+
+    @Column(name = "FILE_TYPE")
+    @ApiParam("文件类型")
+    private String fileType;
+
+    @Column(name = "GROUP_NAME")
+    @ApiParam("FastDfs Group 名称(后台使用)")
+    private String groupName;
+
+    @Column(name = "JOINT_FILE_COLUMN")
+    @ApiParam("文件拼接列位 格式：用 ‘,’ 拼接")
+    private String jointFileColumn;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTemplateFifty.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTemplateFifty.java
new file mode 100644
index 0000000..d34148f
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTemplateFifty.java
@@ -0,0 +1,143 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_EXPORT_TEMPLATE_FIFTY",indexes = {@Index(columnList = "ORDER_NO")})
+@Api("50_总公司现报核注清单表头")
+public class CdmExportTemplateFifty extends BaseBean{
+
+    @Column(name = "BUSINESS_NAME")
+    @ApiParam("经营企业名称")
+    private String businessName;
+
+    @Column(name = "BUSINESS_CODE")
+    @ApiParam("经营企业编码")
+    private String businessCode;
+
+    @Column(name = "MANUAL_CODE")
+    @ApiParam("手(账)册编号")
+    private String manualCode;
+
+    @Column(name = "IMPORT_EXPORT_MARK")
+    @ApiParam("进出口标志")
+    private String importExportMark;
+
+    @Column(name = "ENTERPRISE_INTERNAL_NUMBER")
+    @ApiParam("企业内部编号")
+    private String enterpriseInternalNumber;
+
+    @Column(name = "INTO_AREA_DATE")
+    @ApiParam("进出区日期")
+    private String intoAreaDate;
+
+    @Column(name = "PART_FINISHED_FLAG")
+    @ApiParam("料件、成品标志")
+    private String partFinishedFlag;
+
+    @Column(name = "SUPERVISION_METHOD")
+    @ApiParam("监管方式")
+    private String supervisionMethod;
+
+    @Column(name = "SHIPPING_TYPE")
+    @ApiParam("运输方式")
+    private String shippingType;
+
+    @Column(name = "INBOUND_OUTBOUND_CUSTOMS")
+    @ApiParam("进/出境关别")
+    private String inboundOutboundCustoms;
+
+    @Column(name = "DESTINATION_COUNTRY")
+    @ApiParam("启运/运抵国(地区)")
+    private String destinationCountry;
+
+    @Column(name = "LIST_TYPE")
+    @ApiParam("清单类型")
+    private String listType;
+
+    @Column(name = "COUNTERPARTY")
+    @ApiParam("交易方")
+    private String counterparty;
+
+    @Column(name = "RETURN_NUMBER")
+    @ApiParam("申报表编号")
+    private String returnNumber;
+
+    @Column(name = "APPLICANT_NAME")
+    @ApiParam("申报单位名称")
+    private String applicantName;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    private String orderNo;
+
+    @Column(name = "PRE_INPUT_UNIFIED_NUMBER")
+    @ApiParam("预录入统一编号")
+    private String preInputUnifiedNumber;
+
+    @Column(name = "REMAKE")
+    @ApiParam("暂存结果对比说明")
+    private String remake;
+
+    @Column(name = "HOLD_FOR_CONFIRMATION")
+    @ApiParam("暂存核对是否认可")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.HOLD_FOR_CONFIRMATION.class,refForeignKey = "value", value = "description")
+    private Integer holdForConfirmation;
+
+    @Column(name = "TEMPORARY_HOLD_CHECK_STATUS")
+    @ApiParam("暂存核对状态")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.TEMPORARY_HOLD_CHECK_STATUS.class,refForeignKey = "value", value = "description")
+    @ColumnDefault("2")
+    private Integer temporaryHoldCheckStatus;
+
+    @Column(name = "LIST_NUMBER")
+    @ApiParam("清单编号")
+    private String listNumber;
+
+    @Column(name = "TASK_NO")
+    @ApiParam("任务编号")
+    private String taskNo;
+
+    public CdmExportTemplateFifty() {
+    }
+
+    public CdmExportTemplateFifty(String businessName, String businessCode, String manualCode, String importExportMark,
+                                  String enterpriseInternalNumber,String partFinishedFlag,
+                                  String supervisionMethod, String shippingType, String inboundOutboundCustoms,
+                                  String destinationCountry, String listType, String counterparty, String returnNumber,
+                                  String applicantName, String preInputUnifiedNumber,String listNumber) {
+        this.businessName = businessName;
+        this.businessCode = businessCode;
+        this.manualCode = manualCode;
+        this.importExportMark = importExportMark;
+        this.enterpriseInternalNumber = enterpriseInternalNumber;
+        this.partFinishedFlag = partFinishedFlag;
+        this.supervisionMethod = supervisionMethod;
+        this.shippingType = shippingType;
+        this.inboundOutboundCustoms = inboundOutboundCustoms;
+        this.destinationCountry = destinationCountry;
+        this.listType = listType;
+        this.counterparty = counterparty;
+        this.returnNumber = returnNumber;
+        this.applicantName = applicantName;
+        this.preInputUnifiedNumber = preInputUnifiedNumber;
+        this.listNumber = listNumber;
+    }
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTemplateFortyTravel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTemplateFortyTravel.java
new file mode 100644
index 0000000..10bf677
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTemplateFortyTravel.java
@@ -0,0 +1,160 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_EXPORT_TEMPLATE_FORTY_TRAVEL",indexes = {@Index(columnList = "CUSTOMS_ORDER_NO")})
+@Api("40_总公司分送集报出入库单表体")
+public class CdmExportTemplateFortyTravel extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 2250271023708036705L;
+
+    @Column(name = "CUSTOMS_ORDER_NO")
+    @ApiParam("报关单号")
+    private String customsOrderNo;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("30模板单号")
+    private String orderNo;
+
+    @Column(name = "PRODUCT_NUMBER")
+    @ApiParam("商品序号")
+    private String productNumber;
+
+    @Column(name = "RETURN_NUMBER")
+    @ApiParam("申报表序号")
+    private String returnNumber;
+
+    @Column(name = "ACCOUNT_GOODS_NUMBER")
+    @ApiParam("底账商品序号")
+    private String accountGoodsNumber;
+
+    @Column(name = "ITEM_NO")
+    @ApiParam("料号")
+    private String itemNo;
+
+    @Column(name = "COMMODITY_NO")
+    @ApiParam("商品编码")
+    private String commodityNo;
+
+    @Column(name = "COMMODITY_NAME")
+    @ApiParam("商品名称")
+    private String commodityName;
+
+    @Column(name = "COMMODITY_SPECIFICATION_MODEL")
+    @ApiParam("商品规格型号")
+    private String commoditySpecificationModel;
+
+    @Column(name = "DECLARED_UNIT_MEASUREMENT")
+    @ApiParam("申报计量单位")
+    private String declaredUnitMeasurement;
+
+    @Column(name = "CURRENCY_SYSTEM")
+    @ApiParam("币制")
+    private String currencySystem;
+
+    @Column(name = "DECLARED_QUANTITY")
+    @ApiParam("申报数量")
+    private String declaredQuantity;
+
+    @Column(name = "DECLARED_UNIT_PRICE")
+    @ApiParam("申报单价")
+    private String declaredUnitPrice;
+
+    @Column(name = "DECLARED_TOTAL_PRICE")
+    @ApiParam("申报总价")
+    private String declaredTotalPrice;
+
+    @Column(name = "LEGAL_MEASUREMENT_UNIT")
+    @ApiParam("法定计量单位")
+    private String legalMeasurementUnit;
+
+    @Column(name = "LEGAL_MEASUREMENT_SECOND_UNIT")
+    @ApiParam("法定第二计量单位")
+    private String legalMeasurementSecondUnit;
+
+    @Column(name = "LEGAL_QUANTITY")
+    @ApiParam("法定数量")
+    private String legalQuantity;
+
+    @Column(name = "LEGAL_SECOND_QUANTITY")
+    @ApiParam("第二法定数量")
+    private String legalSecondQuantity;
+
+    @Column(name = "UNIT_CONSUMPTION_VERSION")
+    @ApiParam("单耗版本号")
+    private String unitConsumptionVersion;
+
+    @Column(name = "CLASSIFICATION_MARK")
+    @ApiParam("归类标志")
+    private String classificationMark;
+
+    @Column(name = "WEIGHT_SCALE_FACTOR")
+    @ApiParam("重量比例因子")
+    private String weightScaleFactor;
+
+    @Column(name = "FIRST_SCALE_FACTOR")
+    @ApiParam("第一比例因子")
+    private String firstScaleFactor;
+
+    @Column(name = "SECOND_SCALE_FACTOR")
+    @ApiParam("第二比例因子")
+    private String secondScaleFactor;
+
+    @Column(name = "ROUGH_WEIGHT")
+    @ApiParam("毛重")
+    private String roughWeight;
+
+    @Column(name = "NET_WEIGHT")
+    @ApiParam("净重")
+    private String netWeight;
+
+    @Column(name = "ASSOCIATED_COMMODITY_NUMBER")
+    @ApiParam("关联商品序号")
+    private String associatedCommodityNumber;
+
+    @Column(name = "ORIGIN_COUNTRY")
+    @ApiParam("原产国(地区)")
+    private String originCountry;
+
+    @Column(name = "FINAL_COUNTRY")
+    @ApiParam("最终目的国(地区)")
+    private String finalCountry;
+
+    @Column(name = "IS_PARTICIPATION_MERGER")
+    @ApiParam("是否参与合并")
+    private String isParticipationMerger;
+
+    @Column(name = "EXEMPTION_METHOD")
+    @ApiParam("征免方式")
+    private String exemptionMethod;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name = "BUSI_DECLARE_NO")
+    @ApiParam("业务申报表编号")
+    private String busiDeclareNo;
+
+    /**
+     * 导出主表ID
+     */
+    @Column(name = "TASK_NO")
+    @ApiParam("任务编码")
+    private String taskNo;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTemplateSixty.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTemplateSixty.java
new file mode 100644
index 0000000..2603651
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTemplateSixty.java
@@ -0,0 +1,128 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.util.List;
+
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_EXPORT_TEMPLATE_SIXTY",indexes = {@Index(columnList = "ORDER_NO")})
+@Api("60_总公司核注清单表体一")
+public class CdmExportTemplateSixty extends BaseBean {
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("序号")
+    private Long serialNumber;
+
+    @Column(name = "PRODUCT_NUMBER")
+    @ApiParam("商品序号")
+    private String productNumber;
+
+    @Column(name = "RECORD_SERIAL_NUMBER")
+    @ApiParam("备案序号")
+    private String recordSerialNumber;
+
+    @Column(name = "CUSTOMS_COMMODITY_NO")
+    @ApiParam("商品料号")
+    private String customsCommodityNo;
+
+    @Column(name = "COMMODITY_NO")
+    @ApiParam("商品编码")
+    private String commodityNo;
+
+    @Column(name = "COMMODITY_NAME")
+    @ApiParam("商品名称")
+    private String commodityName;
+
+    @Column(name = "SPECIFICATIONS_MODELS")
+    @ApiParam("规格型号")
+    private String specificationsModels;
+
+    @Column(name = "ORIGIN_COUNTRY")
+    @ApiParam("原产国")
+    private String originCountry;
+
+    @Column(name = "DESTINATION_COUNTRY")
+    @ApiParam("最终目的国")
+    private String destinationCountry;
+
+    @Column(name = "CURRENCY_SYSTEM")
+    @ApiParam("币制")
+    private String currencySystem;
+
+    @Column(name = "DECLARED_UNIT_PRICE")
+    @ApiParam("申报单价")
+    private String declaredUnitPrice;
+
+    @Column(name = "QTY")
+    @ApiParam("申报数量")
+    private String qty;
+
+    @Column(name = "DECLARE_UNIT")
+    @ApiParam("申报计量单位")
+    private String declareUnit;
+
+    @Column(name = "DECLARED_TOTAL_PRICE")
+    @ApiParam("申报总价")
+    private String declaredTotalPrice;
+
+    @Column(name = "LEGAL_QUANTITY")
+    @ApiParam("法定数量")
+    private String legalQuantity;
+
+    @Column(name = "LEGAL_MEASUREMENT_UNIT")
+    @ApiParam("法定计量单位")
+    private String legalMeasurementUnit;
+
+    @Column(name = "LEGAL_SECOND_QUANTITY")
+    @ApiParam("第二法定数量")
+    private String legalSecondQuantity;
+
+    @Column(name = "LEGAL_MEASUREMENT_SECOND_UNIT")
+    @ApiParam("第二法定计量单位")
+    private String legalMeasurementSecondUnit;
+
+    @Column(name = "GROSS_WEIGHT")
+    @ApiParam("毛重")
+    private String grossWeight;
+
+    @Column(name = "NET_WEIGHT")
+    @ApiParam("净重")
+    private String netWeight;
+
+    @Column(name = "EXEMPTION_METHOD")
+    @ApiParam("征免方式")
+    private String exemptionMethod;
+
+    @Column(name = "ORDER_VERSION_NO")
+    @ApiParam("单号版本号")
+    private String orderVersionNo;
+
+    @Column(name = "DECLARE_ELEMENT")
+    @ApiParam("申报要素")
+    private String declareElement;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    private String orderNo;
+
+    @Column(name = "TASK_NO")
+    @ApiParam("任务单号")
+    private String taskNo;
+
+    @Transient
+    @ApiParam("对比差异项")
+    List<String> gapItem;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTemplateThirtyTravel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTemplateThirtyTravel.java
new file mode 100644
index 0000000..b7834d5
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmExportTemplateThirtyTravel.java
@@ -0,0 +1,99 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_EXPORT_TEMPLATE_THIRTY_TRAVEL",indexes = {@Index(columnList = "CUSTOMS_ORDER_NO")})
+@Api("30_总公司分送集报出入库单表头导出履历表")
+public class CdmExportTemplateThirtyTravel extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8042497265929333553L;
+
+    @Column(name = "CUSTOMS_ORDER_NO")
+    @ApiParam("报关单号")
+    private String customsOrderNo;
+
+    @Column(name = "BUSINESS_NAME")
+    @ApiParam("经营企业名称")
+    private String businessName;
+
+    @Column(name = "BUSINESS_CODE")
+    @ApiParam("经营企业编码")
+    private String businessCode;
+
+    @Column(name = "CARDENTRY_DATE")
+    @ApiParam("进出卡日期")
+    private String cardEntryDate;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("编号")
+    private String orderNo;
+
+    @Column(name = "RETURN_NO")
+    @ApiParam("申报表编号")
+    private String returnNo;
+
+    @Column(name = "ACCOUNT_NUMBER")
+    @ApiParam("账册编号")
+    private String accountNumber;
+
+    @Column(name = "INBOUND_OUTBOUN_TYPE")
+    @ApiParam("出入库类型")
+    private String inboundOutbounType;
+
+    @Column(name = "INBOUND_OUTBOUN_CODE")
+    @ApiParam("关联出入库单编号")
+    private String inboundOutbounCode;
+
+    @Column(name = "ENTERPRISE_INTERNAL_NUMBER")
+    @ApiParam("企业内部编号")
+    private String enterpriseInternalNumber;
+
+    @Column(name = "ROUGH_WEIGHT")
+    @ApiParam("毛重")
+    private String roughWeight;
+
+    @Column(name = "NET_WEIGHT")
+    @ApiParam("净重")
+    private String netWeight;
+
+    @Column(name = "NUMBER")
+    @ApiParam("件数")
+    private String number;
+
+    @Column(name = "PACK_TYPE")
+    @ApiParam("包装种类")
+    private String packType;
+
+    @Column(name = "WHETHER_IT_HAS_BEEN_GENERATED")
+    @ApiParam("是否已生成核注清单")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value", value = "description")
+    @ColumnDefault("2")
+    private Integer whetherItHasBeenGenerated = 2;
+
+    @Transient
+    @ApiParam("创建开始时间")
+    private String createDateTimeStart;
+
+    @Transient
+    @ApiParam("创建结束时间")
+    private String createDateTimeEnd;
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmFile.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmFile.java
new file mode 100644
index 0000000..f959195
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmFile.java
@@ -0,0 +1,70 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/12/4 1:28 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_FILE")
+@Api("文件表")
+public class CdmFile extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -5558031402910862600L;
+
+    @Column(name = "FILE_NAME")
+    @ApiParam("文件名称")
+    private String fileName;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Column(name = "GROUP_NAME")
+    @ApiParam("组名")
+    private String groupName;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件原名")
+    private String fileOriginName;
+
+    @Column(name = "FILE_SIZE")
+    @ApiParam("文件大小")
+    private String fileSize;
+
+    @Column(name = "FILE_TYPE")
+    @ApiParam("文件类型名称")
+    private String fileType;
+
+    @Column(name = "SYNC_TAG")
+    @ApiParam("同步标记")
+    private Integer syncTag = 0;
+
+    @Column(name = "FILE_MODULE_TYPE")
+    @ApiParam("所属模块")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.FILE_MODULE_TYPE.class, refForeignKey = "value", value = "description", hidden = true)
+    private Integer fileModuleType;
+
+    @Column(name = "MODULE_ID")
+    @ApiParam("模块ID")
+    private Long moduleId;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmFinalDeclarationDataDetails.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmFinalDeclarationDataDetails.java
new file mode 100644
index 0000000..6388943
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmFinalDeclarationDataDetails.java
@@ -0,0 +1,122 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_FINAL_DECLARATION_DATA_DETAILS")
+@Api("终审报关数据明细表")
+public class CdmFinalDeclarationDataDetails extends BaseBean {
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("序号")
+    private Long serialNumber;
+
+    @Column(name = "PRODUCT_NUMBER")
+    @ApiParam("商品序号")
+    private String productNumber;
+
+    @Column(name = "RECORD_SERIAL_NUMBER")
+    @ApiParam("备案序号")
+    private String recordSerialNumber;
+
+    @Column(name = "CUSTOMS_COMMODITY_NO")
+    @ApiParam("商品料号")
+    private String customsCommodityNo;
+
+    @Column(name = "COMMODITY_NO")
+    @ApiParam("商品编码")
+    private String commodityNo;
+
+    @Column(name = "COMMODITY_NAME")
+    @ApiParam("商品名称")
+    private String commodityName;
+
+    @Column(name = "SPECIFICATIONS_MODELS")
+    @ApiParam("规格型号")
+    private String specificationsModels;
+
+    @Column(name = "ORIGIN_COUNTRY")
+    @ApiParam("原产国")
+    private String originCountry;
+
+    @Column(name = "DESTINATION_COUNTRY")
+    @ApiParam("最终目的国")
+    private String destinationCountry;
+
+    @Column(name = "CURRENCY_SYSTEM")
+    @ApiParam("币制")
+    private String currencySystem;
+
+    @Column(name = "DECLARED_UNIT_PRICE")
+    @ApiParam("申报单价")
+    private String declaredUnitPrice;
+
+    @Column(name = "QTY")
+    @ApiParam("申报数量")
+    private String qty;
+
+    @Column(name = "DECLARE_UNIT")
+    @ApiParam("申报计量单位")
+    private String declareUnit;
+
+    @Column(name = "DECLARED_TOTAL_PRICE")
+    @ApiParam("申报总价")
+    private String declaredTotalPrice;
+
+    @Column(name = "LEGAL_QUANTITY")
+    @ApiParam("法定数量")
+    private String legalQuantity;
+
+    @Column(name = "LEGAL_MEASUREMENT_UNIT")
+    @ApiParam("法定计量单位")
+    private String legalMeasurementUnit;
+
+    @Column(name = "LEGAL_SECOND_QUANTITY")
+    @ApiParam("第二法定数量")
+    private String legalSecondQuantity;
+
+    @Column(name = "LEGAL_MEASUREMENT_SECOND_UNIT")
+    @ApiParam("第二法定计量单位")
+    private String legalMeasurementSecondUnit;
+
+    @Column(name = "GROSS_WEIGHT")
+    @ApiParam("毛重")
+    private String grossWeight;
+
+    @Column(name = "NET_WEIGHT")
+    @ApiParam("净重")
+    private String netWeight;
+
+    @Column(name = "EXEMPTION_METHOD")
+    @ApiParam("征免方式")
+    private String exemptionMethod;
+
+    @Column(name = "ORDER_VERSION_NO")
+    @ApiParam("单号版本号")
+    private String orderVersionNo;
+
+    @Column(name = "DECLARE_ELEMENT")
+    @ApiParam("申报要素")
+    private String declareElement;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    private String orderNo;
+
+    @Transient
+    @ApiParam("对比差异项")
+    List<String> gapItem;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmFinalDeclarationDataMaster.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmFinalDeclarationDataMaster.java
new file mode 100644
index 0000000..dca46e4
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmFinalDeclarationDataMaster.java
@@ -0,0 +1,174 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_FINAL_DECLARATION_DATA_MASTER")
+@Api("终审报关数据主表")
+public class CdmFinalDeclarationDataMaster extends BaseBean {
+
+    @Column(name = "BUSINESS_NAME")
+    @ApiParam("经营企业名称")
+    private String businessName;
+
+    @Column(name = "BUSINESS_CODE")
+    @ApiParam("经营企业编码")
+    private String businessCode;
+
+    @Column(name = "MANUAL_CODE")
+    @ApiParam("手(账)册编号")
+    private String manualCode;
+
+    @Column(name = "IMPORT_EXPORT_MARK")
+    @ApiParam("进出口标志")
+    private String importExportMark;
+
+    @Column(name = "ENTERPRISE_INTERNAL_NUMBER")
+    @ApiParam("企业内部编号")
+    private String enterpriseInternalNumber;
+
+    @Column(name = "INTO_AREA_DATE")
+    @ApiParam("进出区日期")
+    private String intoAreaDate;
+
+    @Column(name = "PART_FINISHED_FLAG")
+    @ApiParam("料件、成品标志")
+    private String partFinishedFlag;
+
+    @Column(name = "SUPERVISION_METHOD")
+    @ApiParam("监管方式")
+    private String supervisionMethod;
+
+    @Column(name = "SHIPPING_TYPE")
+    @ApiParam("运输方式")
+    private String shippingType;
+
+    @Column(name = "INBOUND_OUTBOUND_CUSTOMS")
+    @ApiParam("进/出境关别")
+    private String inboundOutboundCustoms;
+
+    @Column(name = "DESTINATION_COUNTRY")
+    @ApiParam("启运/运抵国(地区)")
+    private String destinationCountry;
+
+    @Column(name = "LIST_TYPE")
+    @ApiParam("清单类型")
+    private String listType;
+
+    @Column(name = "COUNTERPARTY")
+    @ApiParam("交易方")
+    private String counterparty;
+
+    @Column(name = "RETURN_NUMBER")
+    @ApiParam("申报表编号")
+    private String returnNumber;
+
+    @Column(name = "APPLICANT_NAME")
+    @ApiParam("申报单位名称")
+    private String applicantName;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("核注清单单号")
+    private String orderNo;
+
+    @Column(name = "PRE_INPUT_UNIFIED_NUMBER")
+    @ApiParam("预录入统一编号")
+    private String preInputUnifiedNumber;
+
+    @Column(name = "REMAKE")
+    @ApiParam("终审核对结果说明")
+    private String remake;
+
+    @Column(name = "THE_FINAL_CONFIRMATION")
+    @ApiParam("终审核对是否认可")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.HOLD_FOR_CONFIRMATION.class,refForeignKey = "value", value = "description")
+    private Integer theFinalConfirmation;
+
+    @Column(name = "THE_FINAL_CHECK_STATUS")
+    @ApiParam("终审核对核对状态")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.TEMPORARY_HOLD_CHECK_STATUS.class,refForeignKey = "value", value = "description")
+    @ColumnDefault("2")
+    private Integer theFinalCheckStatus;
+
+    @Column(name = "FINAL_AUDIT_NOTE_NUMBER")
+    @ApiParam("终审核注单号")
+    private String finalAuditNoteNumber;
+
+    @Column(name = "TYPE_OF_DECLARATION")
+    @ApiParam("报关类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.TYPE_OF_DECLARATION.class,refForeignKey = "value", value = "description")
+    private Integer typeOfDeclaration;
+
+    @Column(name = "LIST_NUMBER")
+    @ApiParam("清单编号")
+    private String listNumber;
+
+    @Column(name = "TIME_OF_ENTRY_AND_EXIT")
+    @ApiParam("出入库时间")
+    private String timeOfEntryAndExit;
+
+    @Column(name = "OPERATING_ENTERPRISE_SOCIAL_CREDIT_CODE")
+    @ApiParam("经营企业社会信用代码")
+    private String operatingEnterpriseSocialCreditCode;
+
+    @Column(name = "CUSTOMER")
+    @ApiParam("客户")
+    private String customer;
+
+    @Column(name = "SOCIAL_CREDIT_CODE_OF_THE_APPLICANT")
+    @ApiParam("申报单位社会信用代码")
+    private String socialCreditCodeOfTheApplicant;
+
+    @Column(name = "DATE_OF_ENTRY")
+    @ApiParam("录入日期")
+    private String dateOfEntry;
+
+    @Column(name = "LIST_DECLARATION_DATE")
+    @ApiParam("清单申报日期")
+    private String listDeclarationDate;
+
+    @Column(name = "COMPETENT_CUSTOMS_OFFICE")
+    @ApiParam("主管海关")
+    private String competentCustomsOffice;
+
+    @Column(name = "NUCLEAR_BUCKLE_MARK")
+    @ApiParam("核扣标志")
+    private String nuclearBuckleMark;
+
+    @Column(name = "TYPE_OF_FLOW")
+    @ApiParam("流转类型")
+    private String typeOfFlow;
+
+    @Column(name = "DECLARE_MARK")
+    @ApiParam("报关标志")
+    private String declareMark;
+
+    @Column(name = "LIST_TYPE_OF_DECLARATION")
+    @ApiParam("清单报关类型")
+    private String listTypeOfDeclaration;
+
+    @Column(name = "CUSTOM_ORDER_TYPE")
+    @ApiParam("报关单类型")
+    private String customOrderType;
+
+    @Column(name = "REF_CUSTOMS_ORDER_NO")
+    @ApiParam("关联报关单编号")
+    private String refCustomsOrderNo;
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmModuleExcelManage.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmModuleExcelManage.java
new file mode 100644
index 0000000..816b25c
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmModuleExcelManage.java
@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/7/30 9:30 AM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_MODULE_EXCEL_MANAGE", indexes = {
+        @Index(columnList = "MODULE_CODE"),
+        @Index(columnList = "MODULE_NAME")
+})
+@Api("模块EXCEL管理表")
+public class CdmModuleExcelManage extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -7408420967872044535L;
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("模块代码")
+    private String moduleCode;
+
+    @Column(name = "MODULE_NAME")
+    @ApiParam("模块名称")
+    private String moduleName;
+
+    @Column(name = "FILE_ID")
+    @ApiParam("文件id")
+    private Long fileId;
+
+    @Transient
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmNuclearReleaseFile.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmNuclearReleaseFile.java
new file mode 100644
index 0000000..065cb9b
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmNuclearReleaseFile.java
@@ -0,0 +1,77 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.cdm.annotation.BusiColumn;
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_NUCLEAR_RELEASE_FILE",indexes = {@Index(columnList = "ORDER_NO")})
+@Api("核放单文件")
+public class CdmNuclearReleaseFile extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    private String orderNo;
+
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.CUSTOMS_BUSI_TYPE.class)
+    private Integer busiType;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "DELIVERY_DATE")
+    @ApiParam("交货日期")
+    @BusiColumn(dateFormat = "*")
+    private String deliveryDate;
+
+    @Column(name = "GOODS_ACCESS_TYPE")
+    @ApiParam("货物进出类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.GOODS_PUT_OUT_TYPE.class,refForeignKey = "value", value = "description")
+    private Integer goodsAccessType;
+
+    @Column(name = "CAR_NO")
+    @ApiParam("车牌号码")
+    private String carNo;
+
+    @Column(name = "TRAIN_NUMBER")
+    @ApiParam("送货车次")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.DELIVERY_TRAIN_NUMBER.class,refForeignKey = "value", value = "description")
+    private Integer trainNumber;
+
+    @Column(name = "FILE_ID")
+    @ApiParam("文件ID")
+    private Long fileId;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件源名")
+    private String fileOriginName;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Transient
+    @ApiParam("交货日期，开始时间")
+    private String deliveryDateStart;
+
+    @Transient
+    @ApiParam("交货日期，结束时间")
+    private String deliveryDateEnd;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmPurchaseInfo.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmPurchaseInfo.java
new file mode 100644
index 0000000..64fed38
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmPurchaseInfo.java
@@ -0,0 +1,93 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : CDM采购信息
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/19 17:59
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_PURCHASE_INFO", indexes = {
+        @Index(columnList = "VENDOR_NO, PART_NO"),
+        @Index(columnList = "VENDOR_NO"),
+        @Index(columnList = "PART_NO")
+})
+@Api("CDM采购信息")
+public class CdmPurchaseInfo extends BaseBean {
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    @Transient
+    private String vendorName;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @ApiParam("物料名称")
+    @Transient
+    private String partNameRdd;
+
+    @Column(name = "PURCHASE_CATEGORY")
+    @ApiParam("采购信息类别")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    @AnnoOutputColumn(refClass = CdmEnumUtil.PURCHASE_CATEGORY.class, refForeignKey = "value", value = "description")
+    private String purchaseCategory;
+
+
+    @Column(name = "EFF_START_TIME")
+    @ApiParam("有效开始日期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String effStartTime;
+
+    @Column(name = "EFF_END_TIME")
+    @ApiParam("有效截止日期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String effEndTime;
+
+    @Column(name = "CURRENCY")
+    @ApiParam("币种")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String currency;
+
+    @Column(name = "UNIT_PRICE",columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam("单价")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Double unitPrice;
+
+    @Column(name = "QUANTITY_UNIT")
+    @ApiParam("数量单位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String quantityUnit;
+
+    @Column(name = "SALES_ORGANIZE_CODE")
+    @ApiParam("销售组织")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String saleOrganizeCode;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmSalesPrice.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmSalesPrice.java
new file mode 100644
index 0000000..3caf0b6
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmSalesPrice.java
@@ -0,0 +1,119 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : CDM销售单价
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/19 17:59
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_SALES_PRICE", indexes = {
+        @Index(columnList = "PART_NO")
+})
+@Api("销售单价")
+public class CdmSalesPrice extends BaseBean {
+
+    @Column(name = "COMPNAY")
+    @ApiParam("公司")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String compnay;
+
+    @Column(name = "SALES_ORGANIZATION")
+    @ApiParam("销售组织")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String salesOrganization;
+
+    @Column(name = "SALES_CHANNES")
+    @ApiParam("销售渠道")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String salesChannel;
+
+    @Column(name = "PRODUCT_GROUP")
+    @ApiParam("产品组")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String productGroup;
+
+    @Column(name = "SELLER")
+    @ApiParam("售达方")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String seller;
+
+    @Column(name = "SERVED")
+    @ApiParam("送达方")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String served;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String partNameRdd;
+
+    @Column(name = "UNIT_PRICE",columnDefinition = "decimal(10,2)")
+    @ApiParam("销售单价")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Double unitPrice;
+
+    @Column(name = "CURRENCY")
+    @ApiParam("币种")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String currency;
+
+    @Column(name = "QUANTITY_UNIT")
+    @ApiParam("数量单位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String quantityUnit;
+
+
+    @Column(name = "MEASURE_UNIT")
+    @ApiParam("计量单位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String measureUnit;
+
+    @Column(name = "EFF_START_TIME")
+    @ApiParam("开始有效时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String effStartTime;
+
+    @Column(name = "EFF_END_TIME")
+    @ApiParam("开始结束时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String effEndTime;
+
+    @Column(name = "CONDITION_TYPE")
+    @ApiParam("条件类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String conditionType;
+
+    @Column(name = "IS_SYNC", columnDefinition = "int default 2")
+    @ApiParam("同步标识")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer isSync;
+
+    @Column(name = "IS_SYNC1", columnDefinition = "int default 2")
+    @ApiParam("同步标识")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer isSync1;
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmVendorPartRel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmVendorPartRel.java
new file mode 100644
index 0000000..e8619ee
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/CdmVendorPartRel.java
@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.cdm.annotation.BusiColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "CDM_VENDOR_PART_REL", indexes = {@Index(columnList = "PART_NO")})
+@Api(value = "供应商物料关系")
+public class CdmVendorPartRel extends BaseBean {
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    @Transient
+    private String vendorName;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @ApiParam("物料名称")
+    @Transient
+    private String partName;
+
+    @Column(name = "CURRENCY")
+    @ApiParam("币种")
+    @BusiColumn(importExcelColumn = 4)
+    private String currency;
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/SxCdmDcReportNoInfo.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/SxCdmDcReportNoInfo.java
new file mode 100644
index 0000000..56eb14b
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/SxCdmDcReportNoInfo.java
@@ -0,0 +1,88 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-cdm-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-05-12 9:46
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_CDM_DC_REPORT_NO_INFO")
+@Api("分送集报申报编号信息")
+public class SxCdmDcReportNoInfo extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 7315890811583855391L;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("序号")
+    private Double serialNumber;
+
+    @Column(name = "COUNTERPARTY_CODE")
+    @ApiParam("交易方代码")
+    private String counterpartyCode;
+
+    @Column(name = "COUNTERPARTY_NAME")
+    @ApiParam("交易方名称")
+    private String counterpartyName;
+
+    @Column(name = "PRE_ENTRY_UNIFY_NO")
+    @ApiParam("预录入统一编号")
+    private String preEntryUnifyNo;
+
+    @Column(name = "BUSI_DECLARE_NO")
+    @ApiParam("业务申报表编号")
+    private String busiDeclareNo;
+
+    @Column(name = "OUT_SIDE_FIRM_NO")
+    @ApiParam("区外企业编码")
+    private String outSideFirmNo;
+
+    @Column(name = "TRADE_TYPE")
+    @ApiParam("贸易类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.TRADE_TYPE.class,refForeignKey = "value", value = "description")
+    private Integer tradeType;
+
+    @Column(name = "TRADE_CODE")
+    @ApiParam("贸易编码")
+    private String tradeCode;
+
+    @Column(name = "SOCIAL_CREDIT_CODE")
+    @ApiParam("社会信用代码")
+    private String socialCreditCode;
+
+    @Column(name = "INNER_ENTERPRISE_NO")
+    @ApiParam("企业内部编号")
+    private String innerEnterpriseNo;
+
+    @Column(name = "ACCOUNT_NO")
+    @ApiParam("账册编号")
+    private String accountNo;
+
+    @Column(name = "GOODS_FLOW_DIRECTION")
+    @ApiParam("货物流向")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.GOODS_FLOW_DIRECTION.class, refForeignKey = "value", value = "description")
+    private Integer goodsFlowDirection;
+
+    @Column(name = "MATERIALS_COMPLETE_PRODUCT_FLAG")
+    @ApiParam("料件成品标志")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.GOODS_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer materialsCompleteProductFlag;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/SxCdmDcReportProductInfo.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/SxCdmDcReportProductInfo.java
new file mode 100644
index 0000000..4ee0af9
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/SxCdmDcReportProductInfo.java
@@ -0,0 +1,143 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-cdm-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-05-12 9:46
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_CDM_DC_REPORT_PRODUCT_INFO", uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "BUSI_DECLARE_NO","RECORD_SERIAL_NUMBER"})
+})
+@Api("分送集报申报产品信息表")
+public class SxCdmDcReportProductInfo extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 7315890811583855391L;
+
+    @Column(name = "BUSI_DECLARE_NO")
+    @ApiParam("业务申报表编号")
+    private String busiDeclareNo;
+
+    @Column(name = "DECLARE_SERIAL_NUMBER")
+    @ApiParam("申报序号")
+    private Integer declareSerialNumber;
+
+    @Column(name = "MATERIALS_COMPLETE_PRODUCT_FLAG")
+    @ApiParam("申报表料件成品标志")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.GOODS_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer materialsCompleteProductFlag;
+
+    @Column(name = "RECORD_SERIAL_NUMBER")
+    @ApiParam("备案序号")
+    private Integer recordSerialNumber;
+
+    @Column(name = "COMMODITY_NO")
+    @ApiParam("商品编码")
+    private String commodityNo;
+
+    @Column(name = "COMMODITY_NAME")
+    @ApiParam("商品名称")
+    private String commodityName;
+
+    @Column(name = "SPECIFICATIONS_MODELS")
+    @ApiParam("规格型号")
+    private String specificationsModels;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "LEGAL_MEASURE_UNIT")
+    @ApiParam("法定计量单位")
+    private String legalMeasureUnit;
+
+    @Transient
+    @ApiParam("法定计量单位名称")
+    private String legalMeasureUnitName;
+
+    @Column(name = "LEGAL2_MEASURE_UNIT")
+    @ApiParam("法定第二计量单位")
+    private String legal2MeasureUnit;
+
+    @Transient
+    @ApiParam("法定第二计量单位名称")
+    private String legal2MeasureUnitName;
+
+    @Column(name = "MEASURE_UNIT")
+    @ApiParam("计量单位")
+    private String measureUnit;
+
+    @Transient
+    @ApiParam("计量单位名称")
+    private String measureUnitName;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    //取值来源为 字典 CURRENCY_SYSTEM_DICTIONARY
+    @Column(name = "CURRENCY_SYSTEM")
+    @ApiParam("币制")
+    private String currencySystem;
+
+    @Transient
+    @ApiParam("币制描述")
+    private String currencySystemName;
+
+    @Column(name = "UNIT_PRICE")
+    @ApiParam("单价")
+    private Double unitPrice;
+
+    @Column(name = "TOTAL_PRICE")
+    @ApiParam("总价")
+    private Double totalPrice;
+
+    @Column(name = "PERMIT_NO")
+    @ApiParam("许可证编号")
+    private String permitNo;
+
+    @Column(name = "PERMIT_VALIDITY")
+    @ApiParam("许可证有效期")
+    private String permitValidity;
+
+    @Column(name = "GOODS_SIGN")
+    @ApiParam("商品标记")
+    private String goodsSign;
+
+    @Column(name = "GOODS_REMARK")
+    @ApiParam("商品备注")
+    private String goodsRemark;
+
+    @Column(name = "FP_TYPE")
+    @ApiParam("成品类型")
+    private String fpType;
+
+    @Column(name = "REMARKS")
+    @ApiParam("备注")
+    private String remarks;
+
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/SxCdmElectronicLedgerProductInfo.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/SxCdmElectronicLedgerProductInfo.java
new file mode 100644
index 0000000..647afc6
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/SxCdmElectronicLedgerProductInfo.java
@@ -0,0 +1,119 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-cdm-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-05-09 11:57
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_CDM_ELECTRONIC_LEDGER_PRODUCT_INFO",indexes = {@Index(columnList = "ACCOUNT_NO")})
+@Api("电子账册产品信息库")
+public class SxCdmElectronicLedgerProductInfo extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 7208641186227508896L;
+
+    @Column(name = "ACCOUNT_NO")
+    @ApiParam("账册编号")
+    private String accountNo;
+
+    @Column(name = "COMPANY_LEVEL")
+    @ApiParam("公司级别")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.COMPNAY_LEVEL.class,refForeignKey = "value", value = "description")
+    private Integer companyLevel;
+
+    @Column(name = "MATERIALS_COMPLETE_PRODUCT_FLAG")
+    @ApiParam("料件成品标志")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.GOODS_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer materialsCompleteProductFlag;
+
+    @Column(name = "RECORD_SERIAL_NUMBER")
+    @ApiParam("备案序号")
+    private Integer recordSerialNumber;
+
+    @Column(name = "CUSTOMS_COMMODITY_NO")
+    @ApiParam("商品料号 （海关商品料号取值）")
+    private String customsCommodityNo;
+
+    @Column(name = "COMMODITY_NO")
+    @ApiParam("商品编码")
+    private String commodityNo;
+
+    @Column(name = "COMMODITY_NAME")
+    @ApiParam("商品名称")
+    private String commodityName;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "DECLARE_MEASURE_UNIT")
+    @ApiParam("申报计量单位")
+    private String declareMeasureUnit;
+
+    @Transient
+    @ApiParam("申报计量单位名称")
+    private String declareMeasureUnitName;
+
+    @Column(name = "LEGAL_MEASURE_UNIT")
+    @ApiParam("法定计量单位")
+    private String legalMeasureUnit;
+
+    @Transient
+    @ApiParam("法定计量单位名称")
+    private String legalMeasureUnitName;
+
+    @Column(name = "LEGAL2_MEASURE_UNIT")
+    @ApiParam("法定第二计量单位")
+    private String legal2MeasureUnit;
+
+    @Transient
+    @ApiParam("法定第二计量单位名称")
+    private String legal2MeasureUnitName;
+
+    @Lob
+    @Column(name = "DECLARE_ELEMENT")
+    @ApiParam("申报要素")
+    private String declareElement;
+
+    @Column(name = "CHECKOUT_QUARANTINE_NO")
+    @ApiParam("检验检疫编码")
+    private String checkoutQuarantineNo;
+
+    @Column(name = "COUNTERPARTY_PART_NO")
+    @ApiParam("交易方物料编码")
+    private String counterpartyPartNo;
+
+    @Column(name = "COMMODITY_SN")
+    @ApiParam("商品条码")
+    private String commoditySn;
+
+    @Column(name = "TARIFF_RATE")
+    @ApiParam("关税率")
+    private Double tariffRate;
+
+    @Column(name = "VAT_RATES")
+    @ApiParam("增值税率")
+    private Double vatRates;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/SxCdmPackagingRelationship.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/SxCdmPackagingRelationship.java
new file mode 100644
index 0000000..eea73f8
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/SxCdmPackagingRelationship.java
@@ -0,0 +1,80 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-cdm-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-05-09 15:48
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_CDM_PACKAGING_RELATIONSHIP")
+@Api("包装关系")
+public class SxCdmPackagingRelationship extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 8704426917376881616L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "PCS_QTY")
+    @ApiParam("PCS数量")
+    private Double pcsQty;
+
+    @Column(name = "CTNS_BOX_QTY")
+    @ApiParam("CTNS箱数量")
+    private Double ctnsBoxQty;
+
+    @Column(name = "PALLETS_TRAY_QTY")
+    @ApiParam("PALLETS托数量")
+    private Double palletsTrayQty;
+
+    @Column(name = "SINGLE_PACKING_VOLUME")
+    @ApiParam("单包装箱体积")
+    private Double singlePackingVolume;
+
+    @Column(name = "TRAY_TYPE")
+    @ApiParam("托盘类型")
+    private String trayType;
+
+    @Column(name = "SINGLE_TRAY_VOLUME")
+    @ApiParam("单托盘体积")
+    private Double singleTrayVolume;
+
+    @Column(name = "SIZE_DIVIDE_C_VOLUME")
+    @ApiParam("SIZE/C体积")
+    private String sizeDivideCVolume;
+
+    public Double getSinglePackingVolume() {
+        if(this.singlePackingVolume == null) {
+            return 0.0;
+        }
+        return this.singlePackingVolume;
+    }
+
+    public Double getSingleTrayVolume() {
+        if(this.singleTrayVolume == null) {
+            return 0.0;
+        }
+        return this.singleTrayVolume;
+    }
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/SxCdmPart.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/SxCdmPart.java
new file mode 100644
index 0000000..b855f88
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/SxCdmPart.java
@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @PROJECT_NAME: i3plus-cdm-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-05-16 11:08
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_CDM_PART",indexes = {@Index(columnList = "PART_NO")})
+@Api("CDM物料信息")
+public class SxCdmPart extends BaseBean {
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNameRdd;
+
+    @ApiParam("物料类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT,dataSrc = "CDM_PART_TYPE")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.CDM_PART_TYPE_STR.class, refForeignKey = "value", value = "description")
+    private Integer partType;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/SxCdmUnitConversion.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/SxCdmUnitConversion.java
new file mode 100644
index 0000000..1a8f2d2
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/bean/SxCdmUnitConversion.java
@@ -0,0 +1,94 @@
+package cn.estsh.i3plus.pojo.cdm.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-cdm-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-05-11 11:14
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_CDM_UNIT_CONVERSION")
+@Api("单位换算")
+public class SxCdmUnitConversion extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 8228018077276541252L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "SAP_UNIT_NAME")
+    @ApiParam("SAP单位名称")
+    private String sapUnitName;
+
+    @Column(name = "SAP_UNIT_NUMBER")
+    @ApiParam("SAP单位数量")
+    private Double sapUnitNumber;
+
+    @Column(name = "DECLARE_MEASURE_UNIT")
+    @ApiParam("申报计量单位代码")
+    private String declareMeasureUnit;
+
+    @Column(name = "DECLARE_MEASURE_UNIT_NAME")
+    @ApiParam("申报计量单位")
+    private String declareMeasureUnitName;
+
+    @Column(name = "DECLARE_MEASURE_NUMBER")
+    @ApiParam("申报计量数量")
+    private Double declareMeasureNumber;
+
+    /**
+     * 取 字典管理中的 MEASURE_UNIT
+     */
+    @Column(name = "LEGAL_MEASURE_UNIT")
+    @ApiParam("法定计量单位代码")
+    private String legalMeasureUnit;
+
+    @Column(name = "LEGAL_MEASURE_UNIT_NAME")
+    @ApiParam("法定计量单位")
+    private String legalMeasureUnitName;
+
+    @Column(name = "LEGAL_MEASURE_NUMBER")
+    @ApiParam("法定计量数量")
+    private Double legalMeasureNumber;
+
+    @Column(name = "LEGAL2_MEASURE_UNIT")
+    @ApiParam("法定二计量单位代码")
+    private String legal2MeasureUnit;
+
+    @Column(name = "LEGAL2_MEASURE_UNIT_NAME")
+    @ApiParam("法定二计量单位")
+    private String legal2MeasureUnitName;
+
+    @Column(name = "LEGAL2_MEASURE_NUMBER")
+    @ApiParam("法定二计量数量")
+    private Double legal2MeasureNumber;
+
+    @Column(name = "ROUGH_WEIGHT")
+    @ApiParam("毛重")
+    private Double roughWeight;
+
+    @Column(name = "NET_WEIGHT")
+    @ApiParam("净重")
+    private Double netWeight;
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmBusiUtilMethodParamModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmBusiUtilMethodParamModel.java
new file mode 100644
index 0000000..9c313b5
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmBusiUtilMethodParamModel.java
@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import lombok.Data;
+
+/**
+ * 业务工具类方法参数
+ */
+@Data
+public abstract class CdmBusiUtilMethodParamModel extends BaseBean {
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmCommExportParamModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmCommExportParamModel.java
new file mode 100644
index 0000000..771ef24
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmCommExportParamModel.java
@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+/**
+ * @Description : `报关导出查询参数comm`
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/18 1:20
+ * @Modify:
+ **/
+public class CdmCommExportParamModel extends CdmExcelExportParamModel{
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmCounterpartyModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmCounterpartyModel.java
new file mode 100644
index 0000000..f0bff99
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmCounterpartyModel.java
@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Api("交易方信息MODEL")
+@Data
+public class CdmCounterpartyModel {
+
+    @ApiParam("交易方编码")
+    private String counterpartyNo;
+
+    @ApiParam("交易方名称")
+    private String counterpartyName;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    public CdmCounterpartyModel(String counterpartyNo, String counterpartyName) {
+        this.counterpartyNo = counterpartyNo;
+        this.counterpartyName = counterpartyName;
+    }
+
+    public CdmCounterpartyModel() {
+    }
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmCustomCheckListModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmCustomCheckListModel.java
new file mode 100644
index 0000000..2395580
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmCustomCheckListModel.java
@@ -0,0 +1,28 @@
+//package cn.estsh.i3plus.cdm.pojo.model;
+//
+//import com.alibaba.excel.annotation.ExcelProperty;
+//import io.swagger.annotations.ApiParam;
+//import lombok.Data;
+//
+///**
+// * @Description : CdmCustomCheckListModel
+// * @Reference : TODO
+// * @Author : puxiao
+// * @CreateDate : 2022/5/26 0:36
+// * @Modify:
+// **/
+//@Data
+//public class CdmCustomCheckListModel {
+//
+//    @ExcelProperty(index = 1)
+//    @ApiParam("预录入商品编号")
+//    private String goodsNo;
+//
+//    @ExcelProperty(index = 3)
+//    @ApiParam("清单编号编号")
+//    private String billNo;
+//
+//    @ExcelProperty("报关单商品序号")
+//    @ApiParam("报关单商品序号")
+//    private String goodsSerialNo;
+//}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmCustomMovementDetailModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmCustomMovementDetailModel.java
new file mode 100644
index 0000000..1142f7e
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmCustomMovementDetailModel.java
@@ -0,0 +1,273 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.ColumnDefault;
+
+import javax.persistence.*;
+
+@Api("采购退货单报关model")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CdmCustomMovementDetailModel {
+
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @ApiParam("行号")
+    public String item;
+
+    @ApiParam(
+            value = "需求数量",
+            example = "0"
+    )
+    public Double qty;
+
+    @ApiParam("单位")
+    public String unit;
+
+    @ApiParam("订单号")
+    public String orderNo;
+    @Column(
+            name = "SRC_WH_NO"
+    )
+    @ApiParam("源仓库代码")
+    public String srcWhNo;
+
+    @ApiParam("源存储区代码")
+    public String srcZoneNo;
+
+    @ApiParam("源库位代码")
+    public String srcLocateNo;
+
+    @ApiParam("目标仓库代码")
+    public String destWhNo;
+
+    @ApiParam("目标存储区代码")
+    public String destZoneNo;
+
+    @ApiParam("目标库位代码")
+    public String destLocateNo;
+
+    @ApiParam(
+            value = "条码打印数量",
+            example = "1"
+    )
+    private Double printQty;
+
+    @ApiParam("计划日期")
+    private String planDate;
+
+    @ApiParam("计划时间")
+    private String planTime;
+
+    @Column(
+            name = "SRC_NO"
+    )
+    @ApiParam("源单号")
+    private String srcNo;
+
+    @ApiParam(
+            value = "状态",
+            example = "1"
+    )
+    private Integer itemStatus;
+
+    @ApiParam("工序")
+    private String workCellCode;
+
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @ApiParam("缺陷名称")
+    private String defectName;
+
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+
+    @ApiParam("缺陷原因名称")
+    private String dcName;
+
+    @ApiParam("维修代码")
+    private String repairCode;
+
+    @ApiParam("维修名称")
+    private String repairName;
+
+    @ApiParam(
+            value = "是否免费",
+            example = "1"
+    )
+    @AnnoOutputColumn(
+            refClass = WmsEnumUtil.TRUE_OR_FALSE.class,
+            refForeignKey = "value",
+            value = "description"
+    )
+    public Integer isFree;
+
+    @ApiParam("操作原因")
+    private String remark;
+
+    @ColumnDefault("0")
+    @ApiParam(
+            value = "已拣货数量",
+            example = "1"
+    )
+    private Double pickQty;
+
+    @ColumnDefault("0")
+    @ApiParam(
+            value = "已出库数量",
+            example = "1"
+    )
+    private Double outQty;
+
+    @ColumnDefault("0")
+    @ApiParam(
+            value = "已收货数量",
+            example = "1"
+    )
+    private Double recQty;
+
+    @ColumnDefault("0")
+    @ApiParam(
+            value = "已移库数量",
+            example = "1"
+    )
+    private Double moveQty;
+
+    @ColumnDefault("0")
+    @ApiParam(
+            value = "任务生成数量",
+            example = "1"
+    )
+    private Double taskGenerateQty;
+
+    @ColumnDefault("0")
+    @ApiParam("已打印数量")
+    private Double printGenerateQty;
+
+    @ApiParam("源库存地代码")
+    public String srcAreaNo;
+
+    @ApiParam("目的库存地代码")
+    public String destAreaNo;
+
+    @ApiParam("目的线边存储区代码")
+    public String destXBZoneNo;
+
+    @ApiParam("批次")
+    public String lotNo;
+
+    @ApiParam("源单行号")
+    public String srcItem;
+
+    @ApiParam("客户订单号")
+    public String custOrderNo;
+
+    @ApiParam("指定生产日期")
+    private String assignDateCode;
+
+    @ApiParam("销售单据号")
+    private String soOrderNo;
+
+    @ApiParam("材料类型")
+    private String melType;
+
+    @ApiParam("项目号")
+    private String projectNo;
+
+    @ApiParam("生产小组")
+    private String productionGroup;
+
+    @ApiParam("客户零件号")
+    private String custPartNo;
+
+    @ApiParam("物料类型")
+    private String materialType;
+
+    @ApiParam("简称")
+    private String partSpec;
+
+    @ApiParam("工单码")
+    private String workOrderCode;
+
+    @ApiParam("父位置号")
+    private String seqNo;
+
+
+    @ApiParam("id")
+    public Long id;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam(
+            value = "有效性",
+            example = "1"
+    )
+    public Integer isValid;
+
+    @ApiParam(
+            value = "是否已删除",
+            example = "2"
+    )
+    public Integer isDeleted;
+
+    @ApiParam("创建用户")
+    public String createUser;
+
+    @ApiParam("创建日期")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改日期")
+    public String modifyDatetime;
+
+
+    @Transient
+    @ApiParam("未报关数量")
+    private Double notDeclaredQty;
+
+    public Double getNotDeclaredQty() {
+        if (notDeclaredQty == null){
+            return getQty();
+        }
+        return notDeclaredQty;
+    }
+
+    @Transient
+    @ApiParam("报关状态")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.IS_DECLARED.class)
+    private Integer declaredStatus;
+
+    @Transient
+    @ApiParam("供应商名称")
+    public String vendorName;
+    @Transient
+    @ApiParam("供应商编号")
+    private String vendorNo;
+
+    public Integer getDeclaredStatus() {
+        if (getNotDeclaredQty() == 0 || getNotDeclaredQty() == 0.0){
+            return CdmEnumUtil.IS_DECLARED.IS_DECLARED.getValue();
+        }else if (getNotDeclaredQty() < getQty()){
+            return CdmEnumUtil.IS_DECLARED.DECLARED_ING.getValue();
+        }else if (getNotDeclaredQty() == getQty()){
+            return CdmEnumUtil.IS_DECLARED.NOT_DECLARED.getValue();
+        }
+        return CdmEnumUtil.IS_DECLARED.NOT_DECLARED.getValue();
+    }
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmCustomsImportParamModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmCustomsImportParamModel.java
new file mode 100644
index 0000000..d224a0b
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmCustomsImportParamModel.java
@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * 报关导入参数
+ */
+@Data
+public class CdmCustomsImportParamModel extends CdmBusiUtilMethodParamModel {
+
+    @ApiParam("单号")
+    private String orderNo;
+
+    @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.CUSTOMS_BUSI_TYPE.class,refForeignKey = "value", value = "description")
+    private Integer busiType;
+
+    @ApiParam("报关类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.CUSTOMS_TYPE.class,refForeignKey = "value", value = "description")
+    private Integer customsType;
+
+    @ApiParam("公司级别")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.COMPNAY_LEVEL.class,refForeignKey = "value", value = "description")
+    private Integer compnayLevel;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmCustomsMasterDetailModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmCustomsMasterDetailModel.java
new file mode 100644
index 0000000..5b59467
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmCustomsMasterDetailModel.java
@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmCustomsDetail;
+import cn.estsh.i3plus.pojo.cdm.bean.CdmCustomsMaster;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+@Api("报关主数据以明细model")
+@Data
+public class CdmCustomsMasterDetailModel {
+
+    @ApiParam("报关主数据")
+    private List<CdmCustomsMaster> cdmCustomsMasterList;
+
+    @ApiParam("报关明细数据")
+    private List<CdmCustomsDetail> cdmCustomsDetailList;
+
+    @ApiParam("PO单")
+    private List<SwebPurchaseOrderModel> purchaseOrderModelList;
+
+    public CdmCustomsMasterDetailModel(List<CdmCustomsMaster> cdmCustomsMasterList, List<CdmCustomsDetail> cdmCustomsDetailList, List<SwebPurchaseOrderModel> purchaseOrderModelList) {
+        this.cdmCustomsMasterList = cdmCustomsMasterList;
+        this.cdmCustomsDetailList = cdmCustomsDetailList;
+        this.purchaseOrderModelList = purchaseOrderModelList;
+    }
+
+    public CdmCustomsMasterDetailModel(List<SwebPurchaseOrderModel> purchaseOrderModelList) {
+        this.purchaseOrderModelList = purchaseOrderModelList;
+    }
+
+    public CdmCustomsMasterDetailModel() {
+    }
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmDocMovementDetailsModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmDocMovementDetailsModel.java
new file mode 100644
index 0000000..8f25da3
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmDocMovementDetailsModel.java
@@ -0,0 +1,107 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : cdm报关单model
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/16 11:27
+ * @Modify:
+ **/
+@Data
+public class CdmDocMovementDetailsModel implements Serializable {
+    @ApiParam("工厂编号")
+    private String organizeCode;
+
+    @ApiParam("单号")
+    private String orderNo;
+
+    @ApiParam("业务类型")
+    public Integer busiType;
+
+    @ApiParam("ERP单号")
+    private String erpSrcNo;
+
+    @ApiParam("客户编码")
+    private String custNo;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("数量")
+    private Double qty;
+
+    @ApiParam("报关数量")
+    private Integer declareQty;
+
+    @ApiParam("未报关数量")
+    private Double unDeclareQty;
+
+    @ApiParam("报关状态")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.DECLARE_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer declareStatus;
+
+    @ApiParam("业务类型")
+    private List<Integer> busiTypeLst;
+
+    @ApiParam("商品料号 （海关商品料号取值）")
+    private String customsCommodityNo;
+
+    @ApiParam(value = "单价")
+    private Double unitPrice;
+
+    @ApiParam(value = "币种")
+    private String currency;
+
+    @ApiParam("出发港")
+    private String fromPort;
+
+    @ApiParam("目的港")
+    private String toPort;
+
+
+    @ApiParam("创建时间")
+    private String createDatetime;
+
+    @ApiParam("开始时间")
+    private String createDateTimeStart;
+
+    @ApiParam("结束时间")
+    private String createDateTimeEnd;
+
+    @ApiParam("分页信息")
+    private Pager pager;
+
+    public CdmDocMovementDetailsModel(){}
+
+    public CdmDocMovementDetailsModel(String organizeCode,
+                                      String orderNo,
+                                      Integer busiType,
+                                      String erpSrcNo,
+                                      String custNo,
+                                      String partNo,
+                                      String partNameRdd,
+                                      Double qty,
+                                      String createDatetime) {
+        this.organizeCode = organizeCode;
+        this.orderNo = orderNo;
+        this.busiType = busiType;
+        this.erpSrcNo = erpSrcNo;
+        this.custNo = custNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.createDatetime = createDatetime;
+    }
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmDocMovementDetailsReturnModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmDocMovementDetailsReturnModel.java
new file mode 100644
index 0000000..b262af6
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmDocMovementDetailsReturnModel.java
@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : cdm报关单model
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/16 11:27
+ * @Modify:
+ **/
+@Data
+public class CdmDocMovementDetailsReturnModel implements Serializable {
+
+    @ApiParam("单据信息")
+    private List<CdmDocMovementDetailsModel> cdmDocMovementDetailsModels;
+
+    @ApiParam("分页信息")
+    private Pager pager;
+
+
+    public CdmDocMovementDetailsReturnModel(){}
+
+    public CdmDocMovementDetailsReturnModel(List<CdmDocMovementDetailsModel> cdmDocMovementDetailsModels, Pager pager){
+        this.cdmDocMovementDetailsModels= cdmDocMovementDetailsModels;
+        this.pager = pager;
+    }
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmEnumExportParamModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmEnumExportParamModel.java
new file mode 100644
index 0000000..6acd98f
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmEnumExportParamModel.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import lombok.Data;
+
+/**
+ * @Description : 字典导参数
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/11 13:18
+ * @Modify:
+ **/
+@Data
+public class CdmEnumExportParamModel extends CdmExcelExportParamModel{
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExcelExportModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExcelExportModel.java
new file mode 100644
index 0000000..ef6088d
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExcelExportModel.java
@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 导出model
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/10 22:18
+ * @Modify:
+ **/
+@Data
+public class CdmExcelExportModel<T>{
+
+    @ApiParam(name = "标题数据",value = "标题数据")
+    private Map<String,Object> titleDataMap;
+
+    @ApiParam(name = "列表数据",value = "列表数据")
+    private List<T> rowDataList;
+
+    @ApiParam(name = "excel名称",value = "excel名称")
+    private String excelName;
+
+    @ApiParam(name = "sheet名称",value = "sheet名称")
+    private String sheetName;
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExcelExportParamModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExcelExportParamModel.java
new file mode 100644
index 0000000..824ce45
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExcelExportParamModel.java
@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @Description : 导出参数model
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/11 1:34
+ * @Modify:
+ **/
+@Data
+public class CdmExcelExportParamModel extends BaseBean {
+
+    @ApiParam("单号")
+    private String orderNo;
+
+    @ApiParam("模块编码")
+    private String moduleCode;
+
+    @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.CUSTOMS_BUSI_TYPE.class,refForeignKey = "value", value = "description")
+    private Integer busiType;
+
+    @ApiParam("报关类型")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.CUSTOMS_TYPE.class,refForeignKey = "value", value = "description")
+    private Integer customsType;
+
+    @ApiParam("公司级别")
+    @AnnoOutputColumn(refClass = CdmEnumUtil.COMPNAY_LEVEL.class,refForeignKey = "value", value = "description")
+    private Integer compnayLevel;
+
+    @ApiParam("交易方编码")
+    private String counterpartyCode;
+
+    @ApiParam("贸易类型")
+    private Integer tradeType;
+
+    @ApiParam("贸易编码")
+    private String tradeCode;
+
+    @ApiParam("成品材料标志")
+    private Integer materialsCompleteProductFlag;
+
+    @ApiParam("报关单号-流水号")
+    private String orderNoWithSerialNumber;
+
+    @ApiParam("业务申报表编号")
+    private String busiDeclareNo;
+
+    @ApiParam("key:业务申报表编号 - value:单号+流水号")
+    private Map<String, String> keyDataMap;
+
+    @ApiParam("导出任务编码")
+    private String taskNo;
+
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExcelImportErrorModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExcelImportErrorModel.java
new file mode 100644
index 0000000..e8e7b3b
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExcelImportErrorModel.java
@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes导入异常结果model")
+public class CdmExcelImportErrorModel implements Serializable {
+
+    @ApiParam("错误的行号")
+    private int rowNum;
+
+    @ApiParam("错误数量")
+    private int errorNum;
+
+    @ApiParam("错误列号")
+    private String cellNum;
+
+    @ApiParam("错误描述")
+    private String errorInfo;
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExcelImportResultModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExcelImportResultModel.java
new file mode 100644
index 0000000..6e68567
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExcelImportResultModel.java
@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("cdm导入结果model")
+public class CdmExcelImportResultModel<T> implements Serializable {
+
+    @ApiParam("结果")
+    private boolean result;
+
+    @ApiParam("成功行数量")
+    private int successRowNum;
+
+    @ApiParam("失败行数量")
+    private int failRowNum;
+
+    @ApiParam("错误信息集合")
+    private List<CdmExcelImportErrorModel> excelImportErrorModels;
+
+    @ApiParam("错误的行号")
+    private String errorRows;
+
+    @ApiParam("导入数据集合")
+    private List<T> excelList;
+
+    @ApiParam("导入进度")
+    private String importSpeed;
+
+    @ApiParam("返回对象")
+    private Object resultObject;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateEightyModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateEightyModel.java
new file mode 100644
index 0000000..a69fa07
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateEightyModel.java
@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Api("80_总公司分送集报出入库单表体")
+@Data
+public class CdmExportTemplateEightyModel {
+
+    @ApiParam("料号")
+    private String itemNo;
+
+    @ApiParam("申报数量")
+    private String declaredQuantity;
+
+    @ApiParam("币制")
+    private String currencySystem;
+
+    @ApiParam("总价")
+    private Double totalPrice;
+
+    @ApiParam("单价")
+    private Double unitPrice;
+
+    @ApiParam("材料性质（材料/成品）")
+    private String materialsCompleteProductFlag;
+
+    @ApiParam("BOM版本号")
+    private String bomVersionNo;
+
+    @ApiParam("第一数量")
+    private String firstNumber;
+
+    @ApiParam("第二数量")
+    private String secondNumber;
+
+    @ApiParam("原产国/最终目的国(地区)")
+    private String originOrFinalCountry;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateFiftyModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateFiftyModel.java
new file mode 100644
index 0000000..4df5b29
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateFiftyModel.java
@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Api("50_总公司现报核注清单表头")
+@Data
+public class CdmExportTemplateFiftyModel {
+
+    @ApiParam("经营企业名称")
+    private String businessName;
+
+    @ApiParam("经营企业编码")
+    private String businessCode;
+
+    @ApiParam("手(账)册编号")
+    private String manualCode;
+
+    @ApiParam("进出口标志")
+    private String importExportMark;
+
+    @ApiParam("企业内部编号")
+    private String enterpriseInternalNumber;
+
+    @ApiParam("进区日期")
+    private String intoAreaDate;
+
+    @ApiParam("料件、成品标志")
+    private String partFinishedFlag;
+
+    @ApiParam("监管方式")
+    private String supervisionMethod;
+
+    @ApiParam("运输方式")
+    private String shippingType;
+
+    @ApiParam("进/出境关别")
+    private String inboundOutboundCustoms;
+
+    @ApiParam("启运/运抵国(地区)")
+    private String destinationCountry;
+
+    @ApiParam("清单类型")
+    private String listType;
+
+    @ApiParam("交易方")
+    private String counterparty;
+
+    @ApiParam("申报表编号")
+    private String returnNumber;
+
+    @ApiParam("申报单位名称")
+    private String applicantName;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateFortyModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateFortyModel.java
new file mode 100644
index 0000000..0b051f0
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateFortyModel.java
@@ -0,0 +1,99 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+
+@Api("40_总公司分送集报出入库单表体")
+@Data
+public class CdmExportTemplateFortyModel {
+
+    @ApiParam("商品序号")
+    private String productNumber;
+
+    @ApiParam("申报表序号")
+    private String returnNumber;
+
+    @ApiParam("底账商品序号")
+    private String accountGoodsNumber;
+
+    @ApiParam("料号")
+    private String itemNo;
+
+    @ApiParam("商品编码")
+    private String commodityNo;
+
+    @ApiParam("商品名称")
+    private String commodityName;
+
+    @ApiParam("商品规格型号")
+    private String commoditySpecificationModel;
+
+    @ApiParam("申报计量单位")
+    private String declaredUnitMeasurement;
+
+    @ApiParam("币制")
+    private String currencySystem;
+
+    @ApiParam("申报数量")
+    private String declaredQuantity;
+
+    @ApiParam("申报单价")
+    private String declaredUnitPrice;
+
+    @ApiParam("申报总价")
+    private String declaredTotalPrice;
+
+    @ApiParam("法定计量单位")
+    private String legalMeasurementUnit;
+
+    @ApiParam("法定第二计量单位")
+    private String legalMeasurementSecondUnit;
+
+    @ApiParam("法定数量")
+    private String legalQuantity;
+
+    @ApiParam("第二法定数量")
+    private String legalSecondQuantity;
+
+    @ApiParam("单耗版本号")
+    private String unitConsumptionVersion;
+
+    @ApiParam("归类标志")
+    private String classificationMark;
+
+    @ApiParam("重量比例因子")
+    private String weightScaleFactor;
+
+    @ApiParam("第一比例因子")
+    private String firstScaleFactor;
+
+    @ApiParam("第二比例因子")
+    private String secondScaleFactor;
+
+    @ApiParam("毛重")
+    private String roughWeight;
+
+    @ApiParam("净重")
+    private String netWeight;
+
+    @ApiParam("关联商品序号")
+    private String associatedCommodityNumber;
+
+    @ApiParam("原产国(地区)")
+    private String originCountry;
+
+    @ApiParam("最终目的国(地区)")
+    private String finalCountry;
+
+    @ApiParam("是否参与合并")
+    private String isParticipationMerger;
+
+    @ApiParam("征免方式")
+    private String exemptionMethod;
+
+    @ApiParam("备注")
+    private String remark;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateHundredModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateHundredModel.java
new file mode 100644
index 0000000..351f94c
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateHundredModel.java
@@ -0,0 +1,73 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Api("100_分公司未完税报关单表体")
+@Data
+public class CdmExportTemplateHundredModel {
+
+    @ApiParam("序号")
+    private Integer serialNumber;
+
+    @ApiParam("备案序号")
+    private Double recordSerialNumber;
+
+    @ApiParam("商品编码")
+    private String commodityNo;
+
+    @ApiParam("检验检疫编码")
+    private String inspectionQuarantineCode;
+
+    @ApiParam("商品名称")
+    private String commodityName;
+
+    @ApiParam("规格型号")
+    private String specificationsModels;
+
+    @ApiParam("成交数量")
+    private String tradeVolume;
+
+    @ApiParam("成交计量单位")
+    private String tradeUnit;
+
+    @ApiParam("单价")
+    private Double price;
+
+    @ApiParam("总价")
+    private Double totalPrice;
+
+    @ApiParam("币制")
+    private String currencySystem;
+
+    @ApiParam("法定数量")
+    private Double legalQuantity;
+
+    @ApiParam("法定计量单位")
+    private String legalMeasurementUnit;
+
+    @ApiParam("最终目的国")
+    private String destinationCountry;
+
+    @ApiParam("第二法定数量")
+    private Double legalSecondQuantity;
+
+    @ApiParam("第二法定计量单位")
+    private String legalMeasurementSecondUnit;
+
+    @ApiParam("原产国")
+    private String originCountry;
+
+    @ApiParam("境内目的地/境内货源地")
+    private String domesticDestination;
+
+    @ApiParam("目的地代码/产地代码")
+    private String destinationCode;
+
+    @ApiParam("征免方式")
+    private String exemptionMethod;
+    
+    @ApiParam("申报要素")
+    private String declareElement;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateNinetyModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateNinetyModel.java
new file mode 100644
index 0000000..4168352
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateNinetyModel.java
@@ -0,0 +1,73 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Api("90_分公司未完税报关单表头")
+@Data
+public class CdmExportTemplateNinetyModel {
+
+    @ApiParam("境内收货人")
+    private String domesticConsignee;
+
+    @ApiParam("社会信用代码")
+    private String socialCreditCode;
+
+    @ApiParam("交易方代码")
+    private String counterpartyCode;
+
+    @ApiParam("发票号")
+    private String invoiceNo;
+
+    @ApiParam("进境关别")
+    private String entryAdrress;
+
+    @ApiParam("运输方式")
+    private Integer transPortType;
+
+    @ApiParam("原产国")
+    private String originCountry;
+
+    @ApiParam("监管方式")
+    private String supervisionMethod;
+
+    @ApiParam("征免方式")
+    private String exemptionMethod;
+
+    @ApiParam("成交方式")
+    private String payment;
+
+    @ApiParam("件数")
+    private Double totalNumber;
+
+    @ApiParam("毛重")
+    private String grossWeight;
+
+    @ApiParam("净重")
+    private String netWeight;
+
+    @ApiParam("税款总担保")
+    private String generalTaxGuarantee;
+
+    @ApiParam("特殊关系确认")
+    private String specialRelationConfirm;
+
+    @ApiParam("价格影响确认")
+    private String priceImpactConfirm;
+
+    @ApiParam("支付特许权使用费确认")
+    private String licensingConfirm;
+
+    @ApiParam("公式定价确认")
+    private String formulaPricingConfirm;
+
+    @ApiParam("暂定价格确认")
+    private String tentativePriceConfirm;
+
+    @ApiParam("自报自缴")
+    private String selfPeportPayment;
+
+    @ApiParam("申报单位名称")
+    private String applicantUnitName;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateSeventyModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateSeventyModel.java
new file mode 100644
index 0000000..fb437bb
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateSeventyModel.java
@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+
+@Api("70_分公司完税报关核放单表头")
+@Data
+public class CdmExportTemplateSeventyModel {
+
+    @ApiParam("经营企业名称")
+    private String businessName;
+
+    @ApiParam("经营企业编码")
+    private String businessCode;
+
+    @ApiParam("进出卡日期")
+    private String cardEntryDate;
+
+    @ApiParam("编号")
+    private String orderNo;
+
+    @ApiParam("账册编号")
+    private String accountNo;
+
+    @ApiParam("收货单位")
+    private String consignee;
+
+    @ApiParam("发货单位")
+    private String forwardingUnit;
+
+    @ApiParam("出入库类型")
+    private String inboundOutbounType;
+
+    @ApiParam("包装种类")
+    private String packType;
+
+    @ApiParam("货物总毛重（kg）")
+    private String goodsGrossWeight;
+
+    @ApiParam("货物总净重（kg）")
+    private String totalNetWeight;
+
+    @ApiParam("件数")
+    private String number;
+
+    @ApiParam("IC卡号(电子车牌)")
+    private String icCode;
+
+    @ApiParam("备注")
+    private String remark;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateSixtyFiveModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateSixtyFiveModel.java
new file mode 100644
index 0000000..b6e9a53
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateSixtyFiveModel.java
@@ -0,0 +1,95 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Api("65_总公司核注清单表体二")
+@Data
+public class CdmExportTemplateSixtyFiveModel {
+
+    @ApiParam("序号")
+    private Integer serialNumber;
+
+    @ApiParam("备案序号")
+    private Integer recordSerialNumber;
+
+    @ApiParam("商品料号")
+    private String customsCommodityNo;
+
+    @ApiParam("报关单商品序号")
+    private String customProductNumber;
+
+    @ApiParam("流转申报表序号")
+    private String circulationFormNo;
+
+    @ApiParam("商品编码")
+    private String commodityNo;
+
+    @ApiParam("商品名称")
+    private String commodityName;
+
+    @ApiParam("规格型号")
+    private String specificationsModels;
+
+    @ApiParam("币制")
+    private String currencySystem;
+
+    @ApiParam("申报计量单位代码")
+    private String declareMeasureUnit;
+
+    @ApiParam("法定计量单位代码")
+    private String legalMeasureUnit;
+
+    @ApiParam("法定二计量单位代码")
+    private String legal2MeasureUnit;
+
+    @ApiParam("申报数量")
+    private Double qty;
+
+    @ApiParam("法定计量数量")
+    private String legalMeasureNumber;
+
+    @ApiParam("法定二计量数量")
+    private String legal2MeasureNumber;
+
+    @ApiParam("申报单价")
+    private String declaredUnitPrice;
+
+    @ApiParam("申报总价")
+    private String declaredTotalPrice;
+
+    @ApiParam("原产国")
+    private String originCountry;
+
+    @ApiParam("最终目的国")
+    private String destinationCountry;
+
+    @ApiParam("重量比例因子")
+    private String weightScaleFactor;
+
+    @ApiParam("第一比例因子")
+    private String firstScaleFactor;
+
+    @ApiParam("第二比例因子")
+    private String secondScaleFactor;
+
+    @ApiParam("毛重")
+    private String grossWeight;
+
+    @ApiParam("净重")
+    private String netWeight;
+
+    @ApiParam("征免方式")
+    private String exemptionMethod;
+
+    @ApiParam("单号版本号")
+    private String orderVersionNo;
+
+    @ApiParam("危险品标志")
+    private String dangerousMark;
+
+    @ApiParam("备注")
+    private String remark;
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateSixtyModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateSixtyModel.java
new file mode 100644
index 0000000..216d54f
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateSixtyModel.java
@@ -0,0 +1,82 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Api("60_总公司核注清单表体一")
+@Data
+public class CdmExportTemplateSixtyModel {
+
+    @ApiParam("序号")
+    private Integer serialNumber;
+
+    @ApiParam("商品序号")
+    private String productNumber;
+
+    @ApiParam("备案序号")
+    private Integer recordSerialNumber;
+
+    @ApiParam("商品料号")
+    private String customsCommodityNo;
+
+    @ApiParam("商品编码")
+    private String commodityNo;
+
+    @ApiParam("商品名称")
+    private String commodityName;
+
+    @ApiParam("规格型号")
+    private String specificationsModels;
+
+    @ApiParam("原产国")
+    private String originCountry;
+
+    @ApiParam("最终目的国")
+    private String destinationCountry;
+
+    @ApiParam("币种")
+    private String currency;
+
+    @ApiParam("币制")
+    private String currencySystem;
+
+    @ApiParam("申报单价")
+    private String declaredUnitPrice;
+
+    @ApiParam("申报数量")
+    private Double qty;
+
+    @ApiParam("申报计量单位")
+    private String declareUnit;
+
+    @ApiParam("申报总价")
+    private Double declaredTotalPrice;
+
+    @ApiParam("法定数量")
+    private Double legalQuantity;
+
+    @ApiParam("法定计量单位")
+    private String legalMeasurementUnit;
+
+    @ApiParam("第二法定数量")
+    private Double legalSecondQuantity;
+
+    @ApiParam("第二法定计量单位")
+    private String legalMeasurementSecondUnit;
+
+    @ApiParam("毛重")
+    private String grossWeight;
+
+    @ApiParam("净重")
+    private String netWeight;
+
+    @ApiParam("征免方式")
+    private String exemptionMethod;
+
+    @ApiParam("单号版本号")
+    private String orderVersionNo;
+
+    @ApiParam("申报要素")
+    private String declareElement;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateTenModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateTenModel.java
new file mode 100644
index 0000000..6be8406
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateTenModel.java
@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Api("10_总公司分送集报现报核放单表头")
+@Data
+public class CdmExportTemplateTenModel {
+
+    @ApiParam("经营企业名称")
+    private String businessName;
+
+    @ApiParam("经营企业编码")
+    private String businessCode;
+
+    @ApiParam("进出卡日期")
+    private String cardEntryDate;
+
+    @ApiParam("编号")
+    private String orderNo;
+
+    @ApiParam("核放单类型")
+    private String nuclearReleaseType;
+
+    @ApiParam("出入库类型")
+    private String inboundOutbounType;
+
+    @ApiParam("绑定类型")
+    private String bindingType;
+
+    @ApiParam("企业内部编号")
+    private String enterpriseInternalNumber;
+
+    @ApiParam("IC卡号(电子车牌)")
+    private String icCode;
+
+    @ApiParam("车自重（kg）")
+    private String carWeight;
+
+    @ApiParam("车架重（kg）")
+    private String frameWeight;
+
+    @ApiParam("货物总毛重（kg）")
+    private String goodsGrossWeight;
+
+    @ApiParam("货物总净重（kg）")
+    private String totalNetWeight;
+
+    @ApiParam("备注")
+    private String remark;
+
+    @ApiParam("申报单位")
+    private String applicationUnit;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateThirtyModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateThirtyModel.java
new file mode 100644
index 0000000..e96d80f
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmExportTemplateThirtyModel.java
@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Api("30_总公司分送集报出入库单表头")
+@Data
+public class CdmExportTemplateThirtyModel {
+
+    @ApiParam("经营企业名称")
+    private String businessName;
+
+    @ApiParam("经营企业编码")
+    private String businessCode;
+
+    @ApiParam("进出卡日期")
+    private String cardEntryDate;
+
+    @ApiParam("编号")
+    private String orderNo;
+
+    @ApiParam("申报表编号")
+    private String returnNo;
+
+    @ApiParam("账册编号")
+    private String accountNumber;
+
+    @ApiParam("出入库类型")
+    private String inboundOutbounType;
+
+    @ApiParam("关联出入库单编号")
+    private String inboundOutbounCode;
+
+    @ApiParam("企业内部编号")
+    private String enterpriseInternalNumber;
+
+    @ApiParam("毛重")
+    private String roughWeight;
+
+    @ApiParam("净重")
+    private String netWeight;
+
+    @ApiParam("件数")
+    private String number;
+
+    @ApiParam("包装种类")
+    private String packType;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmFinalDeclarationDataModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmFinalDeclarationDataModel.java
new file mode 100644
index 0000000..f6a08b5
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmFinalDeclarationDataModel.java
@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmFinalDeclarationDataDetails;
+import cn.estsh.i3plus.pojo.cdm.bean.CdmFinalDeclarationDataMaster;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 终审报关数据Model
+ */
+@Data
+public class CdmFinalDeclarationDataModel implements Serializable {
+
+    @ApiParam(name = "终审报关数据主表",value = "终审报关数据主表")
+    private CdmFinalDeclarationDataMaster master;
+
+    @ApiParam(name = "终审报关数据明细",value = "终审报关数据明细")
+    private List<CdmFinalDeclarationDataDetails> details;
+
+    @ApiParam(name = "单号",value = "单号")
+    private String orderNo;
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmInvoiceExportModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmInvoiceExportModel.java
new file mode 100644
index 0000000..3e75b88
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmInvoiceExportModel.java
@@ -0,0 +1,96 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+
+/**
+ * @Description : 110_发票导出model
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/17 23:48
+ * @Modify:
+ **/
+@Data
+public class CdmInvoiceExportModel{
+
+    @ApiParam("收货人信息")
+    private String receiveInfos;
+
+    @ApiParam("发票号")
+    private String invoiceNo;
+
+    @ApiParam("订单号")
+    private String poNo;
+
+    @ApiParam("制表日期")
+    private String pDate;
+
+    @ApiParam("出区日期")
+    private String dDate;
+
+    @ApiParam("出发港")
+    private String fromPort;
+
+    @ApiParam("目的港")
+    private String toPort;
+
+    @ApiParam("运输方式")
+    private String shippedBy;
+
+    @ApiParam("付款方式")
+    private String payMent;
+
+    @ApiParam("产品英文描述")
+    private String goodsEnglishDes;
+
+    @ApiParam("成交方式")
+    private String payment;
+
+    /***********明细start***********/
+
+    @ApiParam("产品报关名称")
+    private String commodityName;
+
+    @ApiParam("物料编号")
+    private String partNo;
+
+    /**默认为中国**/
+    @ApiParam("原产国")
+    private String countryOfOrigin;
+
+    @ApiParam("报关数量")
+    private Integer declareQty;
+
+    @ApiParam("箱数")
+    private Integer packageCount;
+
+    @ApiParam("托盘数")
+    private Integer palletsCount;
+
+    @ApiParam("交易币种")
+    private String currency;
+
+    @ApiParam("单价")
+    private Double unitPrice;
+
+    @ApiParam("价格小计")
+    private Double amount;
+
+    @ApiParam("数量总计")
+    private Integer sumQty;
+
+    @ApiParam("净重")
+    private Double netWeight;
+
+    @ApiParam("毛重")
+    private Double grossWeight;
+
+    @ApiParam("体积")
+    private Double volume;
+
+    @ApiParam("SIZE/C体积")
+    private String sizeDivideCVolume;
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmModuleExcelManageModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmModuleExcelManageModel.java
new file mode 100644
index 0000000..b137d8c
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmModuleExcelManageModel.java
@@ -0,0 +1,70 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("模块EXCEL管理")
+public class CdmModuleExcelManageModel implements Serializable {
+
+    private static final long serialVersionUID = 1709954542566331639L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("模块代码")
+    private String moduleCode;
+
+    @ApiParam("模块名称")
+    private String moduleName;
+
+    @ApiParam("文件ID")
+    private Long fileId;
+
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @ApiParam("文件原名")
+    private String fileOriginName;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+    public CdmModuleExcelManageModel() {
+    }
+
+    public CdmModuleExcelManageModel(Long id, String moduleCode, String moduleName, Long fileId, String fileUrl, String fileOriginName,
+                                     String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+        this.id = id;
+        this.moduleCode = moduleCode;
+        this.moduleName = moduleName;
+        this.fileId = fileId;
+        this.fileUrl = fileUrl;
+        this.fileOriginName = fileOriginName;
+        this.organizeCode = organizeCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmTableTitle.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmTableTitle.java
new file mode 100644
index 0000000..0c12823
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmTableTitle.java
@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author puxiao.liao
+ * @version 1.0
+ * @date 2022-04-14 15:32
+ **/
+@Data
+@ApiModel("表格title-MODEL")
+public class CdmTableTitle implements Serializable {
+
+    @ApiParam("工厂编码")
+    private String organizeCode;
+
+    @ApiParam("title编码")
+    private String titleCode;
+
+    @ApiParam("title描述")
+    private String titleDesc;
+
+    @ApiParam("模块")
+    private Integer module;
+
+    @ApiParam("序号")
+    private Integer index;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmTemporaryHoldCheckModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmTemporaryHoldCheckModel.java
new file mode 100644
index 0000000..1f48157
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/CdmTemporaryHoldCheckModel.java
@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmExportTemplateFifty;
+import cn.estsh.i3plus.pojo.cdm.bean.CdmExportTemplateSixty;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class CdmTemporaryHoldCheckModel implements Serializable {
+
+    @ApiParam(name = "50_总公司现报核注清单表头",value = "50_总公司现报核注清单表头")
+    private CdmExportTemplateFifty fifty;
+
+    @ApiParam(name = "60_总公司核注清单表体一",value = "60_总公司核注清单表体一")
+    private List<CdmExportTemplateSixty> sixtyList;
+
+    @ApiParam(name = "单号",value = "单号")
+    private String orderNo;
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/SwebPurchaseOrderModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/SwebPurchaseOrderModel.java
new file mode 100644
index 0000000..f083bba
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/SwebPurchaseOrderModel.java
@@ -0,0 +1,241 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.ColumnDefault;
+
+import java.io.Serializable;
+
+
+/**
+ * @Description : PO采购订单表-实体类
+ * @Reference : SwebPurchaseOrder
+ * @Author : duan.yang
+ * @CreateDate : 2021-01-15 21:41
+ * @Modify: 修改
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("采购订单-PO-MODEL")
+public class SwebPurchaseOrderModel implements Serializable {
+
+    private static final long serialVersionUID = 288136219989308275L;
+
+    @ApiParam("单据号")
+    public String orderNo;
+
+    @ApiParam("供应商编号")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("计划员代码")
+    private String plannerCode;
+    @ApiParam(
+            value = "订单类型",
+            example = "1"
+    )
+    private Integer orderType;
+
+    @ApiParam("上级包装编号")
+    private String parentPackageNo;
+
+    @ApiParam("道口")
+    private String dock;
+
+    @ApiParam("库存地")
+    private String erpWarehouse;
+
+    @ApiParam(
+            value = "PO状态",
+            example = "1"
+    )
+    private Integer poStatus;
+
+    @ApiParam("发运时间")
+    private String shipTime;
+
+    @ApiParam("发布时间")
+    private String publishTime;
+
+    @ApiParam("交货时间")
+    private String deliveryTime;
+
+    @ApiParam("收货时间")
+    private String recTime;
+
+    @ApiParam(
+            value = "是否收货",
+            example = "2"
+    )
+    private Integer isSyn;
+
+    @ApiParam("订单时间")
+    private String orderTime;
+
+    @ApiParam("关联单号")
+    private String refOrderNo;
+
+    @ApiParam("预计交货时间")
+    @JsonFormat(
+            pattern = "yyyy-MM-dd",
+            timezone = "GMT+8"
+    )
+    private String expectedTime;
+
+    @ApiParam("合同号")
+    private String refNo;
+
+    @ApiParam("订单来源")
+    private Integer orderSource;
+
+    @ApiParam("是否追加")
+    private Integer isExtAdd;
+
+    @ApiParam("预计到货时间 开始时间")
+    private String expectedTimeStart;
+
+    @ApiParam("预计到货时间 结束时间")
+    private String expectedTimeEnd;
+
+    @ApiParam("是否同步")
+    public Integer isSync;
+
+    @ApiParam("SAP单号")
+    private String sapOrderNo;
+
+    @ApiParam("工厂代码")
+    private String factoryNo;
+
+    @ApiParam("工厂名称")
+    private String factoryName;
+
+    @ApiParam("币种")
+    private String currencyType;
+
+    @ApiParam("单价")
+    @ColumnDefault("0")
+    private Double price = 0.0;
+
+    @ApiParam("数量")
+    @ColumnDefault("0")
+    private Double orderQty = 0.0;
+
+    @ApiParam("总价")
+    @ColumnDefault("0")
+    private Double total = 0.0;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("单位")
+    private String unit;
+
+    @ApiParam("变更前需求日")
+    private String demandDayBeforeChange;
+
+    @ApiParam("变更前交货数量")
+    private Double deliveryAmountBeforeChange = 0.0;
+
+    @ApiParam("变更后需求日")
+    private String demandDayAfterChange;
+
+    @ApiParam("变更后交货数量")
+    private Double deliveryAmountAfterChange = 0.0;
+
+    @ApiParam("收货数量")
+    private Double recQty = 0.0;
+
+    @ApiParam("检验合格数量")
+    private Double qualifiedQty = 0.0;
+
+    @ApiParam("入库数量")
+    private Double inStockQty = 0.0;
+
+    @ApiParam("同步标识")
+    private Integer isSyncWms = 2;
+
+    @ApiParam("PO单价")
+    private Double netPrice;
+
+    @ApiParam("PO单价(货币)")
+    private String currency;
+
+    @ApiParam("单位(倍数)")
+    private Double multipleUnit;
+
+    @ApiParam("PO金额")
+    private Double poAmount;
+
+    @ApiParam("PO金额(币别)")
+    private String poCurrency;
+
+    @ApiParam("打印状态")
+    private Integer printStatus;
+
+    @ApiParam("出厂报告状态")
+    private Integer factoryReportStatus;
+
+    @ApiParam("出厂报告状态-查询参数")
+    private Integer factoryReportStatusParam;
+
+    @ApiParam("上传时间")
+    private String uploadDateTime;
+
+    @ApiParam("文件ID")
+    private Long fileId;
+
+    @ApiParam("文件源名")
+    private String fileOriginName;
+
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @ApiParam("已报关数量")
+    private Double declaredQty;
+
+    @ApiParam("未报关数量")
+    private Double notDeclaredQty;
+
+    //public Double getNotDeclaredQty() {
+    //    if (orderQty == null || notDeclaredQty == null){
+    //        return orderQty;
+    //    }
+    //    return orderQty - declaredQty;
+    //}
+
+    @ApiParam("报关状态")
+    @AnnoOutputColumn(
+            refClass = CdmEnumUtil.IS_DECLARED.class,
+            refForeignKey = "value",
+            value = "description"
+    )
+    private Integer declaredStatus;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("修改时间")
+    private String modifyDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("分页信息")
+    private Pager pager;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/SxCdmElectronicLedgerProductInfoModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/SxCdmElectronicLedgerProductInfoModel.java
new file mode 100644
index 0000000..bd85886
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/SxCdmElectronicLedgerProductInfoModel.java
@@ -0,0 +1,87 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+
+@Data
+@ApiModel("电子账册产品信息 MODEL")
+public class SxCdmElectronicLedgerProductInfoModel {
+
+    @ApiParam("账册编号")
+    private String accountNo;
+
+    @ApiParam("公司级别")
+    private Integer companyLevel;
+
+    @ApiParam("公司级别")
+    private String companyLevelName;
+
+    @ApiParam("料件成品标志")
+    private Integer materialsCompleteProductFlag;
+
+    @ApiParam("料件成品标志")
+    private String materialsCompleteProductFlagName;
+
+    @ApiParam("备案序号")
+    private Double recordSerialNumber;
+
+    @ApiParam("商品料号 （海关商品料号取值）")
+    private String customsCommodityNo;
+
+    @ApiParam("商品编码")
+    private String commodityNo;
+
+    @ApiParam("商品名称")
+    private String commodityName;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("申报计量单位")
+    private String declareMeasureUnit;
+
+    @ApiParam("申报计量单位名称")
+    private String declareMeasureUnitName;
+
+    @ApiParam("法定计量单位")
+    private String legalMeasureUnit;
+
+    @ApiParam("法定计量单位名称")
+    private String legalMeasureUnitName;
+
+    @ApiParam("法定第二计量单位")
+    private String legal2MeasureUnit;
+
+    @ApiParam("法定第二计量单位名称")
+    private String legal2MeasureUnitName;
+
+    @Column(name = "DECLARE_ELEMENT")
+    @ApiParam("申报要素")
+    private String declareElement;
+
+    @Column(name = "CHECKOUT_QUARANTINE_NO")
+    @ApiParam("检验检疫编码")
+    private String checkoutQuarantineNo;
+
+    @Column(name = "COUNTERPARTY_PART_NO")
+    @ApiParam("交易方物料编码")
+    private String counterpartyPartNo;
+
+    @Column(name = "COMMODITY_SN")
+    @ApiParam("商品条码")
+    private String commoditySn;
+
+    @Column(name = "TARIFF_RATE")
+    @ApiParam("关税率")
+    private Double tariffRate;
+
+    @Column(name = "VAT_RATES")
+    @ApiParam("增值税率")
+    private Double vatRates;
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/SxExcelImportErrorExtModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/SxExcelImportErrorExtModel.java
new file mode 100644
index 0000000..9249db7
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/SxExcelImportErrorExtModel.java
@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes导入异常结果model")
+public class SxExcelImportErrorExtModel implements Serializable {
+
+    @ApiParam("错误的行号")
+    private int rowNum;
+
+    @ApiParam("错误数量")
+    private int errorNum;
+
+    @ApiParam("错误列号")
+    private String cellNum;
+
+    @ApiParam("错误描述")
+    private String errorInfo;
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/SxExcelImportResultExtModel.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/SxExcelImportResultExtModel.java
new file mode 100644
index 0000000..814d58a
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/model/SxExcelImportResultExtModel.java
@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.cdm.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes导入结果model")
+public class SxExcelImportResultExtModel<T> implements Serializable {
+
+    @ApiParam("结果")
+    private boolean result;
+
+    @ApiParam("成功行数量")
+    private int successRowNum;
+
+    @ApiParam("失败行数量")
+    private int failRowNum;
+
+    @ApiParam("错误信息集合")
+    private List<SxExcelImportErrorExtModel> excelImportErrorModels;
+
+    @ApiParam("错误的行号")
+    private String errorRows;
+
+    @ApiParam("导入数据集合")
+    private List<T> excelList;
+
+    @ApiParam("导入进度")
+    private String importSpeed;
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmBasCustomerRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmBasCustomerRepository.java
new file mode 100644
index 0000000..5ba3245
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmBasCustomerRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmBasCustomer;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : cdm客户repository
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/18 0:53
+ * @Modify:
+ **/
+@Repository
+public interface CdmBasCustomerRepository extends BaseRepository<CdmBasCustomer, Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmBasVendorRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmBasVendorRepository.java
new file mode 100644
index 0000000..dff5d8c
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmBasVendorRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmBasVendor;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :供应商信息
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2022-02-11
+ **/
+@Repository
+public interface CdmBasVendorRepository extends BaseRepository<CdmBasVendor, Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmConfigRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmConfigRepository.java
new file mode 100644
index 0000000..450a0eb
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmConfigRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmConfig;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 系统参数repository
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/8/10 10:38
+ * @Modify:
+ **/
+@Repository
+public interface CdmConfigRepository extends BaseRepository<CdmConfig,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmCustomCheckDetailRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmCustomCheckDetailRepository.java
new file mode 100644
index 0000000..2f090dc
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmCustomCheckDetailRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmCustomCheckDetail;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 海关核注清单明细
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/26 18:09
+ * @Modify:
+ **/
+@Repository
+public interface CdmCustomCheckDetailRepository extends BaseRepository<CdmCustomCheckDetail,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmCustomCheckMasterRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmCustomCheckMasterRepository.java
new file mode 100644
index 0000000..41bee06
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmCustomCheckMasterRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmCustomCheckMaster;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 海关核对清单
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/26 18:08
+ * @Modify:
+ **/
+@Repository
+public interface CdmCustomCheckMasterRepository extends BaseRepository<CdmCustomCheckMaster, Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmCustomsDetailRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmCustomsDetailRepository.java
new file mode 100644
index 0000000..7a1b6cf
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmCustomsDetailRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmCustomsDetail;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CdmCustomsDetailRepository extends BaseRepository<CdmCustomsDetail,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmCustomsMasterRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmCustomsMasterRepository.java
new file mode 100644
index 0000000..968ba22
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmCustomsMasterRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmCustomsMaster;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CdmCustomsMasterRepository extends BaseRepository<CdmCustomsMaster,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmEnumRepositpry.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmEnumRepositpry.java
new file mode 100644
index 0000000..9e1cee6
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmEnumRepositpry.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmEnum;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :字典枚举
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-15
+ * @Modify:
+ **/
+@Repository
+public interface CdmEnumRepositpry extends BaseRepository<CdmEnum,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportModuleDetailRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportModuleDetailRepository.java
new file mode 100644
index 0000000..fa8c522
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportModuleDetailRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmExportModuleDetail;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/11 0:11
+ * @Modify:
+ **/
+@Repository
+public interface CdmExportModuleDetailRepository extends BaseRepository<CdmExportModuleDetail,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportModuleRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportModuleRepository.java
new file mode 100644
index 0000000..f46f7a3
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportModuleRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmExportModule;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/11 0:11
+ * @Modify:
+ **/
+@Repository
+public interface CdmExportModuleRepository extends BaseRepository<CdmExportModule, Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTaskDetailRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTaskDetailRepository.java
new file mode 100644
index 0000000..9ad2203
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTaskDetailRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmExportTaskDetail;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/11 0:03
+ * @Modify:
+ **/
+@Repository
+public interface CdmExportTaskDetailRepository extends BaseRepository<CdmExportTaskDetail,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTaskRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTaskRepository.java
new file mode 100644
index 0000000..27e0758
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTaskRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmExportTask;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/11 0:03
+ * @Modify:
+ **/
+@Repository
+public interface CdmExportTaskRepository extends BaseRepository<CdmExportTask,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTemplateFiftyRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTemplateFiftyRepository.java
new file mode 100644
index 0000000..3c8a670
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTemplateFiftyRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmExportTemplateFifty;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 50_总公司现报核注清单表头
+ * @Reference :
+ * @Author : jiaqi.hou
+ * @CreateDate : 2022/11/23 10:58
+ * @Modify:
+ **/
+@Repository
+public interface CdmExportTemplateFiftyRepository extends BaseRepository<CdmExportTemplateFifty,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTemplateFortyTravelRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTemplateFortyTravelRepository.java
new file mode 100644
index 0000000..c3ce458
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTemplateFortyTravelRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmExportTemplateFortyTravel;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 40_总公司分送集报出入库单表体
+ * @Reference :
+ * @Author : xinwang.yi
+ * @CreateDate : 2022/11/18 18:09
+ * @Modify:
+ **/
+@Repository
+public interface CdmExportTemplateFortyTravelRepository extends BaseRepository<CdmExportTemplateFortyTravel,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTemplateRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTemplateRepository.java
new file mode 100644
index 0000000..55402ed
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTemplateRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmExportTemplate;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 导出模板数据访问
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/11 22:29
+ * @Modify:
+ **/
+@Repository
+public interface CdmExportTemplateRepository extends BaseRepository<CdmExportTemplate,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTemplateSixtyRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTemplateSixtyRepository.java
new file mode 100644
index 0000000..a152beb
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTemplateSixtyRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmExportTemplateSixty;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 60_总公司核注清单表体一
+ * @Reference :
+ * @Author : jiaqi.hou
+ * @CreateDate : 2022/11/23 10:58
+ * @Modify:
+ **/
+@Repository
+public interface CdmExportTemplateSixtyRepository extends BaseRepository<CdmExportTemplateSixty,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTemplateThirtyTravelRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTemplateThirtyTravelRepository.java
new file mode 100644
index 0000000..e1733cf
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmExportTemplateThirtyTravelRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmExportTemplateThirtyTravel;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 30_总公司分送集报出入库单表头导出履历表
+ * @Reference :
+ * @Author : xinwang.yi
+ * @CreateDate : 2022/11/18 18:09
+ * @Modify:
+ **/
+@Repository
+public interface CdmExportTemplateThirtyTravelRepository extends BaseRepository<CdmExportTemplateThirtyTravel,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmFileRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmFileRepository.java
new file mode 100644
index 0000000..f4d1b3f
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmFileRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmFile;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface CdmFileRepository extends BaseRepository<CdmFile, Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmFinalDeclarationDataDetailsRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmFinalDeclarationDataDetailsRepository.java
new file mode 100644
index 0000000..9538ab5
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmFinalDeclarationDataDetailsRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmFinalDeclarationDataDetails;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 终审报关数据明细表RDao
+ * @Reference :
+ * @Author : jiaqi.hou
+ * @CreateDate : 2022/11/30 15:20
+ * @Modify:
+ **/
+@Repository
+public interface CdmFinalDeclarationDataDetailsRepository extends BaseRepository<CdmFinalDeclarationDataDetails,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmFinalDeclarationDataMasterRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmFinalDeclarationDataMasterRepository.java
new file mode 100644
index 0000000..51a4578
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmFinalDeclarationDataMasterRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmFinalDeclarationDataMaster;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 终审报关数据主表RDao
+ * @Reference :
+ * @Author : jiaqi.hou
+ * @CreateDate : 2022/11/30 15:20
+ * @Modify:
+ **/
+@Repository
+public interface CdmFinalDeclarationDataMasterRepository extends BaseRepository<CdmFinalDeclarationDataMaster,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmModuleExcelManageRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmModuleExcelManageRepository.java
new file mode 100644
index 0000000..db98e93
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmModuleExcelManageRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmModuleExcelManage;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author yumingxing
+ * @version 1.0
+ * @date 2021/1/29 15:02
+ **/
+@Repository
+public interface CdmModuleExcelManageRepository extends BaseRepository<CdmModuleExcelManage, Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmNuclearReleaseFileRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmNuclearReleaseFileRepository.java
new file mode 100644
index 0000000..dfd4b78
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmNuclearReleaseFileRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmNuclearReleaseFile;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CdmNuclearReleaseFileRepository extends BaseRepository<CdmNuclearReleaseFile,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmPurchaseInfoRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmPurchaseInfoRepository.java
new file mode 100644
index 0000000..d32c70f
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmPurchaseInfoRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmPurchaseInfo;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : Cdm采购信息
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/10/20 15:08
+ * @Modify:
+ **/
+@Repository
+public interface CdmPurchaseInfoRepository extends BaseRepository<CdmPurchaseInfo, Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmSalesPriceRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmSalesPriceRepository.java
new file mode 100644
index 0000000..1cb6f14
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmSalesPriceRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmSalesPrice;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/20 19:13
+ * @Modify:
+ **/
+@Repository
+public interface CdmSalesPriceRepository extends BaseRepository<CdmSalesPrice,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmVendorPartRelRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmVendorPartRelRepository.java
new file mode 100644
index 0000000..e2c4a73
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/CdmVendorPartRelRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.CdmVendorPartRel;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CdmVendorPartRelRepository extends BaseRepository<CdmVendorPartRel,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/SxCdmDcReportNoInfoRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/SxCdmDcReportNoInfoRepository.java
new file mode 100644
index 0000000..7ad39f5
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/SxCdmDcReportNoInfoRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.SxCdmDcReportNoInfo;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 分送集报申报编号信息
+ * @Reference :
+ * @Author : yxw
+ * @CreateDate : 2022/5/12 13:29
+ * @Modify:
+ **/
+@Repository
+public interface SxCdmDcReportNoInfoRepository extends BaseRepository<SxCdmDcReportNoInfo,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/SxCdmDcReportProductInfoRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/SxCdmDcReportProductInfoRepository.java
new file mode 100644
index 0000000..bdb29ca
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/SxCdmDcReportProductInfoRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.SxCdmDcReportProductInfo;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 分送集报申报产品信息
+ * @Reference :
+ * @Author : yxw
+ * @CreateDate : 2022/5/12 13:29
+ * @Modify:
+ **/
+@Repository
+public interface SxCdmDcReportProductInfoRepository extends BaseRepository<SxCdmDcReportProductInfo,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/SxCdmElectronicLedgerProductInfoRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/SxCdmElectronicLedgerProductInfoRepository.java
new file mode 100644
index 0000000..262c33d
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/SxCdmElectronicLedgerProductInfoRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.SxCdmElectronicLedgerProductInfo;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @PROJECT_NAME: i3plus-cdm-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-05-09 11:57
+ */
+@Repository
+public interface SxCdmElectronicLedgerProductInfoRepository extends BaseRepository<SxCdmElectronicLedgerProductInfo,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/SxCdmPackagingRelationshipRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/SxCdmPackagingRelationshipRepository.java
new file mode 100644
index 0000000..5af2443
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/SxCdmPackagingRelationshipRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.SxCdmPackagingRelationship;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @PROJECT_NAME: i3plus-cdm-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-05-09 15:57
+ */
+@Repository
+public interface SxCdmPackagingRelationshipRepository extends BaseRepository<SxCdmPackagingRelationship,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/SxCdmPartRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/SxCdmPartRepository.java
new file mode 100644
index 0000000..9045f68
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/SxCdmPartRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.SxCdmPart;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 物料
+ * @Reference :
+ * @Author : yxw
+ * @CreateDate : 2022/5/12 13:29
+ * @Modify:
+ **/
+@Repository
+public interface SxCdmPartRepository extends BaseRepository<SxCdmPart,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/SxCdmUnitConversionRepository.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/SxCdmUnitConversionRepository.java
new file mode 100644
index 0000000..60e3a72
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/repository/SxCdmUnitConversionRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.cdm.repository;
+
+import cn.estsh.i3plus.pojo.cdm.bean.SxCdmUnitConversion;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @PROJECT_NAME: i3plus-cdm-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-05-09 15:57
+ */
+@Repository
+public interface SxCdmUnitConversionRepository extends BaseRepository<SxCdmUnitConversion,Long> {
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/sqlpack/CdmHqlPack.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/sqlpack/CdmHqlPack.java
new file mode 100644
index 0000000..da13f49
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/sqlpack/CdmHqlPack.java
@@ -0,0 +1,338 @@
+package cn.estsh.i3plus.pojo.cdm.sqlpack;
+
+
+import cn.estsh.i3plus.pojo.cdm.bean.*;
+import cn.estsh.i3plus.pojo.cdm.util.CdmConstWords;
+import cn.estsh.i3plus.pojo.cdm.util.CdmEnumUtil;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+
+/**
+ * @Description:
+     * @Reference: Cdm 条件封装
+ * @Author: wangjie
+ * @CreateDate:2019-04-22-14:58
+ * @Modify:
+ **/
+public class CdmHqlPack {
+
+    public static DdlPackBean packHqlCdmPurchaseInfo(CdmPurchaseInfo cdmPurchaseInfo) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(cdmPurchaseInfo.getPartNo(), CdmConstWords.PART_NO, result);
+        DdlPreparedPack.getStringLikerPack(cdmPurchaseInfo.getVendorNo(), CdmConstWords.VENDOR_NO, result);
+        getStringBuilderPack(cdmPurchaseInfo, result);
+        return result;
+    }
+
+    public static DdlPackBean packHqlCdmSalesPrice(CdmSalesPrice cdmSalesPrice) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(cdmSalesPrice.getPartNo(), CdmConstWords.PART_NO, result);
+        getStringBuilderPack(cdmSalesPrice, result);
+        return result;
+    }
+
+    public static DdlPackBean packHqlCdmBasCustomer(CdmBasCustomer cdmBasCustomer) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(cdmBasCustomer.getCustNo(), CdmConstWords.CUST_NO, result);
+        DdlPreparedPack.getStringLikerPack(cdmBasCustomer.getCustName(), "custName", result);
+        DdlPreparedPack.getStringLikerPack(cdmBasCustomer.getCustDesc(), "custDesc", result);
+        getStringBuilderPack(cdmBasCustomer, result);
+        return result;
+    }
+
+
+    public static DdlPackBean packCdmCustomsDetail(CdmCustomsDetail cdmCustomsDetail) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(cdmCustomsDetail.getOrderNo(), CdmConstWords.ORDER_NO, packBean);
+        getStringBuilderPack(cdmCustomsDetail, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean packCdmCustomsMaster(CdmCustomsMaster cdmCustomsMaster) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(cdmCustomsMaster.getOrderNo(), CdmConstWords.ORDER_NO, packBean);
+        DdlPreparedPack.getNumEqualPack(cdmCustomsMaster.getIsGenerateExportTask(), CdmConstWords.IS_GENERATE_EXPORT_TASK, packBean);
+        DdlPreparedPack.getNumEqualPack(cdmCustomsMaster.getBusiType(), CdmConstWords.BUSI_TYPE, packBean);
+        DdlPreparedPack.getNumEqualPack(cdmCustomsMaster.getCompnayLevel(), CdmConstWords.COMPNAY_LEVEL, packBean);
+        DdlPreparedPack.getNumEqualPack(cdmCustomsMaster.getCustomsType(), CdmConstWords.CUSTOMS_TYPE, packBean);
+        DdlPreparedPack.getStringEqualPack(cdmCustomsMaster.getDeliveryDate(), CdmConstWords.DELIVERY_DATE, packBean);
+        DdlPreparedPack.getStringRightLikerPack(cdmCustomsMaster.getCarNo(), CdmConstWords.CAR_NO, packBean);
+        DdlPreparedPack.getNumEqualPack(cdmCustomsMaster.getTrainNumber(), CdmConstWords.TRAIN_NUMBER, packBean);
+        DdlPreparedPack.getStringEqualPack(cdmCustomsMaster.getCustNo(), CdmConstWords.CUST_NO, packBean);
+        DdlPreparedPack.getNumEqualPack(cdmCustomsMaster.getOrderStatus(), CdmConstWords.ORDER_STATUS, packBean);
+        DdlPreparedPack.getNumEqualPack(cdmCustomsMaster.getUpLoadStatus(), CdmConstWords.UP_LOAD_STATUS, packBean);
+        DdlPreparedPack.getNumEqualPack(cdmCustomsMaster.getCarAccessType(), CdmConstWords.CAR_ACCESS_TYPE, packBean);
+        DdlPreparedPack.getNumEqualPack(cdmCustomsMaster.getGoodsAccessType(), CdmConstWords.GOODS_ACCESS_TYPE, packBean);
+        DdlPreparedPack.getStringBiggerPack(cdmCustomsMaster.getCreateDateTimeStart(), CdmConstWords.CREATE_DATE_TIME, packBean);
+        DdlPreparedPack.getStringSmallerPack(cdmCustomsMaster.getCreateDateTimeEnd(), CdmConstWords.CREATE_DATE_TIME, packBean);
+        DdlPreparedPack.getStringBiggerPack(cdmCustomsMaster.getDeliveryDateStart(), CdmConstWords.DELIVERY_DATE, packBean);
+        DdlPreparedPack.getStringSmallerPack(cdmCustomsMaster.getDeliveryDateEnd(), CdmConstWords.DELIVERY_DATE, packBean);
+        DdlPreparedPack.getStringBiggerPack(cdmCustomsMaster.getCardEntryDateStart(), CdmConstWords.CARD_ENTRY_DATE, packBean);
+        DdlPreparedPack.getStringSmallerPack(cdmCustomsMaster.getCardEntryDateEnd(), CdmConstWords.CARD_ENTRY_DATE, packBean);
+        DdlPreparedPack.getNumEqualPack(cdmCustomsMaster.getGoodsType(), CdmConstWords.GOODS_TYPE, packBean);
+        DdlPreparedPack.getStringRightLikerPack(cdmCustomsMaster.getVendorNo(), CdmConstWords.VENDOR_NO, packBean);
+        DdlPreparedPack.getStringRightLikerPack(cdmCustomsMaster.getVendorName(), CdmConstWords.VENDOR_NAME, packBean);
+        getStringBuilderPack(cdmCustomsMaster, packBean);
+        return packBean;
+    }
+
+
+    public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, CdmConstWords.ORGANIZE_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), CdmConstWords.IS_VALID, packBean);
+        DdlPreparedPack.getNumEqualPack(CdmEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CdmConstWords.IS_DELETED, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getAllBaseData(String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, CdmConstWords.ORGANIZE_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(CdmEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CdmConstWords.IS_DELETED, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getAllValidData(String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, CdmConstWords.ORGANIZE_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), CdmConstWords.IS_VALID, packBean);
+        DdlPreparedPack.getNumEqualPack(CdmEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CdmConstWords.IS_DELETED, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean packHqlCdmExportTemplate(CdmExportTemplate cdmExportTemplate) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(cdmExportTemplate.getTemplateCode(), CdmConstWords.TEMPLATE_CODE, result);
+        DdlPreparedPack.getStringEqualPack(cdmExportTemplate.getOrganizeCode(), CdmConstWords.ORGANIZE_CODE, result);
+        getStringBuilderPack(cdmExportTemplate, result);
+        return result;
+    }
+
+
+    public static DdlPackBean packHqlCdmEnum(CdmEnum cdmEnum) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(cdmEnum.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getStringEqualPack(cdmEnum.getEnumType(), "enumType", result);
+        DdlPreparedPack.getStringEqualPack(cdmEnum.getEnumValue(), "enumValue", result);
+        DdlPreparedPack.getStringEqualPack(cdmEnum.getEnumValueDesc(), "enumValueDesc", result);
+        DdlPreparedPack.getNumEqualPack(cdmEnum.getEnumValueSeq(),"enumValueSeq",result);
+        getStringBuilderPack(cdmEnum, result);
+        return result;
+    }
+
+    public static DdlPackBean packHqlCdmExportModule(CdmExportModule cdmExportModule) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(cdmExportModule.getModuleCode(), CdmConstWords.MODULE_CODE, result);
+        DdlPreparedPack.getStringEqualPack(cdmExportModule.getOrganizeCode(), CdmConstWords.ORGANIZE_CODE, result);
+        getStringBuilderPack(cdmExportModule, result);
+        return result;
+    }
+
+
+    public static DdlPackBean packHqlCdmExportModuleDetail(CdmExportModuleDetail cdmExportModuleDetail) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(cdmExportModuleDetail.getModuleCode(), CdmConstWords.MODULE_CODE, result);
+        DdlPreparedPack.getStringEqualPack(cdmExportModuleDetail.getTemplateCode(), CdmConstWords.TEMPLATE_CODE,result);
+        DdlPreparedPack.getStringEqualPack(cdmExportModuleDetail.getOrganizeCode(), CdmConstWords.ORGANIZE_CODE, result);
+        getStringBuilderPack(cdmExportModuleDetail, result);
+        return result;
+    }
+
+
+    public static DdlPackBean packHqlCdmExportTask(CdmExportTask cdmExportTask) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(cdmExportTask.getTaskNo(), CdmConstWords.TASK_NO, result);
+        DdlPreparedPack.getNumEqualPack(cdmExportTask.getTaskStatus(), CdmConstWords.TASK_STATUS, result);
+        DdlPreparedPack.getStringEqualPack(cdmExportTask.getRefOrderNo(), CdmConstWords.REF_ORDER_NO, result);
+        DdlPreparedPack.getStringEqualPack(cdmExportTask.getModuleCode(), CdmConstWords.MODULE_CODE,result);
+        DdlPreparedPack.getStringEqualPack(cdmExportTask.getOrganizeCode(), CdmConstWords.ORGANIZE_CODE, result);
+        getStringBuilderPack(cdmExportTask, result);
+        return result;
+    }
+
+    public static DdlPackBean packHqlCdmExportTaskDetail(CdmExportTaskDetail cdmExportTaskDetail) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(cdmExportTaskDetail.getTaskNo(), CdmConstWords.TASK_NO, result);
+        DdlPreparedPack.getNumEqualPack(cdmExportTaskDetail.getItemStatus(), CdmConstWords.ITEM_STATUS, result);
+        DdlPreparedPack.getStringEqualPack(cdmExportTaskDetail.getOrganizeCode(), CdmConstWords.ORGANIZE_CODE, result);
+        getStringBuilderPack(cdmExportTaskDetail, result);
+        return result;
+    }
+
+    public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) {
+        if (!StringUtils.isEmpty(bean.getOrganizeCode())) {
+            DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
+        }
+
+        DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr);
+        if (!StringUtils.isEmpty(bean.getCreateDateTimeStart()) && org.apache.commons.lang3.StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true);
+        }
+
+        if (StringUtil.isEmpty(bean.getIsValid())) {
+            DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", hqlStr);
+        } else {
+            DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
+        }
+
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
+        return hqlStr;
+    }
+
+    public static DdlPackBean getSxCdmElectronicLedgerProductInfo(SxCdmElectronicLedgerProductInfo sxCdmElectronicLedgerProductInfo) {
+        DdlPackBean packBean = getAllValidData(sxCdmElectronicLedgerProductInfo.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(sxCdmElectronicLedgerProductInfo.getMaterialsCompleteProductFlag(), CdmConstWords.MATERIALS_COMPLETE_PRODUCT_FLAG,packBean);
+        DdlPreparedPack.getNumEqualPack(sxCdmElectronicLedgerProductInfo.getRecordSerialNumber(), CdmConstWords.RECORD_SERIAL_NUMBER,packBean);
+        DdlPreparedPack.getStringLikerPack(sxCdmElectronicLedgerProductInfo.getCustomsCommodityNo(), CdmConstWords.CUSTOMS_COMMODITY_NO,packBean);
+        DdlPreparedPack.getStringLikerPack(sxCdmElectronicLedgerProductInfo.getCommodityNo(), CdmConstWords.COMMODITY_NO,packBean);
+        DdlPreparedPack.getStringLikerPack(sxCdmElectronicLedgerProductInfo.getPartNo(), CdmConstWords.PART_NO,packBean);
+        DdlPreparedPack.getStringLikerPack(sxCdmElectronicLedgerProductInfo.getAccountNo(), CdmConstWords.ACCOUNT_NO,packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getSxCdmPackagingRelationship(SxCdmPackagingRelationship sxCdmPackagingRelationship) {
+        DdlPackBean packBean = getAllValidData(sxCdmPackagingRelationship.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(sxCdmPackagingRelationship.getPartNo(), CdmConstWords.PART_NO,packBean);
+        DdlPreparedPack.getStringLikerPack(sxCdmPackagingRelationship.getPartName(), CdmConstWords.PART_NAME,packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getSxCdmPackagingRelationship2(SxCdmPackagingRelationship sxCdmPackagingRelationship) {
+        DdlPackBean packBean = getAllValidData(sxCdmPackagingRelationship.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(sxCdmPackagingRelationship.getPartNo(), CdmConstWords.PART_NO,packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getSxCdmElectronicLedgerProductInfo2(SxCdmElectronicLedgerProductInfo sxCdmElectronicLedgerProductInfo) {
+        DdlPackBean packBean = getAllValidData(sxCdmElectronicLedgerProductInfo.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(sxCdmElectronicLedgerProductInfo.getMaterialsCompleteProductFlag(), CdmConstWords.MATERIALS_COMPLETE_PRODUCT_FLAG,packBean);
+        DdlPreparedPack.getNumEqualPack(sxCdmElectronicLedgerProductInfo.getRecordSerialNumber(), CdmConstWords.RECORD_SERIAL_NUMBER,packBean);
+        DdlPreparedPack.getStringEqualPack(sxCdmElectronicLedgerProductInfo.getCustomsCommodityNo(), CdmConstWords.CUSTOMS_COMMODITY_NO,packBean);
+        DdlPreparedPack.getStringEqualPack(sxCdmElectronicLedgerProductInfo.getCommodityNo(), CdmConstWords.COMMODITY_NO,packBean);
+        DdlPreparedPack.getStringEqualPack(sxCdmElectronicLedgerProductInfo.getPartNo(), CdmConstWords.PART_NO,packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getSxCdmUnitConversion(String organizeCode, String partNo) {
+        DdlPackBean packBean = getAllValidData(organizeCode);
+        DdlPreparedPack.getStringEqualPack(partNo, CdmConstWords.PART_NO,packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getSxCdmUnitConversion2(SxCdmUnitConversion unitConversion) {
+        DdlPackBean packBean = getAllValidData(unitConversion.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(unitConversion.getPartNo(), CdmConstWords.PART_NO,packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getSxCdmDcReportNoInfo(SxCdmDcReportNoInfo sxCdmDCReportNoInfo) {
+        DdlPackBean packBean = getAllValidData(sxCdmDCReportNoInfo.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(sxCdmDCReportNoInfo.getCounterpartyCode(), CdmConstWords.COUNTERPARTY_CODE,packBean);
+        DdlPreparedPack.getStringLikerPack(sxCdmDCReportNoInfo.getCounterpartyName(), CdmConstWords.COUNTERPARTY_NAME,packBean);
+        DdlPreparedPack.getNumEqualPack(sxCdmDCReportNoInfo.getMaterialsCompleteProductFlag(), CdmConstWords.MATERIALS_COMPLETE_PRODUCT_FLAG,packBean);
+        DdlPreparedPack.getStringLikerPack(sxCdmDCReportNoInfo.getBusiDeclareNo(), CdmConstWords.BUSI_DECLARE_NO,packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getSxCdmDcReportNoInfo2(SxCdmDcReportNoInfo sxCdmDCReportNoInfo) {
+        DdlPackBean packBean = getAllValidData(sxCdmDCReportNoInfo.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(sxCdmDCReportNoInfo.getCounterpartyName(), CdmConstWords.COUNTERPARTY_NAME,packBean);
+        DdlPreparedPack.getNumEqualPack(sxCdmDCReportNoInfo.getTradeType(), CdmConstWords.TRADE_TYPE,packBean);
+        DdlPreparedPack.getStringEqualPack(sxCdmDCReportNoInfo.getBusiDeclareNo(), CdmConstWords.BUSI_DECLARE_NO,packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getSxCdmDcReportProductInfo(SxCdmDcReportProductInfo sxCdmDCReportNoInfo) {
+        DdlPackBean packBean = getAllValidData(sxCdmDCReportNoInfo.getOrganizeCode());
+//        DdlPreparedPack.getStringLikerPack(sxCdmDCReportNoInfo.getCounterpartyName(), CdmExtConstWords.COUNTERPARTY_NAME,packBean);
+        DdlPreparedPack.getNumEqualPack(sxCdmDCReportNoInfo.getMaterialsCompleteProductFlag(), CdmConstWords.MATERIALS_COMPLETE_PRODUCT_FLAG,packBean);
+        DdlPreparedPack.getStringLikerPack(sxCdmDCReportNoInfo.getBusiDeclareNo(), CdmConstWords.BUSI_DECLARE_NO,packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean packHqlBasVendor(CdmBasVendor basVendor) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", result);
+        DdlPreparedPack.getStringLikerPack(basVendor.getVendorName(), "vendorName", result);
+        getStringBuilderPack(basVendor, result);
+        return result;
+
+    }
+
+    public static DdlPackBean getSxCdmPart(SxCdmPart sxCdmPart) {
+        DdlPackBean packBean = getAllValidData(sxCdmPart.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(sxCdmPart.getPartNo(), CdmConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(sxCdmPart.getPartNameRdd(), CdmConstWords.PART_NAME_RDD, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getConfig(CdmConfig cfgCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(cfgCode, cfgCode.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(cfgCode.getCfgCode(), CdmConstWords.CFG_CODE, packBean);
+        DdlPreparedPack.getStringLikerPack(cfgCode.getCfgName(), CdmConstWords.CFG_NAME, packBean);
+        DdlPreparedPack.getStringEqualPack(cfgCode.getCfgKey(), CdmConstWords.CFG_KEY, packBean);
+        DdlPreparedPack.getStringEqualPack(cfgCode.getCfgType(), CdmConstWords.CFG_TYPE, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getFindTheListOfChecksThatWereNotGeneratedHql(CdmExportTemplateThirtyTravel travel) {
+        DdlPackBean packBean = getAllValidData(travel.getOrganizeCode());
+        DdlPreparedPack.getStringBiggerPack(travel.getCreateDateTimeStart(), CdmConstWords.CREATE_DATE_TIME,packBean);
+        DdlPreparedPack.getStringSmallerPack(travel.getCreateDateTimeEnd(), CdmConstWords.CREATE_DATE_TIME,packBean);
+        DdlPreparedPack.getStringEqualPack(travel.getReturnNo(), CdmConstWords.RETURN_NO,packBean);
+        DdlPreparedPack.getNumEqualPack(travel.getWhetherItHasBeenGenerated(), CdmConstWords.WHETHER_IT_HAS_BEEN_GENERATED,packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getFindTheListOfChecksThatWereNotGeneratedByOrderNoHql(List<String> orderNos, String organizeCode) {
+        DdlPackBean packBean = getAllValidData(organizeCode);
+        DdlPreparedPack.getInPackList(orderNos, CdmConstWords.ORDER_NO,packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CdmConstWords.WHETHER_IT_HAS_BEEN_GENERATED,packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getFindExportTemplateFortyTravelByOrderNoHql(List<String> orderNos, String organizeCode) {
+        DdlPackBean packBean = getAllValidData(organizeCode);
+        DdlPreparedPack.getInPackList(orderNos, CdmConstWords.ORDER_NO,packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getSxCdmDcReportNoInfoByReturnNos(List<String> returnNos,String organizeCode) {
+        DdlPackBean packBean = getAllValidData(organizeCode);
+        DdlPreparedPack.getInPackList(returnNos, CdmConstWords.BUSI_DECLARE_NO,packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getQueryCdmExportTemplateFiftyHql(CdmExportTemplateFifty reqModel, String organizeCode){
+        DdlPackBean packBean = getAllValidData(organizeCode);
+        DdlPreparedPack.getStringEqualPack(reqModel.getListNumber(), CdmConstWords.LIST_NUMBER,packBean);
+        DdlPreparedPack.getStringEqualPack(reqModel.getPreInputUnifiedNumber(), CdmConstWords.PRE_INPUT_UNIFIED_NUMBER,packBean);
+        DdlPreparedPack.getStringEqualPack(reqModel.getPartFinishedFlag(), CdmConstWords.PART_FINISHED_FLAG,packBean);
+        DdlPreparedPack.getNumEqualPack(reqModel.getTemporaryHoldCheckStatus(), CdmConstWords.TEMPORARY_HOLD_CHECK_STATUS,packBean);
+        DdlPreparedPack.getStringBiggerPack(reqModel.getCreateDateTimeStart(), CdmConstWords.CREATE_DATE_TIME,packBean);
+        DdlPreparedPack.getStringSmallerPack(reqModel.getCreateDateTimeEnd(), CdmConstWords.CREATE_DATE_TIME,packBean);
+        DdlPreparedPack.getStringEqualPack(reqModel.getIntoAreaDate(), CdmConstWords.INTO_AREA_DATE,packBean);
+        DdlPreparedPack.getStringEqualPack(reqModel.getCounterparty(), CdmConstWords.COUNTERPARTY,packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getQueryComparisonOfCustomsDeclarationDataHql(CdmFinalDeclarationDataMaster reqModel){
+        DdlPackBean packBean = getAllValidData(reqModel.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(reqModel.getTheFinalCheckStatus(), CdmConstWords.THE_FINAL_CHECK_STATUS,packBean);
+        DdlPreparedPack.getNumEqualPack(reqModel.getTypeOfDeclaration(), CdmConstWords.TYPE_OF_DECLARATION,packBean);
+        DdlPreparedPack.getStringEqualPack(reqModel.getPartFinishedFlag(), CdmConstWords.PART_FINISHED_FLAG,packBean);
+        DdlPreparedPack.getStringEqualPack(reqModel.getReturnNumber(), CdmConstWords.RETURN_NO,packBean);
+        DdlPreparedPack.getStringBiggerPack(reqModel.getCreateDateTimeStart(), CdmConstWords.CREATE_DATE_TIME,packBean);
+        DdlPreparedPack.getStringSmallerPack(reqModel.getCreateDateTimeEnd(), CdmConstWords.CREATE_DATE_TIME,packBean);
+        DdlPreparedPack.getStringEqualPack(reqModel.getPreInputUnifiedNumber(), CdmConstWords.PRE_INPUT_UNIFIED_NUMBER,packBean);
+        DdlPreparedPack.getStringEqualPack(reqModel.getFinalAuditNoteNumber(), CdmConstWords.FINAL_AUDIT_NOTE_NUMBER,packBean);
+        DdlPreparedPack.getStringEqualPack(reqModel.getIntoAreaDate(), CdmConstWords.INTO_AREA_DATE,packBean);
+        return packBean;
+    }
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/util/CdmConstWords.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/util/CdmConstWords.java
new file mode 100644
index 0000000..76a628d
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/util/CdmConstWords.java
@@ -0,0 +1,358 @@
+package cn.estsh.i3plus.pojo.cdm.util;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2018-10-23 20:41
+ * @Modify:
+ **/
+public class CdmConstWords {
+    //api路径头
+    public static final String BASE_URL_CDM = "/cdm";
+    //api-白名单径头
+    public static final String BASE_URL_CDM_WHITE = "/cdm/white";
+
+    //网关
+    public static final String GATEWAY_HOST = "GATEWAY_HOST";
+    //JOB
+    public static final String JOB = "JOB";
+
+    public static final String CDM_JOB_REDIS_PREFIX = "CDM:JOB:";
+
+    //CDM_REDIS
+    public static final String REDIS_CDM = "redisCdm";
+    // id常量
+    public static final String ID = "id";
+    // id常量
+    public static final String ID_STR = "idStr";
+    // ids
+    public static final String IDS = "ids";
+    // 工厂的常量
+    public static final String ORGANIZE_CODE = "organizeCode";
+    // 是否禁用
+    public static final String IS_VALID = "isValid";
+    // 是否禁用
+    public static final String IS_VALID1 = "isValid1";
+    // 是否删除
+    public static final String IS_DELETED = "isDeleted";
+    //模块
+    public static final String MODULE = "module";
+    //模块代码
+    public static final String MODULE_CODE = "moduleCode";
+    //模块名称
+    public static final String MODULE_NAME = "moduleName";
+
+    // 创建时间
+    public static final String CREATE_DATE_TIME = "createDatetime";
+    // 修改时间
+    public static final String MODIFY_DATE_TIME = "modifyDatetime";
+    // 创建人
+    public static final String CREATE_USER = "createUser";
+    // 修改人
+    public static final String MODIFY_USER = "modifyUser";
+    //文件地址
+    public static final String FILE_URL = "fileUrl";
+    //文件原名
+    public static final String FILE_ORIGIN_NAME = "fileOriginName";
+    //配置代码
+    public static final String CFG_CODE = "cfgCode";
+    //配置名称
+    public static final String CFG_NAME = "cfgName";
+    //配置KEY
+    public static final String CFG_KEY = "cfgKey";
+    //配置值
+    public static final String CFG_VALUE = "cfgValue";
+    //配置值描述
+    public static final String CFG_VALUE_DESC = "cfgValueDesc";
+    //配置类型
+    public static final String CFG_TYPE = "cfgType";
+    //"SAP单位名称"
+    public static final String SAP_UNIT_NAME = "sapUnitName";
+    //"SAP单位数量"
+    public static final String SAP_UNIT_NUMBER = "sapUnitNumber";
+    //"申报计量单位"
+    public static final String DECLARE_MEASURE_UNIT_NAME = "declareMeasureUnitName";
+    //"申报计量数量"
+    public static final String DECLARE_MEASURE_NUMBER = "declareMeasureNumber";
+    //"法定计量单位代码"
+    public static final String LEGAL_MEASURE_UNIT = "legalMeasureUnit";
+    //"法定计量单位"
+    public static final String LEGAL_MEASURE_UNIT_NAME = "legalMeasureUnitName";
+    //"法定计量单位"
+    public static final String LEGAL_MEASURE_NUMBER = "legalMeasureNumber";
+    //时间[开始/结束]条件
+    public static final String CREATE_DATE_TIME_START = "createDatetimeStart";
+    public static final String CREATE_DATE_TIME_END = "createDatetimeEnd";
+    public static final String MODIFY_DATE_TIME_START = "modifyDatetimeStart";
+    public static final String MODIFY_DATE_TIME_END = "modifyDatetimeEnd";
+
+    //时间类型
+    public static final String DATETIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+    //日期类型
+    public static final String DATE_FORMAT = "yyyy-MM-dd";
+
+    //0
+    public static final int ZERO = 0;
+
+    //"0"
+    public static final String ZERO_STR = "0";
+
+    //枚举类型
+    public static final String ENUM_TYPE = "enumType";
+    //枚举值
+    public static final String ENUM_VALUE = "enumValue";
+
+    //枚举值序号
+    public static final String ENUM_VALUE_SEQ = "enumValueSeq";
+
+    //枚举值描述
+    public static final String ENUM_VALUE_DESC = "enumValueDesc";
+
+    /**导出模板编码**/
+    public static final String TEMPLATE_CODE = "templateCode";
+
+    /**导出模板名称**/
+    public static final String TEMPLATE_NAME = "templateName";
+
+    /**导出模板文件构成列位**/
+    public static final String TEMPLATE_COLUMN = "templateColumn";
+
+    //"料件成品标志"
+    public static final String MATERIALS_COMPLETE_PRODUCT_FLAG = "materialsCompleteProductFlag";
+    //"备序编号"
+    public static final String RECORD_SERIAL_NUMBER = "recordSerialNumber";
+    //"海关商品料号"
+    public static final String CUSTOMS_COMMODITY_NO = "customsCommodityNo";
+    //"商品编码"
+    public static final String COMMODITY_NO = "commodityNo";
+    //"物料编码"
+    public static final String PART_NO = "partNo";
+    //"物料编码"
+    public static final String PART_NAME = "partName";
+    //"物料编码"
+    public static final String PART_NAME_RDD = "partNameRdd";
+    //"申报计量单位"
+    public static final String DECLARE_MEASURE_UNIT = "declareMeasureUnit";
+
+    //"PCS数量"
+    public static final String PCS_QTY = "pcsQty";
+    //"CTNS箱数量"
+    public static final String CTNS_BOX_QTY = "ctnsBoxQty";
+    //"PALLETS托数量"
+    public static final String PALLETS_TRAY_QTY = "palletsTrayQty";
+    //"单包装箱体积"
+    public static final String SINGLE_PACKING_VOLUME = "singlePackingVolume";
+    //"SIZE/C体积"
+    public static final String SIZE_DIVIDE_C_VOLUME = "sizeDivideCVolume";
+    //计量单位
+    public static final String MEASURE_UNIT_DICTIONARY = "MEASURE_UNIT_DICTIONARY";
+
+    /**任务编号**/
+    public static final String TASK_NO = "taskNo";
+
+    /**关联单号**/
+    public static final String REF_ORDER_NO = "refOrderNo";
+
+    /**任务状态**/
+    public static final String TASK_STATUS = "taskStatus";
+
+    /**明细状态**/
+    public static final String ITEM_STATUS = "itemStatus";
+
+    /**行号**/
+    public static final String ITEM = "item";
+
+    //序号
+    public static final String SERIAL_NUMBER = "serialNumber";
+    //交易方代码
+    public static final String COUNTERPARTY_CODE = "counterpartyCode";
+    //交易方名称
+    public static final String COUNTERPARTY_NAME = "counterpartyName";
+    //预录入统一编号
+    public static final String PRE_ENTRY_UNIFY_NO = "preEntryUnifyNo";
+    //业务申报表编号
+    public static final String BUSI_DECLARE_NO = "busiDeclareNo";
+    //区外企业编码
+    public static final String OUT_SIDE_FIRM_NO = "outSideFirmNo";
+    //贸易方式
+    public static final String TRADE_TYPE = "tradeType";
+    //贸易代码
+    public static final String TRADE_CODE = "tradeCode";
+    //社会信用代码
+    public static final String SOCIAL_CREDIT_CODE = "socialCreditCode";
+    //企业内部编号
+    public static final String INNER_ENTERPRISE_NO = "innerEnterpriseNo";
+    //货物流向
+    public static final String GOODS_FLOW_DIRECTION = "goodsFlowDirection";
+
+    //&
+    public static final String AND = "&";
+    //英文逗号
+    public static final String COMMA = ",";
+
+    //账册编号
+    public static final String ACCOUNT_NO = "accountNo";
+    //账册编号字典
+    public static final String ACCOUNT_NO_DICTIONARY = "ACCOUNT_NO_DICTIONARY";
+
+
+    /**单号**/
+    public static final String ORDER_NO = "orderNo";
+
+    /**业务类型**/
+    public static final String BUSI_TYPE = "busiType";
+
+    /**是否生成导出任务**/
+    public static final String IS_GENERATE_EXPORT_TASK = "isGenerateExportTask";
+
+    /**公司级别**/
+    public static final String COMPNAY_LEVEL = "compnayLevel";
+
+    /**公司级别**/
+    public static final String COMPANY_LEVEL = "companyLevel";
+
+    /**报关类型**/
+    public static final String CUSTOMS_TYPE = "customsType";
+
+    /**交货日期**/
+    public static final String DELIVERY_DATE = "deliveryDate";
+
+    /**进出卡日期**/
+    public static final String CARD_ENTRY_DATE = "cardEntryDate";
+
+    /**车牌号**/
+    public static final String CAR_NO = "carNo";
+
+    /**送货车次**/
+    public static final String TRAIN_NUMBER = "trainNumber";
+
+    /**报关状态**/
+    public static final String ORDER_STATUS = "orderStatus";
+
+    /**发票号**/
+    public static final String INVOICE_NO = "invoiceNo";
+
+    /**合同编码**/
+    public static final String CONTRACT_NO = "contractNo";
+
+    /**核放单上传状态**/
+    public static final String  UP_LOAD_STATUS ="upLoadStatus";
+
+    /**车辆进出类型**/
+    public static final String CAR_ACCESS_TYPE = "carAccessType";
+
+    /**货物进出类型**/
+    public static final String GOODS_ACCESS_TYPE = "goodsAccessType";
+
+    /**报关编号**/
+    public static final String CUSTOM_ORDER_NO = "CUSTOM_ORDER_NO";
+
+    /**报关编号**/
+    public static final String CUSTOMS_ORDER_NO_LOWER = "customsOrderNo";
+
+    //报关发票编号
+    public static final String CUSTOM_INVOICE_NO = "CUSTOM_INVOICE_NO";
+
+    /**付款方式**/
+    public static final String PAY_TYPE = "payType";
+
+    /**出港日**/
+    public static final String DEPARTURE_DAY = "departureDay";
+
+    /**SAP单号**/
+    public static final String SAP_ORDER_NO = "sapOrderNo";
+
+    public static final String QTY = "qty";
+
+    public static final String DECLARE_QTY = "declareQty";
+
+    public static final String CUST_NO = "custNo";
+
+    //分送集报申报表产品信息
+    //申报序号
+    public static final String DECLARE_SERIAL_NUMBER = "declareSerialNumber";
+    //商品名称
+    public static final String COMMODITY_NAME = "commodityName";
+    //规格型号
+    public static final String SPECIFICATIONS_MODELS = "specificationsModels";
+    //法定第二计量单位
+    public static final String LEGAL2_MEASURE_UNIT = "legal2MeasureUnit";
+    //计量单位
+    public static final String MEASURE_UNIT = "measureUnit";
+    //币制
+    public static final String CURRENCY_SYSTEM = "currencySystem";
+    //单价
+    public static final String UNIT_PRICE = "unitPrice";
+    //总价
+    public static final String TOTAL_PRICE = "totalPrice";
+    //许可证编号
+    public static final String PERMIT_NO = "permitNo";
+    //许可证有效期
+    public static final String PERMIT_VALIDITY = "permitValidity";
+    //商品标记
+    public static final String GOODS_SIGN = "goodsSign";
+    //商品备注
+    public static final String GOODS_REMARK = "goodsRemark";
+    //成品类型
+    public static final String FP_TYPE = "fpType";
+    //原产国
+    public static final String ORIGIN_COUNTRY = "ORIGIN_COUNTRY";
+    //原产国名称
+    public static final String ORIGIN_COUNTRY_NAME = "ORIGIN_COUNTRY_NAME";
+
+    //币制字典
+    public static final String CURRENCY_SYSTEM_DICTIONARY = "CURRENCY_SYSTEM_DICTIONARY";
+    //毛重
+    public static final String ROUGH_WEIGHT = "roughWeight";
+    //净重
+    public static final String NET_WEIGHT = "netWeight";
+
+    //供应商名称
+    public static final String VENDOR_NAME = "vendorName";
+    //供应商编码
+    public static final String VENDOR_NO = "vendorNo";
+
+    public static final String GOODS_TYPE = "goodsType";
+
+    //报关模式
+    public static final String CUSTOMS_MODE = "customsMode";
+
+    //申报表编号
+    public static final String RETURN_NO = "returnNo";
+
+    //对比状态
+    public static final String WHETHER_TO_COMPARE = "whetherToCompare";
+
+    //是否已生成核注清单
+    public static final String WHETHER_IT_HAS_BEEN_GENERATED = "whetherItHasBeenGenerated";
+
+    //预录入统一编号
+    public static final String PRE_INPUT_UNIFIED_NUMBER = "preInputUnifiedNumber";
+
+    //监管方式
+    public static final String PART_FINISHED_FLAG = "partFinishedFlag";
+
+    //暂存核对状态
+    public static final String TEMPORARY_HOLD_CHECK_STATUS = "temporaryHoldCheckStatus";
+
+    //进出区日期
+    public static final String INTO_AREA_DATE = "intoAreaDate";
+
+    //交易方
+    public static final String COUNTERPARTY = "counterparty";
+
+    //终审核对核对状态
+    public static final String THE_FINAL_CHECK_STATUS = "theFinalCheckStatus";
+
+    //报关类型
+    public static final String TYPE_OF_DECLARATION = "typeOfDeclaration";
+
+    //终审核注单号
+    public static final String FINAL_AUDIT_NOTE_NUMBER = "finalAuditNoteNumber";
+
+    //核注清单编号
+    public static final String LIST_NUMBER = "listNumber";
+
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/util/CdmEnumUtil.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/util/CdmEnumUtil.java
new file mode 100644
index 0000000..b038a8c
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/util/CdmEnumUtil.java
@@ -0,0 +1,1658 @@
+package cn.estsh.i3plus.pojo.cdm.util;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2018-10-23 15:53
+ * @Modify:
+ **/
+
+public class CdmEnumUtil {
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CDM_EXCEL {
+        CDM_ENUM(10, "cdmEnumExcelImportService", "字典信息"),
+        SX_CDM_ELECTRONIC_LEDGER_PRODUCT_INFO(20, "sxCdmElectronicLedgerProductInfoExcelService", "电子账册产品信息库"),
+        SX_CDM_PACKAGING_RELATIONSHIP(30, "sxCdmPackagingRelationshipExcelService", "包装关系"),
+        SX_CDM_UNIT_CONVERSION(40, "sxCdmUnitConversionExcelService", "单位换算"),
+        SX_CDM_DC_REPORT_NO_INFO(50, "sxCdmDcReportProductInfoExcelService", "分送集报申报产品信息"),
+        CDM_CUSTOMS_LOGISTICS_OUT_MASTER(60, "sxCdmEquipmentAndLogisticsOutAreaExcelService", "物流产品及设备出区报关表头导入"),
+        CDM_CUSTOMS_LOGISTICS_OUT_DETAIL(70, "sxCdmEquipmentAndLogisticsOutAreaDetailExcelService", "物流产品及设备出区报关表体导入"),
+        CDM_CUSTOM_CHECKLIST(80,"cdmCustomCheckListService","海关暂存版核注清单"),
+        SX_CDM_DC_REPORT_PRODUCT_INFO(90, "sxCdmDcReportNoInfoExcelService", "分送集报申报编号信息"),
+        CDM_LIST_OF_IMPORT_BONDED_NOTES_SERVICE(100, "cdmListOfImportBondedNotesService", "进口保税核注清单"),
+        CDM_FINAL_DECLARATION_DATA_SERVICE(110, "cdmFinalDeclarationDataService", "终审报关数据"),
+        CDM_CUSTOM_DETAIL_PART(120, "sxCdmPartCustomDetailExcelService", "部品报关详情导入");
+
+        private int value;
+        private String service;
+        private String description;
+
+        CDM_EXCEL(int value, String service, String description) {
+            this.value = value;
+            this.service = service;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getService() {
+            return this.service;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static CdmEnumUtil.CDM_EXCEL getByValue(int value) {
+            CdmEnumUtil.CDM_EXCEL[] var1 = values();
+            int var2 = var1.length;
+
+            for (int var3 = 0; var3 < var2; ++var3) {
+                CdmEnumUtil.CDM_EXCEL excel = var1[var3];
+                if (excel.getValue() == value) {
+                    return excel;
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfService(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].service;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum TRUE_OR_FALSE {
+        TRUE(1, "是"),
+        FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        private TRUE_OR_FALSE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for(int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = -1;
+
+            for(int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+    /**
+     * 文件业务类型
+     */
+    public enum FILE_MODULE_TYPE {
+        ABNORMAL(10, "异常联络单");
+
+        private int value;
+        private String description;
+
+        private FILE_MODULE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 导出状态
+     */
+    public enum EXPORT_TASK_STATUS {
+        CRATE(10, "创建"),
+        HANDLEING(20, "处理中"),
+        FINISH(30, "完成");
+
+        private int value;
+        private String description;
+
+        private EXPORT_TASK_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 成功 or 失败
+     */
+    public enum SUCCESS_OR_FAILED {
+        SUCCESS(10, "成功"),
+        FAILED(20, "失败");
+
+        private int value;
+        private String description;
+
+        private SUCCESS_OR_FAILED(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 报关单业务类型
+     */
+    public enum CUSTOMS_BUSI_TYPE {
+
+        PART_PUT(10, "部品采购报关"),
+        PART_OUT(20, "部品采购退货报关"),
+        FINISHED_SHIPPING(30, "成品发运报关"),
+        FINISHED_OVERSEAS(40, "成品海外调拨报关"),
+        CUSTOMER_RETURN(50, "客户退回报关"),
+        FINISHED_OVERSEAS_RETURN(60, "成品海外调拨退回报关"),
+        LOGISTICS_PUT(70, "物流产品进口报关"),
+        LOGISTICS_OUT(80, "物流产品出口报关"),
+        EQUIPMENT_PUT(90, "设备进区报关"),
+        EQUIPMENT_OUT(100, "设备出区报关"),
+        EMPTY_CAR_PUT(110, "空车入区报关"),
+        EMPTY_CAR_OUT(120, "空车出区报关");
+
+        private int value;
+        private String description;
+
+        CUSTOMS_BUSI_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 报关类型
+     */
+    public enum  CUSTOMS_TYPE {
+
+        CENTRALIZED_REPORT(10, "集报"),
+        NOW_OFFER(20, "现报"),
+        TAX_PAYMENT(30, "完税"),
+        UNPAID_TAX(40, "未完税");
+
+        private int value;
+        private String description;
+
+        CUSTOMS_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 公司级别
+     */
+    public enum COMPNAY_LEVEL {
+
+        HEADQUARTERS(10, "总公司"),
+        BRANCH_OFFICE(20, "分公司");
+
+        private int value;
+        private String description;
+
+        COMPNAY_LEVEL(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 材料成品标志
+     */
+    public enum GOODS_TYPE {
+
+        MATERIAL_SCIENCE(10, "料件"),
+        FINISHED_PRODUCT(20, "成品");
+
+        private int value;
+        private String description;
+
+        GOODS_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 上传状态
+     */
+    public enum UPLOAD {
+
+        NOT_UPLOADED(10, "未上传"),
+        UPLOADED(20, "已上传");
+
+        private int value;
+        private String description;
+
+        UPLOAD(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 生成状态
+     */
+    public enum GENERATE {
+
+        NOT_GENERATED(10, "未生成"),
+        GENERATED(20, "已生成");
+
+        private int value;
+        private String description;
+
+        GENERATE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 货物进出类型
+     */
+    public enum GOODS_PUT_OUT_TYPE {
+
+        FIRST_LINE_PUT(10, "一线货物入区"),
+        SECOND_LINE_PUT(20, "二线货物入区"),
+        FIRST_LINE_OUT(30, "一线货物出区"),
+        SECOND_LINE_OUT(40, "二线货物出区");
+
+        private int value;
+        private String description;
+
+        GOODS_PUT_OUT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    /**
+     * 车辆二维码入关申请
+     */
+    public enum CAR_QR_CODE_ENTRY_APPLICATION {
+
+        DELIVERY_AND_PULLING(10, "送货和拉货"),
+        DELIVERY(20, "送货"),
+        PULLING(30, "拉货");
+
+        private int value;
+        private String description;
+
+        CAR_QR_CODE_ENTRY_APPLICATION(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 车辆进出类型
+     */
+    public enum CAR_PUT_OUT_TYPE {
+
+        DELIVERY(10, "送货"),
+        SALES_RETURN(20, "退货"),
+        EMPTY_CAR_PUT(30, "空车入区"),
+        EMPTY_CAR_OUT(40, "空车出区");
+
+        private int value;
+        private String description;
+
+        CAR_PUT_OUT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 送货车次
+     */
+    public enum DELIVERY_TRAIN_NUMBER {
+
+        ONE(10, "1"),
+        TWO(20, "2"),
+        THREE(30, "3");
+
+        private int value;
+        private String description;
+
+        DELIVERY_TRAIN_NUMBER(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 运输方式（字典维护）
+     */
+//    public enum SHIPPING_TYPE {
+//
+//        WATERWAY(10, "水路运输"),
+//        HIGHWAY(20, "公路运输"),
+//        AVIATION(30, "航空运输"),
+//        OTHER(40, "其他运输");
+//
+//        private int value;
+//        private String description;
+//
+//        SHIPPING_TYPE(int value, String description) {
+//            this.value = value;
+//            this.description = description;
+//        }
+//
+//        public int getValue() {
+//            return this.value;
+//        }
+//
+//        public String getDescription() {
+//            return this.description;
+//        }
+//
+//        public static String valueOfDescription(int val) {
+//            String tmp = null;
+//
+//            for (int i = 0; i < values().length; ++i) {
+//                if (values()[i].value == val) {
+//                    tmp = values()[i].description;
+//                }
+//            }
+//
+//            return tmp;
+//        }
+//
+//        public static Integer descriptionOfValue(String description) {
+//            Integer tmp = null;
+//            for (int i = 0; i < values().length; ++i) {
+//                if (values()[i].description.equals(description)) {
+//                    tmp = values()[i].value;
+//                }
+//            }
+//            return tmp;
+//        }
+//    }
+
+    /**
+     * 原产国（字典维护）
+     */
+    public enum ORIGIN_COUNTRY {
+
+        CHINA(10, "中国"),
+        JAPAN(20, "日本");
+
+        private int value;
+        private String description;
+
+        ORIGIN_COUNTRY(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 包装类型（字典维护）
+     */
+    public enum PACKAGE_TYPE {
+
+        CARTON(10, "纸箱");
+
+        private int value;
+        private String description;
+
+        PACKAGE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 贸易类型
+     */
+    public enum TRADE_TYPE {
+
+        GENERAL_TRADE(10, "一般贸易"),
+        IMPROVEMENT_TRADE(20, "加工贸易");
+
+        private int value;
+        private String description;
+
+        TRADE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 部品货物入库报关单据类型
+     */
+    public enum CUSTOMS_PART_PUT_REF_ORDER_TYPE {
+
+        PO(10, "PO"),
+        MOVE(20, "MOVE");
+
+        private int value;
+        private String description;
+
+        CUSTOMS_PART_PUT_REF_ORDER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 部品货物入库报关单据类型
+     */
+    public enum GOODS_FLOW_DIRECTION {
+
+        ENTRANCE_REGION(10, "入区"),
+        EXIT_REGION(20, "出区");
+
+        private int value;
+        private String description;
+
+        GOODS_FLOW_DIRECTION(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    /**
+     * 集装箱类型
+     */
+    public enum CONTAINER_TYPE {
+
+        GP20(10, "20GP"),
+        GP40(20, "40GP"),
+        HQ40(30,"40HQ");
+
+        private int value;
+        private String description;
+
+        CONTAINER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    //报关状态
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum DECLARE_STATUS {
+        UNDECLARE(10, "未报关"),
+        DECLARE(20, "已报关");
+
+        private int value;
+        private String description;
+
+        DECLARE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static DECLARE_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    public static enum CDM_PART_TYPE_STR {
+        RAW_MATERIAL(10, "原材料"),
+        PARTIALLY_PREPARED_PRODUCTS(20, "半成品"),
+        FINISHED_PRODUCT(30, "成品"),
+        CONTAINER_PRODUCT(40, "容器"),
+        UTENSIL(50, "器具");
+
+        private Integer value;
+        private String description;
+
+        private CDM_PART_TYPE_STR(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for(int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String val) {
+            Integer tmp = null;
+
+            for(int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(val)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CDM_EXPORT_MODULE {
+        CDM_ENUM(10, "字典信息"),
+        CUSTOMER_SHPING(20, "110_发票"),
+        EMPTY_10(30, "10_空车出入库");
+
+        private int value;
+        private String description;
+
+        CDM_EXPORT_MODULE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static CdmEnumUtil.CDM_EXPORT_MODULE getByValue(int value) {
+            CdmEnumUtil.CDM_EXPORT_MODULE[] var1 = values();
+            int var2 = var1.length;
+
+            for (int var3 = 0; var3 < var2; ++var3) {
+                CdmEnumUtil.CDM_EXPORT_MODULE module = var1[var3];
+                if (module.getValue() == value) {
+                    return module;
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfService(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 字典
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CDM_DICTIONARY_TYPE {
+        PORT_DICTIONARY("PORT_DICTIONARY","港口"),
+        PAY_TYPE_DICTIONARY("PAY_TYPE_DICTIONARY","付款方式"),
+        PRODUCT_GROUP_DICTIONARY("PRODUCT_GROUP_DICTIONARY","产品组(物料主数据线别)"),
+        PAYMENT_DICTIONARY("PAYMENT_DICTIONARY","成交方式"),
+        MEASURE_UNIT_DICTIONARY("MEASURE_UNIT_DICTIONARY","计量单位"),
+        CURRENCY_SYSTEM_DICTIONARY("CURRENCY_SYSTEM_DICTIONARY","币制"),
+        PACKAGE_TYPE_DICTIONARY("PACKAGE_TYPE_DICTIONARY","包装类型"),
+        SHIPPING_TYPE("SHIPPING_TYPE","运输方式"),
+        ORIGIN_COUNTRY("ORIGIN_COUNTRY","原产国"),
+        SHIP_COMPNAY_DICTIONARY("SHIP_COMPNAY_DICTIONARY","船公司");
+
+
+        private String value;
+        private String description;
+
+        CDM_DICTIONARY_TYPE(String value,String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static CdmEnumUtil.CDM_DICTIONARY_TYPE getByValue(int value) {
+            CdmEnumUtil.CDM_DICTIONARY_TYPE[] var1 = values();
+            int var2 = var1.length;
+
+            for (int var3 = 0; var3 < var2; ++var3) {
+                CdmEnumUtil.CDM_DICTIONARY_TYPE module = var1[var3];
+                if (module.getValue().equals( value)) {
+                    return module;
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals( val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfService(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals( val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 核对类型
+     */
+    public enum CHECK_TYPE {
+
+        TEMP(10, "暂存核注清单"),
+        FINALLY(20, "终审核对清单");
+
+        private int value;
+        private String description;
+
+        CHECK_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 绑定类型
+     */
+    public enum BIND_TYPE {
+
+        ONE_CAR_ONE_TICKET(10, "一车一票"),
+        ONE_CAR_MULTIPLE_TICKET(20, "一车多票");
+
+        private int value;
+        private String description;
+
+        BIND_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 报关模式
+     */
+    public enum CUSTOMS_MODE {
+
+        LOGISTICS(10, "物流"),
+        EQUIPMENT(20, "设备");
+
+        private int value;
+        private String description;
+
+        CUSTOMS_MODE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 报关状态
+     */
+    public enum IS_DECLARED {
+
+        NOT_DECLARED(10, "未报关"),
+        DECLARED_ING(20, "报关中"),
+        IS_DECLARED(30, "已报关");
+
+        private int value;
+        private String description;
+
+        IS_DECLARED(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    //0 标准  2 支给  3 寄售
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum PURCHASE_CATEGORY {
+        STANDARD("0", "标准"),
+        DEFRAY("2", "支给"),
+        CONSIGNMENT("3", "寄售");
+        private String value;
+        private String description;
+
+        private PURCHASE_CATEGORY(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+    }
+
+    //暂存核对状态
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum TEMPORARY_HOLD_CHECK_STATUS{
+        CHECKED_OFF(1, "已核对"),
+        OUT_OF_CHECK(2, "未核对");
+        private Integer value;
+        private String description;
+
+        private TEMPORARY_HOLD_CHECK_STATUS(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+    }
+
+    //暂存核对是否认可
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum HOLD_FOR_CONFIRMATION{
+        HAVE_BEEN_APPROVED(1, "已认可"),
+        NOT_APPROVED(2, "未认可");
+        private Integer value;
+        private String description;
+
+        private HOLD_FOR_CONFIRMATION(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+    }
+
+    //报关类型
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum TYPE_OF_DECLARATION{
+        NOW_OFFER(10, "现报"),
+        CENTRALIZED_DECLARATION(20, "集报");
+        private Integer value;
+        private String description;
+
+        private TYPE_OF_DECLARATION(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+    }
+
+}
diff --git a/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/util/CdmNumberUtils.java b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/util/CdmNumberUtils.java
new file mode 100644
index 0000000..d006791
--- /dev/null
+++ b/modules/i3plus-pojo-cdm/src/main/java/cn/estsh/i3plus/pojo/cdm/util/CdmNumberUtils.java
@@ -0,0 +1,78 @@
+package cn.estsh.i3plus.pojo.cdm.util;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/19 12:25
+ * @Modify:
+ **/
+@SuppressWarnings("all")
+public class CdmNumberUtils {
+
+    /**
+     * 保留指定小数数据
+     * @param value
+     * @param scale
+     * @return
+     */
+    public static Double formatHalfUp(Double value, int scale) {
+        BigDecimal bd = null;
+        if(value == null) {
+            bd = new BigDecimal(0.0);
+        } else {
+            bd = new BigDecimal(value);
+        }
+        bd = bd.setScale(scale, RoundingMode.HALF_UP);
+        return bd.doubleValue();
+    }
+
+    /**
+     * 获取包装数量
+     * @param qty 数量
+     * @param pcsQty PCS数量
+     * @param ctnsBoxQty CTNS箱数量
+     * @return
+     */
+    public static Integer getPackageCount(Double qty, Double pcsQty, Double ctnsBoxQty) {
+        //包装数量
+        int packageCount =0;
+        if(qty != null && pcsQty != null && ctnsBoxQty != null) {
+            //获取一箱多少数量
+            Double boxPcsQty = pcsQty / ctnsBoxQty;
+            //一箱不够取一箱
+            if(qty % boxPcsQty>0) {
+                packageCount = Double.valueOf((qty / boxPcsQty)).intValue() + 1;
+            } else {
+                packageCount = Double.valueOf((qty / boxPcsQty)).intValue();
+            }
+        }
+        return packageCount;
+    }
+
+    /**
+     * 获取托盘数量
+     * @param qty
+     * @param pcsQty
+     * @return
+     */
+    public static Integer getPalletsCount(Double qty, Double pcsQty) {
+        int PalletsCount =0;
+        if(qty != null && pcsQty != null) {
+            //一箱不够取一箱
+            if(qty % pcsQty>0) {
+                PalletsCount = Double.valueOf((qty / pcsQty)).intValue() + 1;
+            } else {
+                PalletsCount = Double.valueOf((qty / pcsQty)).intValue();
+            }
+        }
+        return PalletsCount;
+    }
+
+    public static void main(String[] args) {
+        System.out.println(formatHalfUp(12.9563,2));
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/bean/BaseBean.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/bean/BaseBean.java
deleted file mode 100644
index 18cdf00..0000000
--- a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/bean/BaseBean.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package cn.estsh.i3plus.pojo.eam.bean;
-
-/**
- * @author ns
- * @create 2022/3/28 0028 下午 14:11
- */
-public class BaseBean {
-}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/BeanInfo.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/BeanInfo.java
new file mode 100644
index 0000000..ee7adf7
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/BeanInfo.java
@@ -0,0 +1,301 @@
+package cn.estsh.i3plus.pojo.eam.common;
+
+
+import cn.estsh.i3plus.pojo.model.wms.BasBeanFieldInfoModel;
+import cn.estsh.i3plus.pojo.model.wms.BasBeanInfoModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.Column;
+import javax.persistence.ForeignKey;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.JarURLConnection;
+import java.net.URL;
+import java.util.*;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+/**
+ * @Description :APS 实体对象的元信息
+ * 包含实体对象之间的关联关系信息。
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public class BeanInfo {
+
+
+    /**
+     * 根据数据库表实体路径扫描获取字段信息可导入数据
+     *
+     * @return
+     * @throws Exception
+     */
+    @ApiOperation("根据数据库实体对象路径扫描获取字段信息")
+    public static List<Class<?>> importEntityField() {
+        List<Class<?>> classList = loadClass("cn.estsh.i3plus.pojo.eam");
+        return classList;
+    }
+
+    /**
+     * 根据数据库表实体路径扫描获取字段信息
+     *
+     * @return
+     * @throws Exception
+     */
+    @ApiOperation("根据数据库实体对象路径扫描获取字段信息")
+    public static List<BasBeanInfoModel> globalScanDbEntityField() throws Exception {
+        List<BasBeanInfoModel> resultList = new ArrayList<>();
+        List<Class<?>> classList = loadClass("cn.estsh.i3plus.pojo.bean.master");
+
+        // 循环获取实例字段信息
+        for (Class<?> clazz : classList) {
+            String tableName = null, tableDesc = null;
+            BasBeanInfoModel beanInfoModel = new BasBeanInfoModel();
+            List<BasBeanFieldInfoModel> fieldInfoModelList = new ArrayList<>();
+            // cn.estsh.i3plus.pojo.andon.bean
+            String packageName = clazz.getPackage().getName();
+            String systemName = packageName.substring(21, packageName.indexOf(".", 21));
+
+            // 获取普通属性的@ApiParam，@Table,@ApiParam
+            Table tableField = clazz.getAnnotation(Table.class);
+            ApiModel apiAnnotation = clazz.getAnnotation(ApiModel.class);
+
+            //如果没有@Table注解则不存入数据库中
+            if (tableField == null) {
+                continue;
+            } else {
+                // 获取表名
+                tableName = tableField.name();
+            }
+
+            // 判断是否存在Table注解
+            if (apiAnnotation != null) {
+                // 实体Bean对应数据库表中文描述
+                tableDesc = apiAnnotation.value();
+            } else {
+                tableDesc = clazz.getSimpleName();
+            }
+
+            // 获得字段注解
+            for (Field field : getFiledsInfo(clazz.getName())) {
+                // 封装实体字段数据
+                packBeanFieldData(fieldInfoModelList, field, tableName, tableDesc);
+            }
+
+            // 封装数据
+            beanInfoModel.setEntityName(clazz.getSimpleName());
+            beanInfoModel.setTableName(tableName);
+            beanInfoModel.setSystemName(systemName);
+            beanInfoModel.setTableDesc(tableDesc);
+            beanInfoModel.setFieldInfoModelList(fieldInfoModelList);
+            resultList.add(beanInfoModel);
+        }
+
+        return resultList;
+    }
+
+    @ApiOperation("根据数据库实体对象路径扫描获取字段信息")
+    public static Map<String, String> globalScanDbEntityFieldMap() {
+        Map<String, String> map = new HashMap<>();
+        List<Class<?>> classList = loadClass("cn.estsh.i3plus.eam.pojo.pojo");
+
+        // 循环获取实例字段信息
+        for (Class<?> clazz : classList) {
+            String tableDesc = null;
+
+            ApiModel apiAnnotation = clazz.getAnnotation(ApiModel.class);
+            Api api = clazz.getAnnotation(Api.class);
+            // 判断是否存在Table注解
+            if (apiAnnotation != null) {
+                // 实体Bean对应数据库表中文描述
+                tableDesc = apiAnnotation.value();
+                map.put(clazz.getSimpleName(), tableDesc);
+            } else if (api != null) {
+                tableDesc = api.value();
+                map.put(clazz.getSimpleName(), tableDesc);
+            }
+
+        }
+
+        return map;
+    }
+
+    /**
+     * 加载本地服务实现
+     *
+     * @param packName
+     * @param dirPath
+     * @param clses
+     */
+    private static void loadClassImpl(String packName, String dirPath, List<Class<?>> clses) {
+        File dir = new File(dirPath);
+        if (!dir.exists() || !dir.isDirectory()) {
+            return;
+        }
+
+        File[] dirFiles = dir.listFiles(new FileFilter() {
+
+            @Override
+            public boolean accept(File file) {
+                return file.isDirectory() || file.getName().endsWith(".class");
+            }
+        });
+
+        for (File file : dirFiles) {
+            if (file.isDirectory()) {
+                loadClassImpl(packName + "." + file.getName(), dirPath + "/" + file.getName(), clses);
+            } else {
+                String clsName = file.getName();
+                clsName = clsName.substring(0, clsName.length() - 6);
+                try {
+                    clses.add(Class.forName(packName + "." + clsName));
+                } catch (ClassNotFoundException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    public static List<Class<?>> loadClass(String packName) {
+        List<Class<?>> clses = new ArrayList<>();
+        ClassLoader loader = Thread.currentThread().getContextClassLoader();
+        String strFile = packName.replaceAll("\\.", "/");
+        try {
+            Enumeration<URL> urls = loader.getResources(strFile);
+            while (urls.hasMoreElements()) {
+                URL url = urls.nextElement();
+                if (url != null) {
+                    String protocol = url.getProtocol();
+                    String filePath = url.getPath();
+                    if (protocol.equals("file")) {
+                        loadClassImpl(packName, filePath, clses);
+                    } else if (protocol.equals("jar")) {
+                        loadJarImpl(packName, url, clses);
+                    }
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return clses;
+    }
+
+    //加载Jar
+    private static void loadJarImpl(String packName, URL url, List<Class<?>> clses) throws IOException {
+        JarURLConnection jarURLConnection = (JarURLConnection) url.openConnection();
+        JarFile jarFile = jarURLConnection.getJarFile();
+        Enumeration<JarEntry> jarEntries = jarFile.entries();
+        while (jarEntries.hasMoreElements()) {
+            JarEntry jarEntry = jarEntries.nextElement();
+            final String jarEntryName = jarEntry.getName();
+            if (jarEntryName.endsWith(".class")) {
+                String clsName = jarEntryName.replace("/", ".");
+                if (clsName.startsWith(packName)) {
+                    clsName = clsName.substring(0, clsName.length() - 6);
+                    try {
+                        clses.add(Class.forName(clsName));
+                    } catch (ClassNotFoundException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
+
+    public static List<Field> getFiledsInfo(String className) throws ClassNotFoundException {
+        List<Field> list = new ArrayList<>();
+        Class<?> clazz = Class.forName(className);
+        Field[] fields = clazz.getDeclaredFields();
+        list.addAll(Arrays.asList(fields));
+//        Class<?> superClazz = clazz.getSuperclass();
+//        if (superClazz != null) {
+//            Field[] superFields = superClazz.getDeclaredFields();
+//            list.addAll(Arrays.asList(superFields));
+//        }
+        return list;
+    }
+
+
+    private static void packBeanFieldData(List<BasBeanFieldInfoModel> fieldInfoModelList, Field field, String tableName, String tableDesc) {
+        // 字段名称
+        Column fieldColumn = field.getAnnotation(Column.class);
+        // 如果字段注解为空跳过
+        if (fieldColumn == null) {
+            return;
+        }
+
+        // 主键
+        Id pkId = field.getAnnotation(Id.class);
+        String isPk = pkId == null ? "N" : "Y";
+        // 外键
+        ForeignKey foreignKey = field.getAnnotation(ForeignKey.class);
+        String isFk = foreignKey == null ? "N" : "Y";
+        // 是否是主键自增
+        GenericGenerator genericGenerator = field.getAnnotation(GenericGenerator.class);
+        String isGeneric = genericGenerator == null ? "N" : "Y";
+        // 字段名称
+        String fieldName = fieldColumn.name();
+        // 字段描述
+        ApiParam fieldApiParam = field.getAnnotation(ApiParam.class);
+        String fieldDesc = fieldApiParam != null ? fieldApiParam.value() : fieldName;
+        // 字段类型
+        String fieldType = field.getGenericType().getTypeName();
+        // 字段是否允许为空
+        String fieldIsNull = fieldColumn.nullable() == false ? "N" : "Y";
+        // 唯一约束
+        String fieldIsUnique = fieldColumn.unique() == false ? "N" : "Y";
+
+        // 封装字段信息
+        BasBeanFieldInfoModel beanFieldInfoModel = new BasBeanFieldInfoModel();
+        beanFieldInfoModel.setTableName(tableName);
+        beanFieldInfoModel.setFieldName(field.getName());
+        beanFieldInfoModel.setFieldDesc(fieldDesc);
+        beanFieldInfoModel.setFieldType(getDbFieldTypeByJavaFieldType(fieldType));
+        beanFieldInfoModel.setIsFieldForeignKey(isFk);
+        beanFieldInfoModel.setIsFieldNull(fieldIsNull);
+        beanFieldInfoModel.setIsFieldPrimaryKey(isPk);
+        beanFieldInfoModel.setIsFieldUnique(fieldIsUnique);
+        beanFieldInfoModel.setIsFieldGeneric(isGeneric);
+        beanFieldInfoModel.setTableDesc(tableDesc);
+        fieldInfoModelList.add(beanFieldInfoModel);
+    }
+
+    private static String getDbFieldTypeByJavaFieldType(String fieldType) {
+        String dbFieldType = null;
+
+        if (StringUtils.equalsIgnoreCase(fieldType, "java.lang.String")) {
+            dbFieldType = "VARCHAR(255)";
+        } else if (StringUtils.equalsIgnoreCase(fieldType, "java.lang.Double") || StringUtils.equalsIgnoreCase(fieldType, "Float")) {
+            dbFieldType = "DECIMAL(18, 3)";
+        } else if (StringUtils.equalsIgnoreCase(fieldType, "java.lang.Integer")) {
+            dbFieldType = "INTEGER";
+        } else if (StringUtils.equalsIgnoreCase(fieldType, "java.lang.Long")) {
+            dbFieldType = "BIGINT";
+        } else if (StringUtils.equalsIgnoreCase(fieldType, "byte[]")) {
+            dbFieldType = "VARBINARY";
+        } else if (StringUtils.equalsIgnoreCase(fieldType, "java.sql.Date")) {
+            dbFieldType = "DATE";
+        } else if (StringUtils.equalsIgnoreCase(fieldType, "java.sql.Timestamp")) {
+            dbFieldType = "TIMESTAMP";
+        } else if (StringUtils.equalsIgnoreCase(fieldType, "java.sql.Blob")) {
+            dbFieldType = "BLOB";
+        } else if (StringUtils.equalsIgnoreCase(fieldType, "java.sql.Clob")) {
+            dbFieldType = "CLOB";
+        } else if (StringUtils.equalsIgnoreCase(fieldType, "java.math.BigDecimal")) {
+            dbFieldType = "NUMERIC";
+        }
+
+        return dbFieldType;
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/COMMON_EDIT_TYPE.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/COMMON_EDIT_TYPE.java
new file mode 100644
index 0000000..85a9d44
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/COMMON_EDIT_TYPE.java
@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.eam.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * @author Jason
+ * @ClassName: COMMON_EDIT_TYPE
+ * @Description: 前端的字段编辑类型
+ * @date 2022-04-12
+ */
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+public enum COMMON_EDIT_TYPE {
+    NONE("NONE", "未知", 0),
+    BOOLEAN("BOOLEAN", "布尔, 开关编辑", 1),
+    CHAR("CHAR", "字符, 文本框编辑", 2),
+    SHORT("SHORT", "短整型, 数字编辑", 3),
+    INTEGER("INTEGER", "整型, 数字编辑", 4),
+    LONG("LONG", "长整型, 数字编辑", 5),
+    DOUBLE("DOUBLE", "浮点型, 文本框编辑", 6),
+    DATE("DATE", "日期类型(2019-09-16)", 7),
+    TIME("TIME", "时间类型(17:35:30)", 8),
+    DATE_TIME("DATE_TIME", "日期时间类型(2019-09-16 17:35:30)", 9),
+    DURATION("DURATION", "时间段(1H),文本框编辑", 10),
+    ENUM("ENUM", "枚举,下拉选择", 11),
+    MULTI_ENUM("MULTI_ENUM", "多选枚举， 下拉多选", 12),
+    STRING("STRING", "字符串，文本框编辑", 13),
+    OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值", 14),
+    LIST("LIST", "对象集合，不可编辑。", 15),
+    MULTI_OBJECT("MULTI_OBJECT", "多选对象，弹出框选择，可以选择全部对象，以*表示选择全部", 16),
+    QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项", 17),
+    COLOR_PICKER("COLOR_PICKER", "颜色选择框", 18),
+    DYNAMIC_ENUM("DYNAMIC_ENUM", "自定义枚举", 19),
+    ;
+
+    private final String value;
+    private final String description;
+    private final Integer index;
+
+    private COMMON_EDIT_TYPE(String value, String description, Integer index) {
+        this.value = value;
+        this.description = description;
+        this.index = index;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/COMMON_FIELD_TYPE.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/COMMON_FIELD_TYPE.java
new file mode 100644
index 0000000..f04a5b8
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/COMMON_FIELD_TYPE.java
@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.eam.common;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * @author Jason
+ * @ClassName: COMMON_FIELD_TYPE
+ * @Description: TODO(这里用一句话描述这个类的作用)
+ * @date 2022-03-22
+ */
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+public enum COMMON_FIELD_TYPE {
+    NONE("NONE", "未知"),
+    BOOLEAN("BOOLEAN", "布尔"),
+    CHAR("CHAR", "字符"),
+    SHORT("SHORT", "短整型"),
+    INTEGER("INTEGER", "整型"),
+    LONG("LONG", "长整型"),
+    DOUBLE("DOUBLE", "浮点型"),
+    DATE("DATE", "日期类型(2019-09-16)"),
+    TIME("TIME", "时间类型(17:35:30)"),
+    DATE_TIME("DATE_TIME", "日期时间类型(2019-09-16 17:35:30)"),
+    DURATION("DURATION", "时间段(1H)"),
+    ENUM("ENUM", "枚举"),
+    MULTI_ENUM("MULTI_ENUM", "多选枚举"),
+    DYNAMIC_ENUM("DYNAMIC_ENUM", "自定义枚举"),
+    STRING("STRING", "字符串"),
+    OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值"),
+    LIST("LIST", "对象集合，不可编辑。");
+
+    private final String value;
+    private final String description;
+
+    private COMMON_FIELD_TYPE(String value, String description) {
+        this.value = value;
+        this.description = description;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/CommonBean.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/CommonBean.java
new file mode 100644
index 0000000..d4d1fc5
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/CommonBean.java
@@ -0,0 +1,100 @@
+package cn.estsh.i3plus.pojo.eam.common;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Transient;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Jason
+ * @ClassName: CommonBean
+ * @Description: 通用实体类的基类
+ * @date 2022-03-22
+ */
+@Data
+@MappedSuperclass
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+public class CommonBean extends BaseBean {
+
+    @Convert(converter = HashMapConverter.class)
+    @FieldAnnotation(property = false)
+    @Column(name = "CUSTOM_FIELDS",columnDefinition="nvarchar(max)")
+    private Map<String, Object> customFields = new HashMap<>();
+
+    @ApiParam(value = "主键值")
+    @FieldAnnotation(display = false, isShow = false)
+    @Transient
+    private String key;
+
+    @FieldAnnotation(property = false)
+    private transient Long updateId = 0L;
+
+    public CommonBean() {
+    }
+
+    public Object getCustomField(String code) {
+        return getCustomFields().get(code);
+    }
+
+    public void setCustomField(String code, Object value) {
+        getCustomFields().put(code, value);
+    }
+
+    public String getCustomString(String code) {
+        Object value = getCustomFields().get(code);
+        if (value == null) {
+            return "";
+        }
+        return value.toString();
+    }
+
+    public Integer getCustomInteger(String code) {
+        Object value = getCustomFields().get(code);
+        if (value == null) {
+            return null;
+        }
+
+        if (value.getClass() == String.class) {
+            return Integer.valueOf((String) value);
+        } else if (value.getClass() == Integer.class) {
+            return (Integer) value;
+        }
+        return null;
+    }
+
+    public Double getCustomDouble(String code) {
+        Object value = getCustomFields().get(code);
+        if (value == null) {
+            return null;
+        }
+
+        if (value.getClass() == String.class) {
+            return Double.valueOf((String) value);
+        } else if (value.getClass() == Double.class) {
+            return (Double) value;
+        }
+        return null;
+    }
+
+    public Boolean getCustomBoolean(String code) {
+        Object value = getCustomFields().get(code);
+        if (value == null) {
+            return null;
+        }
+
+        if (value.getClass() == Boolean.class) {
+            return (Boolean) value;
+        } else if (value.getClass() == Integer.class) {
+            return (Integer) value == 1;
+        }
+        return null;
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/CommonBeanUtil.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/CommonBeanUtil.java
new file mode 100644
index 0000000..59a2dcb
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/CommonBeanUtil.java
@@ -0,0 +1,86 @@
+package cn.estsh.i3plus.pojo.eam.common;
+
+import java.util.Date;
+
+public class CommonBeanUtil {
+
+    public static byte value(Byte arg) {
+        return arg != null ? arg : 0;
+    }
+
+    public static byte value(Byte arg, byte def) {
+        return arg != null ? arg : def;
+    }
+
+    public static boolean value(Boolean arg) {
+        return arg != null ? arg : false;
+    }
+
+    public static boolean value(Boolean arg, boolean def) {
+        return arg != null ? arg : def;
+    }
+
+    public static short value(Short arg) {
+        return arg != null ? arg : 0;
+    }
+
+    public static short value(Short arg, short def) {
+        return arg != null ? arg : def;
+    }
+
+    public static int value(Integer arg) {
+        return arg != null ? arg : 0;
+    }
+
+    public static int value(Integer arg, int def) {
+        return arg != null ? arg : def;
+    }
+
+    public static long value(Long arg) {
+        return arg != null ? arg : 0;
+    }
+
+    public static long value(Long arg, long def) {
+        return arg != null ? arg : def;
+    }
+
+    public static float value(Float arg) {
+        return arg != null ? arg : 0.0f;
+    }
+
+    public static float value(Float arg, float def) {
+        return arg != null ? arg : def;
+    }
+
+    public static double value(Double arg) {
+        return arg != null ? arg : 0.0f;
+    }
+
+    public static double value(Double arg, double def) {
+        return arg != null ? arg : def;
+    }
+
+    public static char value(Character arg) {
+        return arg != null ? arg : 0;
+    }
+
+    public static char value(Character arg, char def) {
+        return arg != null ? arg : def;
+    }
+
+    public static String value(String arg) {
+        return arg != null ? arg : "";
+    }
+
+    public static String value(String arg, String def) {
+        return arg != null ? arg : def;
+    }
+
+    public static Date value(Date arg) {
+        return arg != null ? arg : new Date(0);
+    }
+
+    public static long value(Date arg, long def) {
+        return arg != null ? arg.getTime() : def;
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/CommonEnumUtil.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/CommonEnumUtil.java
new file mode 100644
index 0000000..21d0615
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/CommonEnumUtil.java
@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.eam.common;
+
+public class CommonEnumUtil {
+
+    public enum COMMON_FILE_TYPE {
+        JPG("JPG", "JPG图片"),
+        PDF("PDF", "PDF文件");
+
+        private final String value;
+        private final String description;
+
+        COMMON_FILE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/DateTimeTool.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/DateTimeTool.java
new file mode 100644
index 0000000..efbd4f7
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/DateTimeTool.java
@@ -0,0 +1,7 @@
+package cn.estsh.i3plus.pojo.eam.common;
+
+public class DateTimeTool {
+    public static final String DATETIME_FORMATOR = "yyyy-MM-dd HH:mm:ss";
+    public static final String DATE_FORMATOR = "yyyy-MM-dd";
+    public static final String TIME_FORMATOR = "HH:mm:ss";
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/FieldInfoDao.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/FieldInfoDao.java
new file mode 100644
index 0000000..b304ba2
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/FieldInfoDao.java
@@ -0,0 +1,625 @@
+package cn.estsh.i3plus.pojo.eam.common;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.common.pojo.DynamicEnum;
+import cn.estsh.i3plus.pojo.eam.common.pojo.FieldInfo;
+import cn.estsh.i3plus.pojo.eam.common.pojo.GridField;
+import cn.estsh.i3plus.pojo.eam.repository.DynamicEnumRepoitory;
+import cn.estsh.i3plus.pojo.eam.repository.FieldInfoRepository;
+import cn.estsh.i3plus.pojo.eam.repository.GridFieldRepository;
+import cn.estsh.i3plus.pojo.eam.util.EnumUtil;
+import cn.estsh.i3plus.pojo.wms.sqlpack.WmsHqlPack;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.sql.Timestamp;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author Jason
+ * @ClassName: FieldInfoDao
+ * @Description: 字段的访问层
+ * @date 2022-03-22
+ */
+@Component
+public class FieldInfoDao {
+    private static final Logger LOG = LoggerFactory.getLogger(FieldInfoDao.class);
+    @Autowired
+    private FieldInfoRepository repository;
+    @Autowired
+    private GridFieldRepository gridFieldRepository;
+    @Autowired
+    private SnowflakeIdMaker snowflakeIdMaker;
+    @Autowired
+    private DynamicEnumRepoitory eamEnumRepoitory;
+
+    public FieldInfo create() {
+        FieldInfo bean = new FieldInfo();
+        bean.setId(snowflakeIdMaker.nextId());
+        bean.setIsValid(CommonEnumUtil.VALID);
+        bean.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
+        return bean;
+    }
+
+    public Map<String, FieldInfo> getDefaultFieldInfos(Class<? extends CommonBean> cls) {
+        List<FieldInfo> infos = new ArrayList<>();
+        try {
+            getInnerFieldInfosImpl(infos, cls, cls, 0);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return infos.stream().collect(Collectors.toMap(FieldInfo::getCode, info -> info));
+    }
+
+    private FieldInfo getDefaultFieldByCode(Class<? extends CommonBean> cls, String code) {
+        return getDefaultFieldInfos(cls).get(code);
+    }
+
+    public FieldInfo getDefaultFieldByName(Class<? extends CommonBean> cls, String name) {
+        Map<String, FieldInfo> fieldInfos = getDefaultFieldInfos(cls);
+        for (Map.Entry<String, FieldInfo> entry : fieldInfos.entrySet()) {
+            FieldInfo info = entry.getValue();
+            if (StringUtils.isEmpty(info.getName())) {
+                continue;
+            }
+            if (info.getName().equals(name)) {
+                return info;
+            }
+        }
+
+        return null;
+    }
+
+    private void getInnerFieldInfosImpl(List<FieldInfo> infos, Class<? extends BaseBean> cls, Class<? extends BaseBean> originCls, int orderNumber) throws Exception {
+        if (cls == null) {
+            return;
+        }
+
+        boolean defDisplay = true;
+        boolean defShow = true;
+        if (cls == CommonBean.class || cls == BaseBean.class) {
+            defDisplay = false;
+            defShow = false;
+        }
+
+        Field[] fields = cls.getDeclaredFields();
+        for (Field field : fields) {
+            if (Modifier.isTransient(field.getModifiers()) && !field.getName().equals("ascOrDesc")) {
+                continue;
+            }
+            if (Modifier.isStatic(field.getModifiers())) {
+                continue;
+            }
+
+            Class<?> typeClass = null;
+            OneToMany oneToMany = field.getAnnotation(OneToMany.class);
+            if (oneToMany != null) {
+                typeClass = oneToMany.targetEntity();
+            }
+            ManyToMany manyToMany = field.getAnnotation(ManyToMany.class);
+            if (manyToMany != null) {
+                typeClass = manyToMany.targetEntity();
+            }
+
+            FieldAnnotation annotation = field.getAnnotation(FieldAnnotation.class);
+            if (annotation != null) {
+                if (!annotation.property()) {
+                    continue;
+                }
+            }
+
+            FieldInfo info = create();
+            info.setCode(field.getName());
+            ApiParam apiParam = field.getAnnotation(ApiParam.class);
+            if (apiParam != null) {
+                info.setName(apiParam.name());
+            } else {
+                ApiModelProperty apiProperty = field.getAnnotation(ApiModelProperty.class);
+                if (apiProperty != null) {
+                    info.setName(apiProperty.name());
+                } else {
+                    info.setName(field.getName());
+                }
+            }
+            info.setCustomize(false);
+            info.setClassName(originCls.getSimpleName());
+            info.setClazz(originCls);
+            if (info.getCode().equals("createDatetime") || info.getCode().equals("modifyDatetime")) {
+                info.setTypeClass(Date.class);
+            } else {
+                info.setTypeClass(typeClass != null ? typeClass : field.getType());
+            }
+            if (typeClass != null) {
+                info.setType(COMMON_FIELD_TYPE.LIST);
+            } else {
+                info.setType(getFieldType(info.getTypeClass()));
+            }
+            info.setTypeName(info.getTypeClass().getSimpleName());
+            info.setTypeFullName(info.getTypeClass().getName());
+            info.setOrderNumber(orderNumber++);
+
+            if (annotation != null) {
+                info.setModify(annotation.modify());
+                info.setDisplay(annotation.display());
+                info.setIsShow(annotation.isShow());
+                info.setPric(annotation.pric());
+                info.setMainKey(annotation.mainkey());
+                info.setDefaultValue(annotation.defaultValue());
+                info.setReadFunction(annotation.readFunction());
+                info.setPopSearch(annotation.popSearch());
+                info.setPopCondition(annotation.popCondition());
+                info.setEditType(annotation.editType());
+                info.setNotEmpty(annotation.notEmpty());
+                info.setIsWhereSelect(annotation.isWhereSelect());
+                info.setIsUpdate(annotation.isUpdate());
+
+                info.setDynamicCalculate(annotation.dynamicCalculate());
+                if (!StringUtil.isEmpty(annotation.typeName())) {
+                    info.setTypeName(annotation.typeName());
+                    if (ServiceInfo.getBeanClass(annotation.typeName()) == null) {  // 为页面自定义枚举
+                        info.setType(COMMON_FIELD_TYPE.DYNAMIC_ENUM);
+                        info.setEditType(COMMON_EDIT_TYPE.ENUM);
+                    }
+                }
+                if (info.getEditType() != null && info.getEditType() == COMMON_EDIT_TYPE.DURATION) {
+                    info.setType(COMMON_FIELD_TYPE.DURATION);
+                }
+                if (annotation.multiEnumClass() != Object.class) {
+                    info.setTypeClass(annotation.multiEnumClass());
+                    info.setType(COMMON_FIELD_TYPE.MULTI_ENUM);
+                    info.setEditType(COMMON_EDIT_TYPE.MULTI_ENUM);
+                    info.setTypeName(info.getTypeClass().getSimpleName());
+                    info.setTypeFullName(info.getTypeClass().getName());
+                }
+                if (annotation.mainkey()) {
+                    info.setNotEmpty(true);
+                    info.setIsWhereSelect(true);
+                    info.setIsUpdate(true);
+                }
+            } else {
+                info.setModify(defDisplay || info.getCode().equals("isValid"));
+                info.setDisplay(defDisplay);
+                info.setIsShow(defShow);
+                info.setMainKey(false);
+                info.setIsUpdate(true);
+                info.setDefaultValue("");
+                info.setReadFunction("");
+                info.setExcelExportVal("");
+                info.setPopSearch(false);
+                info.setPopCondition(false);
+                info.setNotEmpty(false);
+                info.setIsWhereSelect(false);
+                info.setIsUpdate(false);
+                info.setDynamicCalculate(false);
+            }
+
+            try {
+                info.setGetMethod(cls.getMethod("get" + StringUtils.capitalize(info.getCode())));
+            } catch (Exception ignored) {
+            }
+            try {
+                info.setSetMethod(cls.getMethod("set" + StringUtils.capitalize(info.getCode()), field.getType()));
+            } catch (Exception ignored) {
+            }
+
+            if (info.getGetMethod() == null) {
+                throw new NoSuchMethodException(cls.getName() + "`s filed " + info.getCode() + " has not get method");
+            }
+            if (info.getSetMethod() == null) {
+                throw new NoSuchMethodException(cls.getName() + "`s filed " + info.getCode() + " has not set method");
+            }
+
+            infos.add(info);
+        }
+
+        Class<?> supperClass = cls.getSuperclass();
+        if (BaseBean.class.isAssignableFrom(supperClass)) {
+            getInnerFieldInfosImpl(infos, (Class<BaseBean>) cls.getSuperclass(), originCls, orderNumber);
+        }
+    }
+
+    private static COMMON_FIELD_TYPE getFieldType(Class<?> cls) {
+        COMMON_FIELD_TYPE type = null;
+        if (cls == Boolean.class || cls == boolean.class) {
+            type = COMMON_FIELD_TYPE.BOOLEAN;
+        } else if (cls == Character.class) {
+            type = COMMON_FIELD_TYPE.CHAR;
+        } else if (cls == Short.class || cls == short.class) {
+            type = COMMON_FIELD_TYPE.SHORT;
+        } else if (cls == Integer.class || cls == int.class) {
+            type = COMMON_FIELD_TYPE.INTEGER;
+        } else if (cls == Long.class || cls == long.class) {
+            type = COMMON_FIELD_TYPE.LONG;
+        } else if (cls == Double.class || cls == Float.class ||
+                cls == double.class || cls == float.class) {
+            type = COMMON_FIELD_TYPE.DOUBLE;
+        } else if (cls == String.class) {
+            type = COMMON_FIELD_TYPE.STRING;
+        } else if (cls == Date.class || cls == java.sql.Date.class || cls == Timestamp.class) {
+            type = COMMON_FIELD_TYPE.DATE_TIME;
+        } else if (Enum.class.isAssignableFrom(cls)) {
+            type = COMMON_FIELD_TYPE.ENUM;
+        } else if (CommonBean.class.isAssignableFrom(cls)) {
+            type = COMMON_FIELD_TYPE.OBJECT;
+        } else if (List.class.isAssignableFrom(cls)) {
+            type = COMMON_FIELD_TYPE.LIST;
+        }
+        return type;
+    }
+
+    public static Class<?> getFieldClass(COMMON_FIELD_TYPE type) {
+        Class<?> cls = null;
+        switch (type) {
+            case BOOLEAN:
+                cls = Boolean.class;
+                break;
+            case CHAR:
+                cls = Character.class;
+                break;
+            case SHORT:
+                cls = Short.class;
+                break;
+            case INTEGER:
+                cls = Integer.class;
+                break;
+            case LONG:
+                cls = Long.class;
+                break;
+            case DOUBLE:
+                cls = Double.class;
+                break;
+            case DATE:
+            case TIME:
+            case DATE_TIME:
+                cls = Date.class;
+                break;
+            case DYNAMIC_ENUM:
+            case STRING:
+                cls = String.class;
+                break;
+            default:
+                break;
+        }
+
+        return cls;
+    }
+
+    public FieldInfo getById(Long id) {
+        return repository.getById(id);
+    }
+
+    private void insertImpl(FieldInfo info) {
+        if ((info.getType() == null || info.getType() == COMMON_FIELD_TYPE.NONE)) {
+            info.setType(COMMON_FIELD_TYPE.STRING);
+            info.setModify(false);
+            info.setDisplay(true);
+            info.setIsShow(true);
+        }
+        if (info.getClazz() == null) {
+            info.setClazz(ServiceInfo.getBeanClass(info.getClassName()));
+        }
+
+        Class<?> typeClass = getFieldClass(info.getType());
+        if (typeClass == null) {
+            if (!StringUtil.isEmpty(info.getTypeFullName())) {
+                try {
+                    typeClass = Class.forName(info.getTypeFullName());
+                } catch (ClassNotFoundException e) {
+                    LOG.error("获取类型的Class失败：" + info.getTypeFullName(), e);
+                }
+            } else if (!StringUtil.isEmpty(info.getTypeName())) {
+                typeClass = ServiceInfo.getBeanClass(info.getTypeName());
+            } else {
+                LOG.error("无效字段类型：" + info.getName());
+                return;
+            }
+            if (typeClass == null) {
+                return;
+            }
+        }
+        info.setTypeClass(typeClass);
+        if (StringUtils.isEmpty(info.getTypeName())) {
+            info.setTypeName(typeClass.getSimpleName());
+        }
+        info.setTypeFullName(typeClass.getName());
+
+        if (info.getPopSearch() == null) {
+            info.setPopSearch(false);
+        }
+        if (info.getPopCondition() == null) {
+            info.setPopCondition(false);
+        }
+
+        try {
+            if (info.getGetMethod() == null) {
+                if (info.getCustomize()) {
+                    info.setGetMethod(info.getClazz().getMethod("getCustomField", String.class));
+                } else {
+                    info.setGetMethod(info.getClazz().getMethod("get" + StringUtils.capitalize(info.getCode())));
+                }
+            }
+            if (info.getSetMethod() == null) {
+                if (info.getCustomize()) {
+                    info.setSetMethod(info.getClazz().getMethod("setCustomField", String.class, Object.class));
+                } else if (info.getType() == COMMON_FIELD_TYPE.MULTI_ENUM) {
+                    info.setSetMethod(info.getClazz().getMethod("set" + StringUtils.capitalize(info.getCode()), Integer.class));
+                } else if (info.getType() == COMMON_FIELD_TYPE.DURATION) {
+                    try {
+                        info.setSetMethod(info.getClazz().getMethod("set" + StringUtils.capitalize(info.getCode()), String.class));
+                    } catch (NoSuchMethodException ex) {
+                        info.setSetMethod(info.getClazz().getMethod("set" + StringUtils.capitalize(info.getCode()), Integer.class));
+                    }
+                } else if (info.getCode().equals("createDatetime") || info.getCode().equals("modifyDatetime")) {
+                    info.setSetMethod(info.getClazz().getMethod("set" + StringUtils.capitalize(info.getCode()), String.class));
+                } else {
+                    info.setSetMethod(info.getClazz().getMethod("set" + StringUtils.capitalize(info.getCode()), info.getTypeClass()));
+                }
+            }
+        } catch (Exception ignored) {
+        }
+    }
+
+    public long insert(FieldInfo item) {
+        insertImpl(item);
+        repository.save(item);
+        return item.getId();
+    }
+
+    public void insert(Iterable<FieldInfo> items) {
+        for (FieldInfo item : items) {
+            insertImpl(item);
+        }
+        repository.saveAll(items);
+    }
+
+    private void updateImpl(FieldInfo item) {
+        Class<?> typeClass = getFieldClass(item.getType());
+        if (typeClass == null) {
+            if (!StringUtil.isEmpty(item.getTypeFullName())) {
+                try {
+                    typeClass = Class.forName(item.getTypeFullName());
+                } catch (ClassNotFoundException e) {
+                    LOG.error("获取类型的Class失败：" + item.getTypeFullName(), e);
+                }
+            } else if (!StringUtil.isEmpty(item.getTypeName())) {
+                typeClass = ServiceInfo.getBeanClass(item.getTypeName());
+            } else {
+                LOG.error("无效字段类型：" + item.getName());
+                return;
+            }
+            if (typeClass == null) {
+                return;
+            }
+        }
+        item.setTypeClass(typeClass);
+        if (StringUtils.isEmpty(item.getTypeName())) {
+            item.setTypeName(typeClass.getSimpleName());
+        }
+        item.setTypeFullName(typeClass.getName());
+    }
+
+    public void update(FieldInfo item) {
+        updateImpl(item);
+        repository.save(item);
+    }
+
+    public void update(Iterable<FieldInfo> items) {
+        for (FieldInfo item : items) {
+            updateImpl(item);
+        }
+        repository.saveAll(items);
+    }
+
+    public void delete(FieldInfo item) {
+        repository.delete(item);
+    }
+
+    public void delete(Iterable<FieldInfo> items) {
+        repository.deleteAll(items);
+    }
+
+    public void deleteById(Long id) {
+        repository.deleteById(id);
+    }
+
+    public int deleteByIds(Long[] ids) {
+        return repository.deleteByIds(ids);
+    }
+
+    private List<FieldInfo> getByBeanClass(Class<? extends CommonBean> cls) {
+        FieldInfo fieldInfo = new FieldInfo();
+        fieldInfo.setClassName(cls.getSimpleName());
+        fieldInfo.setOrganizeCode("");
+        fieldInfo.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
+        fieldInfo.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
+
+        DdlPackBean hqlInfo = DdlPackBean.getDdlPackBean(ServiceInfo.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(fieldInfo.getClassName(), "className", hqlInfo);
+        WmsHqlPack.getStringBuilderPack(fieldInfo, hqlInfo);
+
+        List<FieldInfo> fieldInfos = repository.findByHqlWhere(hqlInfo);
+        Map<String, FieldInfo> defaultFields = getDefaultFieldInfos(cls);
+        for (FieldInfo info : fieldInfos) {
+            insertImpl(info);
+            defaultFields.remove(info.getCode());
+        }
+        fieldInfos.addAll(defaultFields.values());
+        return fieldInfos;
+    }
+
+    private FieldInfo getByFieldCode(Class<? extends CommonBean> cls, String code) {
+        FieldInfo fieldInfo = new FieldInfo();
+        fieldInfo.setClassName(cls.getSimpleName());
+        fieldInfo.setCode(code);
+        fieldInfo.setOrganizeCode("");
+        fieldInfo.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
+        fieldInfo.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
+
+        DdlPackBean hqlInfo = DdlPackBean.getDdlPackBean(ServiceInfo.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(fieldInfo.getClassName(), "className", hqlInfo);
+        DdlPreparedPack.getStringEqualPack(fieldInfo.getCode(), "code", hqlInfo);
+        WmsHqlPack.getStringBuilderPack(fieldInfo, hqlInfo);
+
+        FieldInfo info = repository.getByProperty(hqlInfo);
+        if (info != null) {
+            insertImpl(info);
+            return info;
+        }
+        return getDefaultFieldByCode(cls, code);
+    }
+
+    public FieldInfo getByFieldName(Class<? extends CommonBean> cls, String name) {
+        FieldInfo fieldInfo = new FieldInfo();
+        fieldInfo.setClassName(cls.getSimpleName());
+        fieldInfo.setName(name);
+        fieldInfo.setOrganizeCode("");
+        fieldInfo.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
+        fieldInfo.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
+
+        DdlPackBean hqlInfo = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(fieldInfo.getClassName(), "className", hqlInfo);
+        DdlPreparedPack.getStringEqualPack(fieldInfo.getName(), "name", hqlInfo);
+        WmsHqlPack.getStringBuilderPack(fieldInfo, hqlInfo);
+        GridField gridField = gridFieldRepository.getByProperty(hqlInfo);
+
+        FieldInfo info = null;
+        if (!Objects.isNull(gridField)) {
+            DdlPackBean hqlInfoNew = new DdlPackBean();
+            DdlPreparedPack.getStringEqualPack(gridField.getClassName(), "className", hqlInfoNew);
+            DdlPreparedPack.getStringEqualPack(gridField.getCode(), "code", hqlInfoNew);
+            info = repository.getByProperty(hqlInfoNew);
+            if (!Objects.isNull(info)) {
+                info.setName(fieldInfo.getName());
+            }
+
+        }
+        if (Objects.isNull(info)) {
+            info = repository.getByProperty(hqlInfo);
+        }
+        if (info != null) {
+            insertImpl(info);
+        }
+        return info != null ? info : getDefaultFieldByName(cls, name);
+    }
+
+    public List<FieldInfo> list(Class<? extends CommonBean> cls) {
+        List<FieldInfo> result = new LinkedList<>();
+        List<FieldInfo> fieldInfos = getByBeanClass(cls);
+        DdlPackBean hqlInfo = DdlPackBean.getDdlPackBean(ServiceInfo.getOrganizeCode());
+        List<DynamicEnum> eamEnums = eamEnumRepoitory.findByHqlWhere(hqlInfo);
+        for (FieldInfo fieldInfo : fieldInfos) {
+            setEnumItems(fieldInfo, eamEnums);
+            result.add(fieldInfo);
+        }
+        result.sort((o1, o2) -> {
+            if (o1.getOrderNumber() == null) {
+                if (o2.getOrderNumber() == null) {
+                    return o1.getCode().compareTo(o2.getCode());
+                } else {
+                    return 1;
+                }
+            } else if (o2.getOrderNumber() == null) {
+                return -1;
+            }
+            return o1.getOrderNumber() - o2.getOrderNumber();
+        });
+
+        return result;
+    }
+
+    public FieldInfo get(Class<? extends CommonBean> cls, String code) {
+        FieldInfo fieldInfo = getByFieldCode(cls, code);
+        if (fieldInfo != null) {
+            setEnumItems(fieldInfo, null);
+        }
+        return fieldInfo;
+    }
+
+    public List<FieldInfo> listMainKeys(Class<? extends CommonBean> cls, List<FieldInfo> fieldInfos) {
+        List<FieldInfo> result = new ArrayList<>();
+        if (CollectionUtils.isEmpty(fieldInfos)) {
+            fieldInfos = getByBeanClass(cls);
+        }
+        FieldInfo idField = null;
+        for (FieldInfo fieldInfo : fieldInfos) {
+            if (fieldInfo.getMainKey() != null && fieldInfo.getMainKey()) {
+                setEnumItems(fieldInfo, null);
+                result.add(fieldInfo);
+            }
+
+            if (fieldInfo.getCode().equals("id")) {
+                idField = fieldInfo;
+            }
+        }
+        if (result.isEmpty()) {
+            if (idField == null) {
+                idField = getByFieldCode(cls, "id");
+            }
+            result.add(idField);
+        }
+        return result;
+    }
+
+    public FieldInfo getByName(Class<? extends CommonBean> cls, String name) {
+        FieldInfo fieldInfo = getByFieldName(cls, name);
+        if (fieldInfo != null) {
+            setEnumItems(fieldInfo, null);
+        }
+        return fieldInfo;
+    }
+
+    private void setEnumItems(FieldInfo fieldInfo, List<DynamicEnum> eamEnums) {
+        if (fieldInfo.getType() == COMMON_FIELD_TYPE.ENUM || fieldInfo.getType() == COMMON_FIELD_TYPE.MULTI_ENUM) {
+            fieldInfo.setEnumItems(EnumUtil.convertEnumConstants((Class<? extends Enum<?>>) fieldInfo.getTypeClass()));
+        } else if (fieldInfo.getType() == COMMON_FIELD_TYPE.DYNAMIC_ENUM) {
+            fieldInfo.setEnumItems(getDynamicEnums(fieldInfo.getTypeName(), eamEnums));
+        }
+    }
+
+    private List<Map<String, Object>> getDynamicEnums(String typeName, List<DynamicEnum> eamEnums) {
+        List<Map<String, Object>> result = new ArrayList<>();
+        DynamicEnum model = new DynamicEnum();
+        model.setEnumType(typeName);
+        model.setOrganizeCode(ServiceInfo.getOrganizeCode());
+        model.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
+        model.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
+        if (CollectionUtils.isEmpty(eamEnums)) {
+            DdlPackBean hqlInfo = DdlPackBean.getDdlPackBean(ServiceInfo.getOrganizeCode());
+            DdlPreparedPack.getStringEqualPack(model.getEnumType(), "enumType", hqlInfo);
+            WmsHqlPack.getStringBuilderPack(model, hqlInfo);
+            eamEnums = eamEnumRepoitory.findByHqlWhere(hqlInfo);
+        } else {
+            eamEnums = eamEnums.stream().
+                    filter(k -> k.getEnumType().equals(model.getEnumType())).collect(Collectors.toList());
+        }
+
+        if (CollectionUtils.isEmpty(eamEnums)) {
+            return result;
+        }
+        for (DynamicEnum eam : eamEnums) {
+            Map<String, Object> value = new HashMap<>();
+            value.put("value", eam.getEnumValue());
+            value.put("description", eam.getEnumValueDesc());
+            result.add(value);
+        }
+        return result;
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/HashMapConverter.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/HashMapConverter.java
new file mode 100644
index 0000000..7d31ef7
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/HashMapConverter.java
@@ -0,0 +1,65 @@
+package cn.estsh.i3plus.pojo.eam.common;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.AttributeConverter;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Jason
+ * @ClassName: HashMapConverter
+ * @Description: json转换器
+ * @date 2022-03-23
+ */
+public class HashMapConverter implements AttributeConverter<Map<String, Object>, String> {
+    protected static final Logger LOG = LoggerFactory.getLogger(HashMapConverter.class);
+    private static ObjectMapper mapperInstance = null;
+    private static ObjectMapper getMapper() {
+        if (mapperInstance == null) {
+            synchronized (HashMapConverter.class) {
+                if (mapperInstance == null) {
+                    mapperInstance = new ObjectMapper();
+                    mapperInstance.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+                    mapperInstance.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+                }
+            }
+        }
+
+        return mapperInstance;
+    }
+
+    @Override
+    public String convertToDatabaseColumn(Map<String, Object> stringObjectMap) {
+        String customerInfoJson = null;
+        try {
+            customerInfoJson = getMapper().writeValueAsString(stringObjectMap);
+        } catch (final JsonProcessingException e) {
+            LOG.error("JSON writing error", e);
+        }
+
+        return customerInfoJson;
+    }
+
+    @Override
+    public Map<String, Object> convertToEntityAttribute(String s) {
+        if (StringUtils.isEmpty(s)) {
+            return new HashMap<>();
+        }
+        Map<String, Object> customerInfo = null;
+        try {
+            customerInfo = getMapper().readValue(s, Map.class);
+        } catch (final IOException e) {
+            LOG.error("JSON reading error", e);
+        }
+
+        return customerInfo;
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/ICommonService.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/ICommonService.java
new file mode 100644
index 0000000..ba326f6
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/ICommonService.java
@@ -0,0 +1,81 @@
+package cn.estsh.i3plus.pojo.eam.common;
+
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.common.dto.CommonPager;
+import cn.estsh.i3plus.pojo.eam.common.pojo.FieldInfo;
+import cn.estsh.i3plus.pojo.platform.bean.SysFile;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Jason
+ * @ClassName: CommonService
+ * @Description: 通用Service接口
+ * @date 2022-03-22
+ */
+public interface ICommonService<T extends CommonBean> {
+    BaseRepository<T, Long> getRepository();
+
+    T create();
+
+    List<T> list();
+
+    T getById(long id);
+
+    @ApiParam("通用查询数据带分页")
+    ListPager<T> listByPager(List<CommonPager.Filter> filters, List<CommonPager.SortData> sorts, Pager pagers, String org);
+
+    @ApiParam("通用查询数据不带分页")
+    List<T> listQuery(List<CommonPager.Filter> filters, List<CommonPager.SortData> sorts, String org);
+
+    T insert(T item);
+
+    T getInsertValue(T item);
+
+    List<T> insert(Iterable<T> items);
+
+    void update(T item);
+
+    void update(Iterable<T> items);
+
+    void delete(T item);
+
+    void delete(Iterable<T> items);
+
+    void deleteById(Long id);
+
+    int deleteByIds(Long[] ids);
+
+    String getStringValue(CommonBean bean, FieldInfo info);
+
+    String getMainKeyValue(CommonBean bean);
+
+    T getByMainKey(List<FieldInfo> fieldInfos, List<String> values);
+
+    Object getValue(CommonBean bean, FieldInfo info);
+
+    void setValue(CommonBean bean, FieldInfo info, Object value);
+
+    void setStringValue(CommonBean bean, FieldInfo info, String value);
+
+    void uploadFile(MultipartFile file, Long beanId, Long configId, String userName);
+
+    SysFile downloadFile(Long beanId, Long configId);
+
+    void deleteFile(Long beanId, Long configId);
+
+
+    @ApiOperation(value = "上传图片")
+    Map<Long, String> fileJpg(MultipartFile file, Long id, String userName);
+
+    @ApiOperation(value = "上传文档")
+    Map<Long, String> filePdf(MultipartFile file, Long id, String userName);
+
+    T getByMainKeyOrganizeCode(List<FieldInfo> fieldInfos, List<String> values, String organizeCode);
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/IFieldInfoService.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/IFieldInfoService.java
new file mode 100644
index 0000000..42fd78d
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/IFieldInfoService.java
@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.eam.common;
+
+
+import cn.estsh.i3plus.pojo.eam.common.pojo.FieldInfo;
+
+import java.util.List;
+
+public interface IFieldInfoService {
+    FieldInfo getById(Long id);
+    void insert(List<FieldInfo> fieldInfos);
+    void update(FieldInfo fieldInfo);
+    void update(List<FieldInfo> fieldInfos);
+    void deleteById(Long id);
+    List<FieldInfo> list(Class<? extends CommonBean> cls);
+    FieldInfo get(Class<? extends CommonBean> cls, String code);
+    List<FieldInfo> listMainKeys(Class<? extends CommonBean> cls);
+    List<FieldInfo> listDisplay(Class<? extends CommonBean> cls);
+    List<FieldInfo> listForPop(Class<? extends CommonBean> cls);
+    FieldInfo getByName(Class<? extends CommonBean> cls, String name);
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/IGridFieldService.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/IGridFieldService.java
new file mode 100644
index 0000000..677bc83
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/IGridFieldService.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.eam.common;
+
+
+import cn.estsh.i3plus.pojo.eam.common.dto.GridFieldDto;
+import cn.estsh.i3plus.pojo.eam.common.pojo.GridField;
+
+import java.util.List;
+
+public interface IGridFieldService {
+    List<GridFieldDto> list(Class<? extends CommonBean> cls, String gridName);
+    void insert(List<GridFieldDto> fieldInfos);
+    void update(List<GridFieldDto> fieldInfos);
+    GridField getByName(Class<? extends CommonBean> cls, String gridName, String name);
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/ServiceInfo.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/ServiceInfo.java
new file mode 100644
index 0000000..2922f00
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/ServiceInfo.java
@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.eam.common;
+
+
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public final class ServiceInfo {
+    private static final Map<Class<? extends CommonBean>, ICommonService<? extends CommonBean>> services = new HashMap<>();
+    private static final Map<String, Class<? extends CommonBean>> nameMapService = new HashMap<>();
+    private static String org;
+
+    public static void register(Class<? extends CommonBean> cls, ICommonService<? extends CommonBean> service) {
+        services.put(cls, service);
+        nameMapService.put(cls.getSimpleName(), cls);
+    }
+
+    public static <T extends CommonBean> ICommonService<T>  get(Class<? extends CommonBean> cls) {
+        return (ICommonService<T>) services.get(cls);
+    }
+
+    public static <T extends CommonBean> Class<T> getBeanClass(String name) {
+        return (Class<T>) nameMapService.get(name);
+    }
+
+    public static String getOrganizeCode() {
+        return AuthUtil.getOrganize().getOrganizeCode();
+    }
+
+    public static String getUserName() {
+        return AuthUtil.getSessionUser().getUserName();
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/annotation/ExcludeImportExport.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/annotation/ExcludeImportExport.java
new file mode 100644
index 0000000..f066b6b
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/annotation/ExcludeImportExport.java
@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.eam.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @Description:
+ * @CreateDate 2022/4/19 9:23
+ * @Author 尹肖
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ExcludeImportExport {
+    boolean excludeImport() default true;
+
+    boolean excludeExport() default true;
+}
+
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/annotation/FieldAnnotation.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/annotation/FieldAnnotation.java
new file mode 100644
index 0000000..08e25f5
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/annotation/FieldAnnotation.java
@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.eam.common.annotation;
+
+
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Jason
+ * @ClassName: FieldAnnotation
+ * @Description: 字段元信息注解
+ * @date 2022-03-22
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FieldAnnotation {
+    boolean property() default true;
+        boolean modify() default true;  // 是否能修改
+    boolean display() default true; // 是否需要在界面显示
+    int pric() default 2;   // 对于浮点型，界面显示的精度
+    boolean mainkey() default false;    // 是否为主键
+    String defaultValue() default "";   // 字段的默认值
+    boolean popSearch() default false;  // 弹出选择对象时是否显示
+    boolean popCondition() default false;  // 弹出选择时是否使用这个条件查询
+    COMMON_EDIT_TYPE editType() default COMMON_EDIT_TYPE.NONE; // 定义字段的编辑类型
+    Class<?> multiEnumClass() default Object.class;  // 多选枚举的类型。
+    String typeName() default "";   // 定义字段类型的简单名称，用于关联表或者动态枚举。
+    boolean notEmpty() default false;   // 是否不允许为空
+    boolean isShow() default true;   // 是否允许表单显示
+    boolean dynamicCalculate() default false;   // 是否允许获取新增值
+    boolean isWhereSelect() default true;   // 是否允许获取新增值
+    String readFunction() default ""; //取值函数，查询时调用赋值;
+    String excelExportVal() default ""; //导出取值函数;
+
+    boolean isUpdate() default true;  // 是否能在编辑页面输入值 false
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/CommonPager.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/CommonPager.java
new file mode 100644
index 0000000..de825be
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/CommonPager.java
@@ -0,0 +1,84 @@
+package cn.estsh.i3plus.pojo.eam.common.dto;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.eam.common.COMMON_FIELD_TYPE;
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Jason
+ * @ClassName: CommonPager
+ * @Description: 通用表格分页查询参数
+ * @date 2022-03-22
+ */
+@Data
+@Api("通用表格分页查询参数")
+public class CommonPager extends Pager {
+    public static class SortData {
+        // 排序对象
+        private String field;
+        // 排序类型，1为升序，0为降序
+        private int orderType;
+
+        public String getField() {
+            return field;
+        }
+
+        public void setField(String field) {
+            this.field = field;
+        }
+
+        public int getOrderType() {
+            return orderType;
+        }
+
+        public void setOrderType(int orderType) {
+            this.orderType = orderType;
+        }
+    }
+
+    @Data
+    public static class Filter {
+        // 排序对象
+        private String code;
+        // 查询类型
+        private String count;
+        // 查询值
+        private String materialValue;
+        // 或者、并且
+        private String and;
+
+        //连表sql
+        private String linkedTableSql;
+
+
+        // 是否为字段比较
+        private Boolean isField = Boolean.FALSE;
+        //类型
+        private COMMON_FIELD_TYPE tyep = COMMON_FIELD_TYPE.STRING;
+
+        public Filter() {
+        }
+
+        public Filter(String code, String count, String materialValue, String and) {
+            this.code = code;
+            this.count = count;
+            this.materialValue = materialValue;
+            this.and = and;
+        }
+
+        public Filter(String code, String count, String materialValue, String and, Boolean isField) {
+            this.code = code;
+            this.count = count;
+            this.materialValue = materialValue;
+            this.and = and;
+            this.isField = isField;
+        }
+    }
+
+    private String filter;
+    private List<SortData> sorts;
+    private List<Filter> filters;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/ExecuteProgress.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/ExecuteProgress.java
new file mode 100644
index 0000000..722e6ac
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/ExecuteProgress.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.eam.common.dto;
+
+import lombok.Data;
+
+@Data
+public class ExecuteProgress {
+    private String message;
+    private Integer progress;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/ExportNode.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/ExportNode.java
new file mode 100644
index 0000000..fe3c0c2
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/ExportNode.java
@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.pojo.eam.common.dto;
+
+import cn.estsh.i3plus.pojo.eam.common.pojo.FieldInfo;
+import cn.estsh.i3plus.pojo.eam.pojo.importexport.ExportField;
+import lombok.Data;
+
+@Data
+public class ExportNode {
+    private ExportField exportField;
+    private FieldInfo fieldInfo;
+    private String defaultValue;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/ExportParam.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/ExportParam.java
new file mode 100644
index 0000000..37a3b71
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/ExportParam.java
@@ -0,0 +1,8 @@
+package cn.estsh.i3plus.pojo.eam.common.dto;
+
+import lombok.Data;
+
+@Data
+public class ExportParam extends CommonPager {
+    private Long projectId;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/GridFieldDto.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/GridFieldDto.java
new file mode 100644
index 0000000..f92b7d2
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/GridFieldDto.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.eam.common.dto;
+
+import cn.estsh.i3plus.pojo.eam.common.pojo.FieldInfo;
+import io.swagger.annotations.ApiParam;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class GridFieldDto extends FieldInfo {
+    @ApiParam(value = "所属表格名称")
+    private String gridName;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/ImportDataModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/ImportDataModel.java
new file mode 100644
index 0000000..8719b16
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/ImportDataModel.java
@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.eam.common.dto;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 进度条显示信息。
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-04-01
+ * @Modify:
+ **/
+@Data
+public class ImportDataModel {
+    @ApiParam(value ="当前执行进度")
+    private Integer curProcess = 0;
+
+    @ApiParam(value ="总行数")
+    private Integer totalSize = 0;
+
+    @ApiParam(value ="进度消息")
+    private String processMsg = "";
+
+    private Boolean finish = false;
+
+    @ApiParam(value ="异常消息")
+    private String exception = "";
+
+    private ImportErrorInfo errorInfo;
+}
+
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/ImportErrorInfo.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/ImportErrorInfo.java
new file mode 100644
index 0000000..4291f5b
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/ImportErrorInfo.java
@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.eam.common.dto;
+
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description : 导入校验错误信息
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2021-02-25
+ * @Modify:
+ **/
+@Data
+@Api("导入校验错误信息")
+public class ImportErrorInfo {
+    private List<String> headers = new ArrayList<>();
+    private List<List<String>> errorData = new ArrayList<>(100);
+
+    public boolean hasErrorData() {
+        return !errorData.isEmpty();
+    }
+}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/ImportHeaderNode.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/ImportHeaderNode.java
new file mode 100644
index 0000000..978a03d
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/dto/ImportHeaderNode.java
@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.eam.common.dto;
+
+import cn.estsh.i3plus.pojo.eam.common.pojo.FieldInfo;
+import cn.estsh.i3plus.pojo.eam.pojo.importexport.ImportField;
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+import java.lang.reflect.Method;
+
+/**
+ * @Description : 导入节点头信息
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2021-02-25
+ * @Modify:
+ **/
+@Data
+@Api("导入节点头信息")
+public class ImportHeaderNode {
+    private ImportField importField;
+    private FieldInfo fieldInfo;
+    private String defaultValue;
+    private Method defaultMethod;
+    private boolean hasDeal = false;
+    private boolean hasError = false;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/DynamicEnum.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/DynamicEnum.java
new file mode 100644
index 0000000..9065253
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/DynamicEnum.java
@@ -0,0 +1,71 @@
+package cn.estsh.i3plus.pojo.eam.common.pojo;
+
+
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+/**
+ * @Description:
+ * @CreateDate 2022/4/11 11:08
+ * @Author 尹肖
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "COMMON_DYNAMIC_ENUM", uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ENUM_TYPE", "ENUM_VALUE_SEQ", "ENUM_VALUE"})})
+@Api("字典")
+@ExcludeImportExport
+public class DynamicEnum extends CommonBean {
+
+    @Column(name = "ENUM_TYPE")
+    @ApiParam(name = "枚举类型")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String enumType;
+
+    @Column(name = "ENUM_TYPE_DESC")
+    @ApiParam(name = "枚举类型描述")
+    @FieldAnnotation(popSearch = true)
+    private String enumTypeDesc;
+
+    @Column(name = "ENUM_VALUE_SEQ")
+    @ApiParam(name = "枚举值序号")
+    @FieldAnnotation(popSearch = true, notEmpty = true)
+    private Integer enumValueSeq;
+
+    @Column(name = "ENUM_VALUE")
+    @ApiParam(name = "枚举值")
+    @FieldAnnotation(popSearch = true, notEmpty = true)
+    private String enumValue;
+
+    @Column(name = "ENUM_VALUE_DESC")
+    @ApiParam(name = "枚举值描述")
+    @FieldAnnotation(popSearch = true)
+    private String enumValueDesc;
+
+//    @JsonIgnore
+//    @ManyToMany(targetEntity = EamOpItem.class, cascade= CascadeType.ALL, mappedBy = "eamEnumList")
+//    private List<EamOpItem> eamOpItemList;
+//
+//    @JsonIgnore
+//    @ManyToMany(targetEntity = EamPart.class, cascade= CascadeType.ALL, mappedBy = "eamEnumList")
+//    private List<EamPart> eamParts;
+//
+//    @JsonIgnore
+//    @ManyToMany(targetEntity = Equipment.class, cascade= CascadeType.ALL, mappedBy = "eamEnumList")
+//    private List<Equipment> equipmentList;
+}
+
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/EngineScriptPersistence.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/EngineScriptPersistence.java
new file mode 100644
index 0000000..14c0b63
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/EngineScriptPersistence.java
@@ -0,0 +1,75 @@
+package cn.estsh.i3plus.pojo.eam.common.pojo;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import io.swagger.annotations.Api;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * 脚本持久化实体类
+ *
+ * @author Rock.Yu
+ * @since 2019-03-18 14:22
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SCRIPT_PERSISTENCE", uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SCRIPT_NO"})
+})
+@Api("系统动态脚本")
+public class EngineScriptPersistence extends CommonBean {
+    private static final long serialVersionUID = 7893111140559759490L;
+    // 脚本调用的唯一编号，例如：WMS_PDA_0001
+    @Column(name = "SCRIPT_NO", length = 50)
+    private String scriptNo;
+
+    // 脚本的中文名称
+    @Column(name = "SCRIPT_NAME", length = 50)
+    private String scriptName;
+
+    // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本
+    @Column(name = "SCRIPT_TYPE")
+    private Integer scriptType;
+
+    // 脚本编写的语言
+    // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby
+    @Column(name = "LANGUAGE_TYPE")
+    private Integer languageType;
+
+    // 脚本的具体内容
+    @Lob
+    @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT")
+    private String scriptContent;
+
+    // 脚本的描述，包含脚本的用法，参数说明等
+    @Column(name = "SCRIPT_REMARK", length = 2000)
+    private String scriptRemark;
+
+    // 编译后的脚本内容，通过预编译加快脚本的运行速度
+    @Transient
+    private Object compiledScript;
+
+    public EngineScriptPersistence() {
+
+    }
+
+    // 构造方法，便于批量创建数据
+    public EngineScriptPersistence(Long id, String scriptNo, String scriptName, Integer scriptType, Integer languageType,
+                                   String scriptContent, String scriptRemark) {
+        this.id = id;
+        this.scriptNo = scriptNo;
+        this.scriptName = scriptName;
+        this.scriptType = scriptType;
+        this.languageType = languageType;
+        this.scriptContent = scriptContent;
+        this.scriptRemark = scriptRemark;
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/FieldInfo.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/FieldInfo.java
new file mode 100644
index 0000000..6d2cced
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/FieldInfo.java
@@ -0,0 +1,163 @@
+package cn.estsh.i3plus.pojo.eam.common.pojo;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+import cn.estsh.i3plus.pojo.eam.common.COMMON_FIELD_TYPE;
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.lang.reflect.Method;
+import java.sql.JDBCType;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Jason
+ * @ClassName: FieldInfo
+ * @Description: 字段信息
+ * @date 2022-03-22
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "COMMON_FIELD_INFO")
+@Api("字段信息")
+public class FieldInfo extends CommonBean {
+    @Column(name = "CODE")
+    @ApiParam(value = "编码")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String code;
+
+    @Column(name = "NAME")
+    @ApiParam(value = "名称")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String name;
+
+    @Column(name = "CLASS_NAME")
+    @ApiParam(value = "所属类简称")
+    private String className;
+
+    @Column(name = "TYPE")
+    @ApiParam(value = "类型")
+    @FieldAnnotation(defaultValue = "STRING")
+    private COMMON_FIELD_TYPE type;
+
+    @Column(name = "TYPE_NAME")
+    @ApiParam(value = "类型名称")
+    private String typeName;
+
+    @Column(name = "TYPE_FULL_NAME")
+    @ApiParam(value = "类型全名称包含路径")
+    private String typeFullName;
+
+    @Column(name = "CUSTOMIZE")
+    @ApiParam(value = "是否为自定义字段")
+    @FieldAnnotation(defaultValue = "true")
+    private Boolean customize = true;
+
+    @Column(name = "MODIFY")
+    @ApiParam(value = "是否能修改")
+    @FieldAnnotation(defaultValue = "true")
+    private Boolean modify = true;
+
+    @Column(name = "DISPLAY")
+    @ApiParam(value = "是否在界面显示")
+    @FieldAnnotation(defaultValue = "true")
+    private Boolean display = true;
+
+    @Column(name = "IS_SHOW")
+    @ApiParam(value = "是否表单字段展示:默认1-显示，2-隐藏")
+    private Boolean isShow = true;
+
+    @Column(name = "PRIC")
+    @ApiParam(value = "浮点数显示精度")
+    @FieldAnnotation(defaultValue = "2")
+    private Integer pric;
+
+    @Column(name = "TIPS")
+    @ApiParam(value = "字段提示")
+    private String tips;
+
+    @Column(name = "ORDER_NUMBER")
+    @ApiParam(value = "序号")
+    private Integer orderNumber;
+
+    @Column(name = "MAIN_KEY")
+    @ApiParam(value = "主键标识")
+    private Boolean mainKey;
+
+    @Column(name = "JDBC_TYPE")
+    @ApiParam(value = "数据库类型")
+    private JDBCType jdbcType;
+
+    @Column(name = "DEFAULT_VALUE")
+    @ApiParam(value = "字段默认值")
+    private String defaultValue;
+
+    @Column(name = "READ_FUNCTION")
+    @ApiParam(value = "取值函数")
+    private String readFunction;
+
+    @Column(name = "POP_SEARCH")
+    @ApiParam(value = "弹出选择时是否显示")
+    private Boolean popSearch;
+
+    @Column(name = "POP_CONDITION")
+    @ApiParam(value = "弹出选择时是否使用这个条件查询")
+    private Boolean popCondition = false;
+
+    @Column(name = "EDIT_TYPE")
+    @ApiParam(value = "字段编辑类型")
+    private COMMON_EDIT_TYPE editType;
+
+    @ApiParam(value = "枚举项内容")
+    private transient List<Map<String, Object>> enumItems;
+
+    @Column(name = "NOT_EMPTY")
+    @ApiParam(value = "不能为空")
+    private Boolean notEmpty;
+
+    @Column(name = "DYNAMIC_CALCULATE")
+    @ApiParam(value = "是否获取新增值")
+    private Boolean dynamicCalculate;
+
+    @Column(name = "IS_WHERE_SELECT")
+    @ApiParam(value = "是否为查询条件")
+    private Boolean isWhereSelect;
+
+    @Column(name = "IS_UPDATE")
+    @ApiParam(value = "是否能在编辑页面输入值:默认1-不可编辑，2-可编辑")
+    private Boolean isUpdate = false;
+
+    @Column(name = "EXCEL_EXPORT_VAL")
+    @ApiParam(value = "导出取值函数")
+    private String excelExportVal;
+
+    @JsonIgnore
+    @Transient
+    private transient Class<? extends BaseBean> clazz;
+    @JsonIgnore
+    @Transient
+    private transient Class<?> typeClass;
+    @JsonIgnore
+    @Transient
+    private transient Method getMethod;
+    @JsonIgnore
+    @Transient
+    private transient Method setMethod;
+}
+
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/GridField.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/GridField.java
new file mode 100644
index 0000000..0e0a493
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/GridField.java
@@ -0,0 +1,69 @@
+package cn.estsh.i3plus.pojo.eam.common.pojo;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @author Jason
+ * @ClassName: GridField
+ * @Description: 表格字段信息-支持一个实体类对应多个展示表格。
+ * @date 2022-06-08
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "COMMON_GRID_FIELD")
+@Api("表格字段信息")
+public class GridField extends CommonBean {
+
+    @Column(name = "CODE")
+    @ApiParam(value = "编码")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String code;
+
+    @Column(name = "NAME")
+    @ApiParam(value = "名称")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String name;
+
+    @Column(name = "CLASS_NAME")
+    @ApiParam(value = "所属类简称")
+    private String className;
+
+    @Column(name = "GRID_NAME")
+    @ApiParam(value = "所属表格名称")
+    private String gridName;
+
+    @Column(name = "DISPLAY")
+    @ApiParam(value = "是否在界面显示")
+    @FieldAnnotation(defaultValue = "true")
+    private Boolean display = true;
+
+    @Column(name = "IS_SHOW")
+    @ApiParam(value = "是否表单字段展示:默认1-显示，2-隐藏")
+    private Boolean isShow = true;
+
+    @Column(name = "IS_UPDATE")
+    @ApiParam(value = "是否能在编辑页面输入值:默认1-不可编辑，2-可编辑")
+    private Boolean isUpdate = false;
+
+    @Column(name = "NOT_EMPTY")
+    @ApiParam(value = "不能为空")
+    private Boolean notEmpty;
+
+    @Column(name = "ORDER_NUMBER")
+    @ApiParam(value = "序号")
+    private Integer orderNumber;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/SysParam.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/SysParam.java
new file mode 100644
index 0000000..1d1e785
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/SysParam.java
@@ -0,0 +1,85 @@
+package cn.estsh.i3plus.pojo.eam.common.pojo;
+
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @Description :系统参数
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EAM_SYS_PARAM")
+@Api("系统参数")
+public class SysParam extends CommonBean {
+    private static final long serialVersionUID = 3115620726438869596L;
+    @Column(name = "BASE_TIME")
+    @ApiParam(value = "基准时间")
+    private Date baseTime;
+
+    @Column(name = "MAX_INTERRUPT_COUNT")
+    @ApiParam(value = "最大中断次数")
+    @FieldAnnotation(defaultValue = "20")
+    private Integer maxInterruptCount = 20;
+
+    @Column(name = "TYPE")
+    @ApiParam(value = "工艺路径有效判断类型")
+    @FieldAnnotation(defaultValue = "CALC_LET_LT")
+    private EamEnumUtil.ROUTING_VALID_TYPE type;
+
+    @Column(name = "RULE_GROUP_ID")
+    @ApiParam(value = "规则组id")
+    @FieldAnnotation(display = false)
+    private Long ruleGroupId;
+
+    @Column(name = "INVENTORY_RATE")
+    @ApiParam(value = "库存误差百分比")
+    private Double inventoryRate;
+
+    @Column(name = "RECORD_RESULT")
+    @ApiParam(value = "记录资源评估结果")
+    private Boolean recordResult = false;
+
+    @Column(name = "SCHEDULE_RESULT")
+    @ApiParam(value = "记录排程结果")
+    private Boolean scheduleResult = false;
+
+    @Column(name = "SPLIT_BY_SHIFT")
+    @ApiParam(value = "按班次分割下发的工作")
+    private Boolean splitByShift = true;
+
+    @Column(name = "RES_GANTT_LABEL")
+    @ApiParam(value = "资源甘特图工作块显示标签")
+    private String resGanttLabel;
+
+    @Column(name = "FOUR_FIRST_SUPPLY")
+    @ApiParam(value = "是否牵纱补满模")
+    private Boolean fourFirstSupply = false;
+
+    @Column(name = "MAX_SPACE_LIMIT_DRAG")
+    @ApiParam(value = "间隔时间限制")
+    private Boolean maxSpaceLimitDrag = true;
+
+    @Column(name = "DEFAULT_FEEDBACK")
+    @ApiParam(value = "自动提交前三道")
+    private Boolean defaultFeedback = true;
+
+    @Column(name = "SAME_MATERIAL_INTERVAL")
+    @ApiParam(value = "相同物料选择间隔")
+    private String sameMaterialInterval;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/UploadFileConfig.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/UploadFileConfig.java
new file mode 100644
index 0000000..c1c11d4
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/UploadFileConfig.java
@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.eam.common.pojo;
+
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @author Jason
+ * @ClassName: UploadFileConfig
+ * @Description: 上传文件配置
+ * @date 2022-04-13
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "COMMON_UPLOAD_FILE_CONFIG")
+@Api("上传文件配置")
+public class UploadFileConfig extends CommonBean {
+    @Column(name="NAME")
+    @ApiParam(value ="名称")
+    @FieldAnnotation(notEmpty = true)
+    private String name;
+
+    @Column(name="GROUP_NAME")
+    @ApiParam(value ="分组名称")
+    @FieldAnnotation(notEmpty = true)
+    private String groupName;
+
+    @Column(name="FILE_TYPE")
+    @ApiParam(value ="文件类型")
+    private CommonEnumUtil.COMMON_FILE_TYPE fileType;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/UploadFileInfo.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/UploadFileInfo.java
new file mode 100644
index 0000000..425fdb6
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/pojo/UploadFileInfo.java
@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.eam.common.pojo;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @author Jason
+ * @ClassName: UploadFileInfo
+ * @Description: 上传文件的信息
+ * @date 2022-04-14
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "COMMON_UPLOAD_FILE_INFO")
+@Api("上传文件的信息")
+public class UploadFileInfo extends CommonBean {
+    @Column(name="BEAN_NAME")
+    @ApiParam(value ="对象名称")
+    private String beanName;
+
+    @Column(name="BEAN_ID")
+    @ApiParam(value ="对象ID")
+    private Long beanId;
+
+    @Column(name="CONFIG_ID")
+    @ApiParam(value ="文件配置ID")
+    private Long configId;
+
+    @Column(name="FILE_ID")
+    @ApiParam(value ="存储的文件ID")
+    private Long fileId;
+
+    @Column(name="FILE_NAME")
+    @ApiParam(value ="文件原始名称")
+    private String fileName;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/serviceimpl/FieldInfoServiceImpl.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/serviceimpl/FieldInfoServiceImpl.java
new file mode 100644
index 0000000..6e4071a
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/serviceimpl/FieldInfoServiceImpl.java
@@ -0,0 +1,75 @@
+package cn.estsh.i3plus.pojo.eam.common.serviceimpl;
+
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.FieldInfoDao;
+import cn.estsh.i3plus.pojo.eam.common.IFieldInfoService;
+import cn.estsh.i3plus.pojo.eam.common.pojo.FieldInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class FieldInfoServiceImpl implements IFieldInfoService {
+    @Autowired
+    private FieldInfoDao fieldInfoDao;
+
+    @Override
+    public FieldInfo getById(Long id) {
+        return fieldInfoDao.getById(id);
+    }
+
+    @Override
+    public void insert(List<FieldInfo> fieldInfos) {
+        fieldInfoDao.insert(fieldInfos);
+    }
+
+    @Override
+    public void update(FieldInfo fieldInfo) {
+        fieldInfoDao.update(fieldInfo);
+    }
+
+    @Override
+    public void update(List<FieldInfo> fieldInfos) {
+        fieldInfoDao.update(fieldInfos);
+    }
+
+    @Override
+    public void deleteById(Long id) {
+        fieldInfoDao.deleteById(id);
+    }
+
+    @Override
+    public List<FieldInfo> list(Class<? extends CommonBean> cls) {
+        return fieldInfoDao.list(cls);
+    }
+
+    @Override
+    public FieldInfo get(Class<? extends CommonBean> cls, String code) {
+        return fieldInfoDao.get(cls, code);
+    }
+
+    @Override
+    public List<FieldInfo> listMainKeys(Class<? extends CommonBean> cls) { return fieldInfoDao.listMainKeys(cls,new ArrayList<>()); }
+
+    @Override
+    public List<FieldInfo> listDisplay(Class<? extends CommonBean> cls) {
+        List<FieldInfo> infos = list(cls);
+        infos.removeIf(fieldInfo -> !fieldInfo.getDisplay());
+        return infos;
+    }
+
+    @Override
+    public List<FieldInfo> listForPop(Class<? extends CommonBean> cls) {
+        List<FieldInfo> infos = list(cls);
+        infos.removeIf(fieldInfo -> !fieldInfo.getPopSearch());
+        return infos;
+    }
+
+    @Override
+    public FieldInfo getByName(Class<? extends CommonBean> cls, String name) {
+        return fieldInfoDao.getByName(cls, name);
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/serviceimpl/GridFieldServiceImpl.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/serviceimpl/GridFieldServiceImpl.java
new file mode 100644
index 0000000..38d3e66
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/serviceimpl/GridFieldServiceImpl.java
@@ -0,0 +1,182 @@
+package cn.estsh.i3plus.pojo.eam.common.serviceimpl;
+
+
+import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.FieldInfoDao;
+import cn.estsh.i3plus.pojo.eam.common.IGridFieldService;
+import cn.estsh.i3plus.pojo.eam.common.ServiceInfo;
+import cn.estsh.i3plus.pojo.eam.common.dto.GridFieldDto;
+import cn.estsh.i3plus.pojo.eam.common.pojo.FieldInfo;
+import cn.estsh.i3plus.pojo.eam.common.pojo.GridField;
+import cn.estsh.i3plus.pojo.eam.repository.GridFieldRepository;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class GridFieldServiceImpl implements IGridFieldService {
+    @Autowired
+    private SnowflakeIdMaker snowflakeIdMaker;
+    @Autowired
+    private GridFieldRepository gridFieldRepository;
+    @Autowired
+    private FieldInfoDao fieldInfoDao;
+
+    private <T extends CommonBean> T create(Class<T> cls) {
+        T bean = null;
+        try {
+            bean = cls.newInstance();
+            bean.setId(snowflakeIdMaker.nextId());
+            bean.setIsValid(CommonEnumUtil.VALID);
+            bean.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
+            bean.setOrganizeCode(ServiceInfo.getOrganizeCode());
+        } catch (InstantiationException | IllegalAccessException e) {
+        }
+        return bean;
+    }
+
+    private GridFieldDto createFieldDto(FieldInfo fieldInfo, String gridName, GridField gridField) {
+        GridFieldDto dto = new GridFieldDto();
+        BeanUtils.copyProperties(fieldInfo, dto);
+        dto.setGridName(gridName);
+        if (gridField != null) {
+            dto.setName(gridField.getName());
+            dto.setDisplay(gridField.getDisplay());
+            dto.setIsShow(gridField.getIsShow());
+            dto.setIsUpdate(gridField.getIsUpdate());
+            dto.setNotEmpty(gridField.getNotEmpty());
+            dto.setOrderNumber(gridField.getOrderNumber());
+        }
+        return dto;
+    }
+
+    @Override
+    public List<GridFieldDto> list(Class<? extends CommonBean> cls, String gridName) {
+        List<GridFieldDto> result = new ArrayList<>();
+
+        DdlPackBean hqlInfo = DdlPackBean.getDdlPackBean(ServiceInfo.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(cls.getSimpleName(), "className", hqlInfo);
+        if (!StringUtils.isEmpty(gridName)) {
+            DdlPreparedPack.getStringEqualPack(gridName, "gridName", hqlInfo);
+        } else {
+            DdlPreparedPack.getIsNull("gridName", hqlInfo);
+        }
+
+        List<GridField> gridFields = gridFieldRepository.findByHqlWhere(hqlInfo);
+        List<FieldInfo> fieldInfos = fieldInfoDao.list(cls);
+        List<GridField> deleteGridFields = new ArrayList<>();
+        for (GridField gridField : gridFields) {
+            boolean bFind = fieldInfos.removeIf(temp -> {
+                if (temp.getCode().equals(gridField.getCode())) {
+                    result.add(createFieldDto(temp, gridName, gridField));
+                    return true;
+                }
+                return false;
+            });
+            if (!bFind) {
+                deleteGridFields.add(gridField);
+            }
+        }
+        for (FieldInfo fieldInfo : fieldInfos) {
+            result.add(createFieldDto(fieldInfo, gridName, null));
+        }
+        gridFieldRepository.deleteAll(deleteGridFields);
+        return result;
+    }
+
+    @Override
+    public void insert(List<GridFieldDto> fieldInfos) {
+        for (GridFieldDto dto : fieldInfos) {
+            Class<? extends CommonBean> cls = ServiceInfo.getBeanClass(dto.getClassName());
+            FieldInfo fieldInfo = fieldInfoDao.get(cls, dto.getCode());
+            if (fieldInfo == null) {
+                fieldInfo = create(FieldInfo.class);
+                fieldInfo.setCode(dto.getCode());
+                fieldInfo.setName(dto.getName());
+                fieldInfo.setType(dto.getType());
+                fieldInfo.setEditType(dto.getEditType());
+                fieldInfo.setTypeName(dto.getTypeName());
+                fieldInfo.setTypeFullName(dto.getTypeFullName());
+                fieldInfo.setClassName(cls.getSimpleName());
+                fieldInfo.setModify(dto.getModify());
+                fieldInfo.setNotEmpty(dto.getNotEmpty());
+                fieldInfo.setDynamicCalculate(dto.getDynamicCalculate());
+                fieldInfo.setDisplay(dto.getDisplay());
+                fieldInfo.setIsShow(dto.getIsShow());
+                fieldInfo.setPric(dto.getPric());
+                fieldInfo.setDefaultValue(dto.getDefaultValue());
+                fieldInfo.setReadFunction(dto.getReadFunction());
+                fieldInfo.setExcelExportVal(dto.getExcelExportVal());
+                fieldInfo.setOrganizeCode(dto.getOrganizeCode());
+                fieldInfo.setIsWhereSelect(dto.getIsWhereSelect());
+                fieldInfo.setIsUpdate(dto.getIsUpdate());
+                ConvertBean.serviceModelInitialize(fieldInfo, dto.getCreateUser());
+                fieldInfoDao.insert(fieldInfo);
+            }
+            GridField gridField = create(GridField.class);
+            gridField.setCode(dto.getCode());
+            gridField.setName(dto.getName());
+            gridField.setClassName(cls.getSimpleName());
+            gridField.setDisplay(dto.getDisplay());
+            gridField.setIsShow(dto.getIsShow());
+            gridField.setIsUpdate(dto.getIsUpdate());
+            gridField.setNotEmpty(dto.getNotEmpty());
+            gridField.setGridName(dto.getGridName());
+            gridField.setOrganizeCode(dto.getOrganizeCode());
+            ConvertBean.serviceModelInitialize(gridField, dto.getCreateUser());
+            gridFieldRepository.save(gridField);
+        }
+    }
+
+    @Override
+    public void update(List<GridFieldDto> fieldInfos) {
+        for (GridFieldDto dto : fieldInfos) {
+            Class<? extends CommonBean> cls = ServiceInfo.getBeanClass(dto.getClassName());
+            FieldInfo fieldInfo = fieldInfoDao.get(cls, dto.getCode());
+            if (fieldInfo != null) {
+                fieldInfo.setType(dto.getType());
+                fieldInfo.setEditType(dto.getEditType());
+                fieldInfo.setTypeName(dto.getTypeName());
+                fieldInfo.setTypeFullName(dto.getTypeFullName());
+                fieldInfo.setOrganizeCode(dto.getOrganizeCode());
+                fieldInfo.setIsWhereSelect(dto.getIsWhereSelect());
+                fieldInfo.setIsUpdate(dto.getIsUpdate());
+                ConvertBean.serviceModelUpdate(fieldInfo, dto.getCreateUser());
+                fieldInfoDao.update(fieldInfo);
+            }
+
+            GridField gridField = getByName(cls, dto.getGridName(), dto.getCode());
+            if (gridField != null) {
+                gridField.setDisplay(dto.getDisplay());
+                gridField.setIsShow(dto.getIsShow());
+                gridField.setIsUpdate(dto.getIsUpdate());
+                gridField.setNotEmpty(dto.getNotEmpty());
+                gridField.setName(dto.getName());
+                gridField.setOrderNumber(dto.getOrderNumber());
+                gridField.setOrganizeCode(dto.getOrganizeCode());
+                ConvertBean.serviceModelUpdate(gridField, dto.getCreateUser());
+                gridFieldRepository.save(gridField);
+            }
+        }
+    }
+
+    @Override
+    public GridField getByName(Class<? extends CommonBean> cls, String gridName, String name) {
+        DdlPackBean hqlInfo = DdlPackBean.getDdlPackBean(ServiceInfo.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(cls.getSimpleName(), "className", hqlInfo);
+        if (!StringUtils.isEmpty(gridName)) {
+            DdlPreparedPack.getStringEqualPack(gridName, "gridName", hqlInfo);
+        }
+        DdlPreparedPack.getStringEqualPack(name, "code", hqlInfo);
+        return gridFieldRepository.getByProperty(hqlInfo);
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/validator/InsertGroup.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/validator/InsertGroup.java
new file mode 100644
index 0000000..9fe13b8
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/validator/InsertGroup.java
@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.eam.common.validator;
+
+public interface InsertGroup {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/validator/UpdateGroup.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/validator/UpdateGroup.java
new file mode 100644
index 0000000..ea06ff3
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/common/validator/UpdateGroup.java
@@ -0,0 +1,4 @@
+package cn.estsh.i3plus.pojo.eam.common.validator;
+
+public interface UpdateGroup {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/constant/EamCommonConstant.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/constant/EamCommonConstant.java
new file mode 100644
index 0000000..9f70258
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/constant/EamCommonConstant.java
@@ -0,0 +1,92 @@
+package cn.estsh.i3plus.pojo.eam.constant;
+
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+
+/**
+ * @Description: MES公共常量
+ * @CreateDate 2021/06/24
+ * @Author simon.song
+ */
+public class EamCommonConstant {
+    //设备信息管理
+    public static final String EAM = "/eam";
+
+    public static final String WHITELIST_URL = "/eam-white";
+
+    //三力士
+    public static final String SANLUX = "/sanlux";
+
+
+    //广东
+    public static final String GD = "/gd";
+
+    public static final String ISVALID = "isValid";
+
+    /**
+     * eam 定时任务前缀
+     */
+    public static final String EAM_JOB_REDIS_PREFIX = "EAM:JOB";
+
+    /**
+     * 单据任务生成单号
+     */
+    public static final String ORDER_NO = "ORDER_NO";
+
+    //入库单生成单号
+    public static final String RK_ORDER_NO = "RK_ORDER_NO";
+
+    //出库单生成单号
+    public static final String CK_ORDER_NO = "CK_ORDER_NO";
+
+    //盘点单生成单号
+    public static final String CS_ORDER_NO = "CS_ORDER_NO";
+    //平台生成单号，获取返回值
+    public static final String ORDERNO = "orderNo";
+
+
+    // eam设备联络单据生成单号
+    public static final String EQU_CONTACT_NO = "EQU_CONTACT_NO";
+    //在字典中维护是否允许多个设备
+    public static final String ENUM_MULTI_EQUIPMENT_IN_ORDER = "MULTI_EQUIPMENT_IN_ORDER";
+
+    //打印
+    public static final String DOC_PRINT = "DOC_PRINT";
+
+    //设备等级
+    public static final String A = "A";
+    public static final String B = "B";
+    public static final String C = "C";
+
+    //频率cron表达式 三个月一次
+    public static final String FREQUENCY_THREE_MONTHS = "0 0 0 1 1/3 ? *";
+    //频率cron表达式 半年一次
+    public static final String FREQUENCY_SIX_MONTHS = "0 0 0 1 1/6 ? *";
+    //频率cron表达式 一年一次
+    public static final String FREQUENCY_YEAR = "0 0 0 1 1/12 ? *";
+
+    //每个4月1号
+    public static final String APRIL_1ST = "04-01";
+
+    public static final String DJ_ORDER_NO = "DJ_ORDER_NO";
+    public static final String BY_ORDER_NO = "BY_ORDER_NO";
+    public static final String WX_ORDER_NO = "WX_ORDER_NO";
+
+    //松下月
+    public static final Integer[] SX_MONTH = new Integer[]{4, 5, 6, 7, 8, 9, 10, 11, 12, 1, 2, 3};
+
+    //年月日,日期格式
+    public static final SimpleDateFormat YEAR_MONTH_DAY_FORMAT = new SimpleDateFormat("yyyy-MM-dd") ;
+
+    //月份日期格式
+    public static final SimpleDateFormat MONTH_FORMAT = new SimpleDateFormat("MM") ;
+
+    //格式化占比
+    public static final DecimalFormat PROPORTION_FORMAT = new DecimalFormat("##%");
+
+    //年月日
+    public static final String YEAR_MONTH_DAY = "yyyy-MM-dd";
+
+    //年月
+    public static final String YEAR_MONTH = "yyyy-MM";
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/BeanModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/BeanModel.java
new file mode 100644
index 0000000..f9436cf
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/BeanModel.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @CreateDate 2022/4/19 9:26
+ * @Author 尹肖
+ */
+@Data
+public class BeanModel {
+    private String key;
+    private String name;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamApprovalHisModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamApprovalHisModel.java
new file mode 100644
index 0000000..83dd5e3
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamApprovalHisModel.java
@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @CreateDate 2022/5/10 14:26
+ * @Author 尹肖
+ */
+@Data
+public class EamApprovalHisModel {
+
+    @ApiModelProperty(name = "主键")
+    private Long id;
+
+    @ApiModelProperty(name = "单号")
+    private String orderNo;
+
+    @ApiModelProperty(name = "状态")
+    private String itemStatus;
+
+    @ApiModelProperty(name = "设备编码")
+    private String equCode;
+
+    @ApiModelProperty(name = "设备名称")
+    private String equName;
+
+    @ApiModelProperty(name = "图片")
+    private String picture;
+
+    @ApiModelProperty(name = "修改人")
+    private String modifyUser;
+
+    @ApiModelProperty(name = "修改时间")
+    private String modifyDatetime;
+
+    @ApiParam(value = "审批状态")
+    private String approvalState = EamEnumUtil.APPROVAL_STATE.NO.getValue();
+
+    @ApiParam(value = "审批结果")
+    private String approvalResult;
+
+    @ApiParam(value = "审批人")
+    private String approvalUser;
+
+    @ApiParam(value = "审批时间")
+    private String approvalTime;
+
+    @ApiParam("耗时")
+    private Long elapse;
+
+    private String org;
+
+    @ApiParam("图片")
+   private String fileRoute;
+
+    @ApiParam(value = "故障现象")
+    private String falutShow;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamBetweenFailuresModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamBetweenFailuresModel.java
new file mode 100644
index 0000000..640c027
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamBetweenFailuresModel.java
@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @CreateDate 2022/5/31 9:47
+ * @Author 尹肖
+ */
+@Data
+public class EamBetweenFailuresModel {
+
+    @ApiParam(value = "工厂")
+    private String organizeCode;
+
+    @ApiParam(value = "任务单号")
+    private String orderNo;
+
+    @ApiParam(value = "设备编号")
+    private String equCode;
+
+    @ApiParam(value = "设备名称")
+    private String equName;
+
+    @ApiParam(value = "故障")
+    private String falutShow;
+
+    @ApiParam(value = "处理方法")
+    private String itemMethod;
+
+    @ApiParam(value = "完成时间")
+    private String completeTime;
+
+    @ApiParam(value = "保修时间")
+    private String planDateTime;
+
+    @ApiParam(value = "实际维修时间")
+    private String factStartTime;
+
+    @ApiParam("响应时间(/分钟)")
+    private Long elapse;
+
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamCsDetailModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamCsDetailModel.java
new file mode 100644
index 0000000..40f5445
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamCsDetailModel.java
@@ -0,0 +1,133 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.pojo.EamAreaPartGroup;
+import cn.estsh.i3plus.pojo.eam.pojo.EamStock;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description : 盘点明细model
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-05-18 10:04
+ * @Modify:
+ **/
+@Data
+public class EamCsDetailModel extends CommonBean {
+
+    @ApiParam(value = "单位")
+    private Double price;
+
+    @ApiParam(value = "物料规格")
+    private String partSpec;
+
+    @ApiParam(value = "最大库存")
+    private Double max;
+
+    @ApiParam(value = "最小库存")
+    private Double min;
+
+    @ApiParam(value = "前年结转数量")
+    private Double lastYearStock;
+
+    @ApiParam(value = "前年结转金额")
+    private Double lastYearTotalPrice;
+
+    @ApiParam(value = "本月出库数量")
+    private Double monthOutStock;
+
+    @ApiParam(value = "本月出库金额")
+    private Double monthOutTotalPrice;
+
+    @ApiParam(value = "本月入库数量")
+    private Double monthInStock;
+
+    @ApiParam(value = "类别描述")
+    private String partGroupDesc;
+
+    @ApiParam(value = "区域描述")
+    private String areaDesc;
+
+    @ApiParam(name = "单据号", value = "盘点单")
+    private String orderNo;
+
+    @ApiParam(name = "区域", value = "区域")
+    private String area;
+
+    @ApiParam(name = "类别", value = "类别")
+    private String partGroup;
+
+    @ApiParam(name = "备品备件管理编码", value = "备品备件管理编码")
+    private String partNo;
+
+    @ApiParam(name = "备品备件名称", value = "备品备件名称")
+    private String partName;
+
+    @ApiParam(name = "是否紧急", value = "是否紧急")
+    private Integer isUrgent;
+
+    @ApiParam(name = "单据状态", value = "单据状态")
+    private String itemStatus;
+
+    @ApiParam(name = "在库数量", value = "在库数量")
+    private Double partQty;
+
+    @ApiParam(name = "实盘数量", value = "实盘数量")
+    private Double factQty;
+
+    /**
+     * 相当于库位
+     */
+    @ApiParam(name = "实际保管场所", value = "保管场所")
+    private String factKeepingArea;
+
+    @Column(name = "REMARK")
+    @ApiParam(name = "备注", value = "备注")
+    private String remark;
+
+    @Transient
+    @ApiParam(value = "差异数量")
+    private Double diffQty;
+
+    @Transient
+    @ApiParam(value = "区域类别集合")
+    public List<EamAreaPartGroup> eamAreaPartGroupList;
+
+    @Transient
+    @ApiParam(value = "备品备件集合")
+    private List<EamStock> eamStockList;
+
+    @Transient
+    @ApiParam(value = "区域str")
+    private String areaStr;
+
+    @Transient
+    @ApiParam(value = "类别Str")
+    private String partGroupStr;
+
+    @Transient
+    @ApiParam(value = "备品备件管理编码Str")
+    private String partNoStr;
+
+    @Transient
+    @ApiParam(value = "单据状态")
+    private String orderStatus;
+
+    @Transient
+    @ApiParam(value = "单据状态")
+    private String orderStatusVal;
+
+    @ApiParam(name = "是否紧急", value = "是否紧急")
+    private String isUrgentVal;
+
+    public String getIsUrgentVal() {
+        return CommonEnumUtil.TRUE_OR_FALSE.valueOf(this.isUrgent);
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamDocDetailsModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamDocDetailsModel.java
new file mode 100644
index 0000000..03b28e0
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamDocDetailsModel.java
@@ -0,0 +1,90 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+import cn.estsh.i3plus.pojo.eam.pojo.EamDocDetails;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Transient;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-06-02 14:21
+ * @Modify:
+ **/
+@Data
+public class EamDocDetailsModel extends EamDocDetails {
+
+    @Transient
+    @ApiParam(value = "计划日期")
+    private String planDate;
+
+    @Transient
+    @ApiParam(value = "计划时间")
+    private String planTime;
+
+    @Transient
+    @ApiParam(value = "部门")
+    private String deptName;
+
+    @Transient
+    @ApiParam(value = "故障现象")
+    private String falutShow;
+
+    @Transient
+    @ApiParam(value = "整体结果")
+    private String result;
+
+    @Transient
+    @ApiParam(value = "责任人")
+    private String resUser;
+
+    @Transient
+    @ApiParam(value = "金额")
+    private Double prlce;
+
+    @Transient
+    @ApiParam(value = "是否检查机")
+    private Boolean isIspectTool;
+
+    @Transient
+    @ApiParam(value = "生产线编码")
+    private String workcenter;
+
+    public EamDocDetailsModel() {
+    }
+
+    public EamDocDetailsModel(EamDocDetailsModel model) {
+
+        this.busiType = model.getBusiType();
+        this.equCode = model.getEquCode();
+        this.equName = model.getEquName();
+        this.opItemCode = model.getOpItemCode();
+        this.opItemResult = model.getOpItemResult();
+        this.maintainVendor = model.getMaintainVendor();
+        this.stand = model.getStand();
+        this.itmeDesc = model.getItmeDesc();
+        this.opItemRemark = model.getOpItemRemark();
+        this.remark = model.getRemark();
+        this.type = model.getType();
+        this.content = model.getContent();
+        this.method = model.getMethod();
+        this.picture = model.getPicture();
+        this.area = model.getArea();
+        this.partGroup = model.getPartGroup();
+        this.partNo = model.getPartNo();
+        this.partName = model.getPartName();
+        this.moveQty = model.getMoveQty();
+        this.srcQty = model.getSrcQty();
+        this.planDate = model.getPlanDate();
+        this.planTime = model.getPlanTime();
+        this.deptName = model.getDeptName();
+        this.falutShow = model.getFalutShow();
+        this.result = model.getResult();
+        this.resUser = model.getResUser();
+        this.prlce = model.getPrlce();
+        this.isIspectTool = model.getIsIspectTool();
+        this.workcenter = model.getWorkcenter();
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamDocMasterModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamDocMasterModel.java
new file mode 100644
index 0000000..3983ada
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamDocMasterModel.java
@@ -0,0 +1,98 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : zhanghaojie
+ * @CreateDate : 2022-06-13 下午12:57
+ * @Modify:
+ **/
+
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class EamDocMasterModel {
+    @ApiParam(name = "设备编码")
+    private String equCode;
+
+    @ApiParam(name = "设备名称")
+    private String equName;
+
+    @ApiParam(name = "实际开始时间")
+    private String factStartTime;
+
+    @ApiParam(name = "工厂代码")
+    private String organizeCode;
+
+    @ApiParam(name = "实际结束时间")
+    private String factEndTime;
+
+    @ApiParam(name = "生产线编码")
+    // TODO: 2022/6/15 需要产线弹窗来源接口
+    private String workcenter;
+
+    @ApiParam(name = "维修次数")
+    private int repairCount;
+
+    @ApiParam(name = "耗时")
+    private Long elapse;
+
+    @ApiParam(name = "耗时")
+    private String elapseStr;
+
+    @ApiParam(name = "保管场所")
+    private String workcenterCode;
+
+    @ApiParam(name = "业务类型")
+    private EamEnumUtil.EAM_DOC_BUSI_TYPE busiType;
+
+    @ApiParam(name = "状态")
+    private EamEnumUtil.ORDER_DOC_STATUS orderStatus;
+
+    @ApiParam(name = "时间维度")
+    private EamEnumUtil.TIME_DIMENSION timeDimension;
+
+    @ApiParam(name = "数据维度")
+    private EamEnumUtil.DATA_DIMENSION dataDimension;
+
+    @ApiParam(name = "占比")
+    private String proportion;
+
+    @ApiParam(name = "维修次数总数")
+    private int repairCounts;
+
+    private Map<String, Integer> returnMap;
+
+    private List<EamDocMasterModel> returnList;
+
+    public EamDocMasterModel(){}
+
+    public EamDocMasterModel(String equCode, String equName, String factStartTime, String factEndTime,
+                             String organizeCode, String workcenterCode){
+        this.equCode = equCode;
+        this.equName = equName;
+        this.factEndTime = factEndTime;
+        this.organizeCode=organizeCode;
+        this.factStartTime=factStartTime;
+        this.workcenterCode=workcenterCode;
+    }
+    public EamDocMasterModel(String equCode, String equName, String factStartTime, String factEndTime,
+                             String organizeCode){
+        this.equCode = equCode;
+        this.equName = equName;
+        this.factEndTime = factEndTime;
+        this.organizeCode=organizeCode;
+        this.factStartTime=factStartTime;
+    }
+
+    public EamDocMasterModel(String equCode, String equName, String workcenterCode){
+        this.workcenterCode = workcenterCode;
+        this.equCode=equCode;
+        this.equName=equName;
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamDocMasterPrintModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamDocMasterPrintModel.java
new file mode 100644
index 0000000..99bd6f5
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamDocMasterPrintModel.java
@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description:
+ * @CreateDate 2022/4/29 20:36
+ * @Author 尹肖
+ */
+@Data
+public class EamDocMasterPrintModel {
+
+    @Data
+    public static class Details {
+        @ApiParam(value = "项目内容")
+        private String itemName;
+
+        @ApiParam(value = "性质")
+        private String itmeDesc;
+
+        @ApiModelProperty(name = "实施要领")
+        private String method;
+
+        @ApiParam(value = "标准")
+        private String stand;
+
+        @ApiModelProperty(name = "周期")
+        private String date;
+    }
+
+    @ApiParam(name = "部门")
+    private String deptName;
+
+    @ApiModelProperty(name = "设备名称")
+    private String equName;
+
+    @ApiModelProperty(name = "设备编码")
+    private String equCode;
+
+    @ApiParam(name = "详细数据")
+    private List<Details> details = new ArrayList<>();
+
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamGdMouldModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamGdMouldModel.java
new file mode 100644
index 0000000..295ac48
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamGdMouldModel.java
@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @CreateDate 2022/6/9 14:09
+ * @Author 尹肖
+ */
+@Data
+public class EamGdMouldModel implements Serializable {
+
+    @ApiParam(name = "模具编码")
+    private String equCode;
+
+    @ApiParam(name = "上次保养时间")
+    private String lastMaintenanceTime;
+
+    @ApiParam(name = "模具库位")
+    private String locate;
+
+    @ApiParam(name = "预警数值")
+    private Double warn;
+
+    @ApiParam(name = "开合模次数")
+    private Double processCount = 0d;
+
+    @ApiParam(name = "显示颜色")
+    @AnnoOutputColumn(refClass = EamEnumUtil.SHOW_COLOR.class)
+    private String showColor = EamEnumUtil.SHOW_COLOR.NORMAL.getValue();
+
+    @ApiParam(name = "实际开始时间")
+    private String factStartTime;
+
+    @ApiParam(name = "实际完成时间")
+    private String factEndTime;
+
+    public EamGdMouldModel(String equCode, String factStartTime, String factEndTime) {
+        this.equCode = equCode;
+        this.factStartTime = factStartTime;
+        this.factEndTime = factEndTime;
+    }
+
+    public EamGdMouldModel() {
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamKanbanDocFaultCountModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamKanbanDocFaultCountModel.java
new file mode 100644
index 0000000..08a03fc
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamKanbanDocFaultCountModel.java
@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Api("设备管理看板-故障次数统计model")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class EamKanbanDocFaultCountModel {
+
+    @ApiParam(value = "保管区域")
+    private String manageArea;
+
+    @ApiParam("数量")
+    private Integer count = 0;
+
+    @ApiParam("占比")
+    private String proportion;
+
+    @ApiParam("颜色")
+    private String color;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamKanbanDocRepairStateDetailModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamKanbanDocRepairStateDetailModel.java
new file mode 100644
index 0000000..00e1503
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamKanbanDocRepairStateDetailModel.java
@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Api("设备管理看板-维修情况明细model")
+@Data
+public class EamKanbanDocRepairStateDetailModel {
+
+    @ApiParam("已创建统计数")
+    private Integer createCount = 0;
+
+    @ApiParam("处理中统计数")
+    private Integer processingCount = 0;
+
+    @ApiParam("已完成统计数")
+    private Integer completedCount = 0;
+
+    @ApiParam("未完结统计数")
+    private Integer unfinishedCount = 0;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamKanbanDocRepairStateModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamKanbanDocRepairStateModel.java
new file mode 100644
index 0000000..ffc3835
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamKanbanDocRepairStateModel.java
@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Api("设备管理看板-维修情况model")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class EamKanbanDocRepairStateModel {
+
+    @ApiParam("当日维修情况")
+    private EamKanbanDocRepairStateDetailModel sameDay;
+
+    @ApiParam("当月维修情况")
+    private EamKanbanDocRepairStateDetailModel sameMonth;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamKanbanStockProportionDetailModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamKanbanStockProportionDetailModel.java
new file mode 100644
index 0000000..d914316
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamKanbanStockProportionDetailModel.java
@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Api("设备管理看板-备品备件明细model")
+@Data
+public class EamKanbanStockProportionDetailModel {
+
+    @ApiParam("区域")
+    private String area;
+
+    @ApiParam("数量")
+    private Long count;
+
+    @ApiParam("占比")
+    private String proportion;
+
+    @ApiParam("颜色")
+    private String partGroupColor = "#FFFFFF";
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamKanbanStockProportionModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamKanbanStockProportionModel.java
new file mode 100644
index 0000000..5f80bd1
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamKanbanStockProportionModel.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+@Api("设备管理看板-备品备件model")
+@Data
+public class EamKanbanStockProportionModel {
+
+    @ApiParam("总金额")
+    private String totalAmount;
+
+    @ApiParam("区域占比")
+    private List<EamKanbanStockProportionDetailModel> areaProportion;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamStaticStockModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamStaticStockModel.java
new file mode 100644
index 0000000..b3ad31a
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamStaticStockModel.java
@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :静态库存表model
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-05-22 12:00
+ * @Modify:
+ **/
+@Data
+public class EamStaticStockModel extends BaseBean {
+
+    @ApiParam(value = "操作类型")
+    String moveType;
+
+    @ApiParam(value = "当前4月1号")
+    private String nowApril;
+
+    @ApiParam(value = "上个月最后一天")
+    private String lastMonthLastDay;
+
+    @ApiParam(value = "上个月第一天")
+    private String lastMonthFristDay;
+
+    @ApiParam(value = "备品备件管理编码")
+    private String partNo;
+
+    @ApiParam(value = "汇总出入数量")
+    private Double sumMoveQty;
+
+    public EamStaticStockModel() {
+    }
+
+    public EamStaticStockModel(String partNo, Double sumMoveQty) {
+        this.partNo = partNo;
+        this.sumMoveQty = sumMoveQty;
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamSxReqModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamSxReqModel.java
new file mode 100644
index 0000000..2b109b3
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamSxReqModel.java
@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @CreateDate 2022/6/14 15:40
+ * @Author 尹肖
+ */
+@Data
+public class EamSxReqModel{
+
+    private Pager pager;
+
+    private String equCode;
+
+    private String orderNo;
+
+    private String modifyDatetimeStart;
+
+    private String modifyDatetimeEnd;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamkanbanMaintainanceRuleModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamkanbanMaintainanceRuleModel.java
new file mode 100644
index 0000000..0b586b1
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EamkanbanMaintainanceRuleModel.java
@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Api("设备年度保养情况看板-保养计划")
+@Data
+public class EamkanbanMaintainanceRuleModel {
+
+    @ApiParam("当前4月-次年3月")
+    private Integer month;
+
+    @ApiParam("保养计划统计")
+    private Integer planCount = 0;
+
+    @ApiParam("保养实际统计")
+    private Integer factCount = 0;
+
+
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EquRestModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EquRestModel.java
new file mode 100644
index 0000000..d331379
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EquRestModel.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @CreateDate 2022/6/24 20:03
+ * @Author 尹肖
+ */
+@Data
+public class EquRestModel {
+
+    private Long id;
+
+    private List<String> urlIds;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EquipmentLedgerStatusModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EquipmentLedgerStatusModel.java
new file mode 100644
index 0000000..e058ecd
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/EquipmentLedgerStatusModel.java
@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :设备台账状态汇总看板model
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate : 2022-06-08 16:20
+ * @Modify:
+ **/
+@Data
+public class EquipmentLedgerStatusModel extends BaseBean {
+
+    /**
+     * 【设备台账】菜单中的启用状态的设备数量汇总
+     */
+    @ApiParam(value = "设备个数")
+    public String equipmentNum;
+
+    /**
+     * 取【设备台账】菜单中启用的设备类型，去重汇总
+     */
+    @ApiParam(value = "种类个数")
+    public Integer typeNum;
+
+    /**
+     * 取【设备台账】菜单中“是否检查机/检具”为“是”，且启用状态的数据汇总
+     */
+    @ApiParam(value = "治具/检具个数")
+    public String jinNum;
+
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/SxDocModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/SxDocModel.java
new file mode 100644
index 0000000..e450837
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/SxDocModel.java
@@ -0,0 +1,127 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @CreateDate 2022/6/2 11:08
+ * @Author 尹肖
+ */
+@Data
+public class SxDocModel implements Serializable {
+
+    private Long id;
+
+    @ApiParam(value = "单号")
+    private String orderNo;
+
+    @ApiParam(name = "部门")
+    private String deptName;
+
+    @ApiParam(value = "设备编码")
+    private String equCode;
+
+    @ApiParam(value = "设备名称")
+    private String equName;
+
+    @ApiParam(value = "责任人")
+    private String resUser;
+
+    @ApiParam(name = "保养方")
+    private String maintainVendor;
+
+    @ApiParam(name = "项目")
+    private String item;
+
+    @ApiParam(value = "金额")
+    private Double prlce;
+
+    @ApiParam(value = "周期")
+    private String orderNoType;
+
+    @ApiParam(value = "区分")
+    private String type;
+
+    @ApiParam(value = "点检内容,判断基准/(保养内容)")
+    private String content;
+
+    @ApiParam(value = "点检方法/(保养方法)")
+    private String method;
+
+    @ApiParam(value = "点检备注")
+    private String remark;
+
+    @ApiParam(name = "保养备注")
+    private String opItemRemark;
+
+    @ApiParam(value = "计划时间")
+    private String planTime;
+
+    @ApiParam(name = "计划日期")
+    private String planDate;
+
+    @ApiParam("耗时")
+    private Long elapse;
+
+    @ApiParam(value = "备品备件管理编码")
+    public String partNo;
+
+    @ApiParam(value = "备品备件名称")
+    public String partName;
+
+    @ApiParam(value = "出库数量")
+    public Double moveQty;
+
+    @ApiParam(value = "实际开始时间")
+    private String factStartTime;
+
+    @ApiParam(name = "实际完成时间")
+    private String factEndTime;
+
+    @ApiParam(value = "点检结果")
+    public String itmeDesc;
+
+    @ApiParam(value = "点检结果值")
+    private String itmeDescVal;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam(value = "修改人")
+    private String modifyUser;
+
+    @ApiParam(value = "修改时间")
+    private String modifyDatetime;
+
+    @ApiParam(name = "确认人")
+    private String confirmUser;
+
+    @ApiParam(name = "确认时间")
+    private String confirmDate;
+
+    @ApiParam(name = "是否标红")
+    private Integer isRed = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+    public SxDocModel() {
+    }
+
+    public void setItmeDesc(String itmeDesc) {
+        this.itmeDesc = itmeDesc;
+        if (!StringUtils.isEmpty(itmeDesc)) {
+            try {
+                this.itmeDescVal = EamEnumUtil.EAM_DOC_ITEM_DESC.valueOf(itmeDesc).getRemark();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/SxEquipmentModel.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/SxEquipmentModel.java
new file mode 100644
index 0000000..ec3827a
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/model/SxEquipmentModel.java
@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.eam.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("安灯设备model")
+public class SxEquipmentModel implements Serializable {
+
+    private static final long serialVersionUID = 5873059604861311898L;
+
+    @ApiParam("设备编码")
+    private String equCode;
+
+    @ApiParam(value = "设备名称")
+    private String equName;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("有效性")
+    private Integer isValid = 1;
+
+    @ApiParam("是否已删除")
+    private Integer isDeleted = 2;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamApprovalHis.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamApprovalHis.java
new file mode 100644
index 0000000..73c899d
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamApprovalHis.java
@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @CreateDate 2022/5/10 11:24
+ * @Author 尹肖
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EAM_APPROVAL_HIS", indexes = {
+        @Index(columnList = "ORDER_NO")
+
+})
+@ApiModel("审批履历表")
+public class EamApprovalHis extends CommonBean {
+
+    @ApiParam(value = "单号")
+    @Column(name = "ORDER_NO")
+    @FieldAnnotation(mainkey = true, popSearch = true, modify = false, defaultValue = "自动生成")
+    private String orderNo;
+
+    @ApiParam(value = "设备编码")
+    @Column(name = "EQU_CODE")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.MULTI_OBJECT, notEmpty = true, typeName = "Equipment")
+    private String equCode;
+
+    @ApiParam(value = "设备名称")
+    @Column(name = "EQU_NAME")
+    private String equName;
+
+    @ApiParam(value = "业务类型")
+    @Column(name = "BUSI_TYPE_CODE")
+    @FieldAnnotation(notEmpty = true)
+    private EamEnumUtil.EAM_DOC_BUSI_TYPE busiTypeCode;
+
+    @ApiParam(value = "审批结果")
+    @Column(name = "APPROVAL_RESULT")
+    @AnnoOutputColumn(refClass = EamEnumUtil.APPROVAL_RESULT.class)
+    private String approvalResult;
+
+    @ApiParam(value = "审批人")
+    @Column(name = "APPROVAL_USER")
+    private String approvalUser;
+
+    @ApiParam(value = "审批时间")
+    @Column(name = "APPROVAL_TIME")
+    private String approvalTime;
+
+    @ApiParam(value = "备注")
+    @Column(name = "REMARK")
+    private String remark;
+
+    @ApiParam(value = "计划日期")
+    @Column(name = "PLAN_DATE")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE, notEmpty = true)
+    private String planDate;
+
+    @ApiParam(value = "计划时间")
+    @Column(name = "PLAN_TIME")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.TIME, notEmpty = true)
+    private String planTime;
+
+    @ApiParam(value = "责任人")
+    @Column(name = "RES_USER")
+    private String resUser;
+
+    @ApiParam(value = "实际开始时间")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE_TIME, notEmpty = true)
+    private String factStartTime;
+
+    @ApiParam(value = "实际结束时间")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE_TIME, notEmpty = true)
+    private String factEndTime;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamAreaPartGroup.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamAreaPartGroup.java
new file mode 100644
index 0000000..dd98399
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamAreaPartGroup.java
@@ -0,0 +1,99 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+import javax.persistence.*;
+
+/**
+ * @Description : 区域类别关系
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-05-09 17:15
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "EAM_AREA_PART_GROUP", uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"AREA_PART_GROUP_CODE", "AREA", "PART_GROUP"})})
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Api(value = "区别类别关系", description = "区别类别关系")
+@ExcludeImportExport
+public class EamAreaPartGroup extends CommonBean {
+
+    @Column(name = "AREA_PART_GROUP_CODE")
+    @ApiParam(name = "区域类别编码")
+    @FieldAnnotation(popSearch = true)
+    private String areaPartGroupCode;
+
+    @Column(name = "AREA")
+    @ApiParam(name = "区域")
+    @FieldAnnotation(typeName = "EAM_AREA", mainkey = true, popSearch = true)
+    private String area;
+
+    @Transient
+    @ApiParam(name = "原区域代码")
+    @FieldAnnotation(readFunction = "getOriginalArea")
+    private String originalArea;
+
+    @Column(name = "AREA_DESC")
+    @ApiParam(name = "区域描述")
+    @FieldAnnotation(modify = false, display = false, popSearch = true)
+    private String areaDesc;
+
+    @Column(name = "PART_GROUP")
+    @ApiParam(name = "类别")
+    @FieldAnnotation(typeName = "EAM_PART_GROUP", mainkey = true, popSearch = true)
+    private String partGroup;
+
+    @Transient
+    @ApiParam(name = "原类别代码")
+    @FieldAnnotation(readFunction = "getOriginalPartGroup")
+    private String originalPartGroup;
+
+    @Column(name = "PART_GROUP_DESC")
+    @ApiParam(name = "类别描述")
+    @FieldAnnotation(modify = false, display = false, popSearch = true)
+    private String partGroupDesc;
+
+    @Transient
+    @ApiParam(name = "区域集合")
+    @FieldAnnotation(display = false)
+    private String areaStr;
+
+    @Column(name = "PART_GROUP_COLOR")
+    @ApiParam(name = "颜色")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.COLOR_PICKER)
+    private String partGroupColor;
+
+    @Column(name = "PART_GROUP_COLOR_RGB")
+    @ApiParam(name = "颜色RGB")
+    private String partGroupColorRgb;
+
+    public static Object funOriginalArea(Object[] bean) {
+        if (bean.length <= 0 || bean == null) {
+            return null;
+        }
+        return JSON.parseObject(JSON.toJSONString(bean[0]), EamAreaPartGroup.class).getArea();
+
+    }
+
+    public static Object funOriginalPartGroup(Object[] bean) {
+        if (bean.length <= 0 || bean == null) {
+            return null;
+        }
+        return JSON.parseObject(JSON.toJSONString(bean[0]), EamAreaPartGroup.class).getPartGroup();
+
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocCsDetails.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocCsDetails.java
new file mode 100644
index 0000000..7d3407f
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocCsDetails.java
@@ -0,0 +1,138 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.*;
+import java.util.List;
+
+/**
+ * @Description : 备品备件盘点明细表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-05-11 17:56
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "EAM_DOC_CS_DETAILS")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Api(value = "备品备件盘点明细表", description = "备品备件盘点明细表")
+@ExcludeImportExport
+public class EamDocCsDetails  extends CommonBean {
+
+    @Column(name = "ORDER_NO")
+        @ApiParam(name = "单据号",value = "盘点单")
+    private String orderNo;
+
+    @Column(name = "AREA")
+    @ApiParam(name = "区域",value = "区域")
+    private String area;
+
+    @Column(name = "PART_GROUP")
+    @ApiParam(name = "类别",value = "类别")
+    private String partGroup;
+
+    @Column(name = "PART_NO")
+    @ApiParam(name = "备品备件管理编码",value = "备品备件管理编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(name = "备品备件名称",value  = "备品备件名称")
+    private String partName;
+
+    @Column(name = "IS_URGENT")
+    @ApiParam(name = "是否紧急",value = "是否紧急")
+    @AnnoOutputColumn(refClass =  CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isUrgent;
+
+    @Column(name = "ITEM_STATUS")
+    @ApiParam(name = "单据状态",value = "单据状态")
+    @AnnoOutputColumn(refClass = EamEnumUtil.ORDER_DOC_STATUS.class, refForeignKey = "value", value = "description")
+    private String itemStatus;
+
+    @Column(name = "PART_QTY")
+    @ApiParam(name = "在库数量",value = "在库数量")
+    private Double partQty;
+
+    @Column(name = "FACT_QTY")
+    @ApiParam(name = "实盘数量",value = "实盘数量")
+    private Double factQty;
+
+    /**
+     * 相当于库位
+     */
+    @Column(name = "FACT_KEEPING_AREA")
+    @ApiParam(name = "实际保管场所",value = "保管场所")
+    private String factKeepingArea;
+
+    @Column(name = "REMARK")
+    @ApiParam(name = "备注",value = "备注")
+    private String remark;
+
+    @Transient
+    @ApiParam(value = "差异数量")
+    private Double diffQty;
+
+    @Transient
+    @ApiParam(value = "区域类别集合")
+    public List<EamAreaPartGroup> eamAreaPartGroupList;
+
+    @Transient
+    @ApiParam(value = "备品备件集合")
+    private List<EamStock> eamStockList;
+
+    @Transient
+    @ApiParam(value = "区域str")
+    private String areaStr;
+
+    @Transient
+    @ApiParam(value = "类别Str")
+    private String partGroupStr;
+
+    @Transient
+    @ApiParam(value = "备品备件管理编码Str")
+    private String partNoStr;
+
+    @Transient
+    @ApiParam(value = "单据状态")
+    private String orderStatus;
+
+    @Transient
+    @ApiParam(value = "单据状态")
+    private String orderStatusVal;
+
+    public EamDocCsDetails() {
+    }
+
+    public EamDocCsDetails(Long id, String orderNo, String orderStatus, String createUser, String modifyUser,
+                           String createDatetime, String modifyDatetime) {
+        this.id = id;
+        this.orderNo = orderNo;
+        this.orderStatus = orderStatus;
+        this.createUser = createUser;
+        this.modifyUser = modifyUser;
+        this.createDatetime = createDatetime;
+        this.modifyDatetime = modifyDatetime;
+    }
+
+    public String getOrderStatusVal() {
+        if (StringUtils.isEmpty(this.orderStatus)) {
+            return null;
+        }
+        return EamEnumUtil.ORDER_DOC_CS_STATUS.valueOfDescription(this.orderStatus);
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocCsMaster.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocCsMaster.java
new file mode 100644
index 0000000..e7d9b04
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocCsMaster.java
@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 备品备件盘点主表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-05-11 17:48
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "EAM_DOC_CS_MASTER")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Api(value = "备品备件盘点主表", description = "备品备件盘点主表")
+@ExcludeImportExport
+public class EamDocCsMaster extends CommonBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam(name = "单据号")
+    @FieldAnnotation(mainkey = true)
+    private String orderNo;
+
+    @Column(name = "ORDER_STATUS")
+    @ApiParam(name = "单据状态")
+    @AnnoOutputColumn(refClass = EamEnumUtil.ORDER_DOC_CS_STATUS.class, refForeignKey = "value", value = "description")
+    private String orderStatus;
+
+    @Transient
+    @ApiParam(value = "是否冻结")
+    private String isFreeze;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocDetails.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocDetails.java
new file mode 100644
index 0000000..45db17d
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocDetails.java
@@ -0,0 +1,166 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+import javax.persistence.*;
+
+/**
+ * @author ns
+ * @create 2022/4/13 0013 下午 17:34
+ * 点检单明细表
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EAM_DOC_DETAILS", indexes = {
+        @Index(columnList = "ORDER_NO")
+
+})//@Index(columnList = "REF_NO"
+@ApiModel("点检单明细实体类")
+public class EamDocDetails extends CommonBean {
+
+    @ApiParam(name = "单号")
+    @Column(name = "ORDER_NO")
+    @FieldAnnotation(mainkey = true)
+    private String orderNo;
+
+    @ApiParam(name = "行号")
+    @Column(name = "ITEM")
+    private String item;
+
+    @Column(name = "IS_ISPECT_TOOL")
+    @ApiParam(name = "是否检查机")
+    private Boolean isIspectTool;
+
+    @ApiParam(name = "状态")
+    @Column(name = "ITEM_STATUS")
+    private EamEnumUtil.EAM_DOC_STATUS itemStatus = EamEnumUtil.EAM_DOC_STATUS.CREATE;
+
+    @ApiParam(name = "业务类型")
+    @Column(name = "BUSI_TYPE")
+    @FieldAnnotation(notEmpty = true)
+    @Enumerated(EnumType.ORDINAL)
+    public EamEnumUtil.EAM_DOC_BUSI_TYPE busiType;
+
+    @ApiParam(name = "设备编码")
+    @Column(name = "EQU_CODE")
+    @FieldAnnotation(mainkey = true)
+    public String equCode;
+
+    @ApiParam(name = "设备名称")
+    @Column(name = "EQU_NAME")
+    public String equName;
+
+    @ApiParam(name = "操作项")
+    @Column(name = "OP_ITEM_CODE")
+    public String opItemCode;
+
+    @ApiParam(name = "操作项结果")
+    @Column(name = "OP_ITEM_RESULT")
+    public String opItemResult;
+
+    @Column(name = "MAINTAIN_VENDOR")
+    @ApiParam(name = "保养方")
+    public String maintainVendor;
+
+    @Column(name = "STAND")
+    @ApiParam(name = "操作项标准")
+    public String stand;
+
+    @Column(name = "ITEM_DESC")
+    @ApiParam(name = "作业项类别")
+    public String itmeDesc;
+
+    @ApiParam(name = "操作项备注")
+    @Column(name = "OP_ITEM_REMARK",columnDefinition="nvarchar(max)")
+    public String opItemRemark;
+
+    @ApiParam(name = "备注")
+    @Column(name = "REMARK",columnDefinition="nvarchar(max)")
+    public String remark;
+
+    @ApiParam(name = "区分")
+    @Column(name = "TYPE")
+    public String type;
+
+    @ApiParam(name = "内容")
+    @Column(name = "CONTENT")
+    public String content;
+
+    @ApiParam(name = "方法")
+    @Column(name = "METHOD")
+    public String method;
+
+    @ApiParam(name = "图片")
+    @Column(name = "PICTURE")
+    public String picture;
+
+    @Column(name = "AREA")
+    @ApiParam(name = "区域")
+    @FieldAnnotation(typeName = "EAM_AREA")
+    public String area;
+
+    @Column(name = "AREA_DESC")
+    @ApiParam(name = "区域描述")
+    @FieldAnnotation(modify = false, display = false, popSearch = true)
+    private String areaDesc;
+
+    @Column(name = "PART_GROUP")
+    @ApiParam(name = "类别")
+    @FieldAnnotation(typeName = "EAM_PART_GROUP")
+    public String partGroup;
+
+    @Column(name = "PART_GROUP_DESC")
+    @ApiParam(name = "类别描述")
+    @FieldAnnotation(modify = false, display = false, popSearch = true)
+    private String partGroupDesc;
+
+    @Column(name = "PART_NO")
+    @ApiParam(name = "备品备件管理编码")
+    public String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(name = "备品备件名称")
+    public String partName;
+
+    @Column(name = "MOVE_QTY")
+    @ApiParam(name = "出库数量")
+    public Double moveQty;
+
+    @Column(name = "SRC_QTY")
+    @ApiParam(name = "在库数量")
+    public Double srcQty;
+
+    @Column(name = "CONFIRM_USER")
+    @ApiParam(name = "确认人")
+    private String confirmUser;
+
+    @Column(name = "CONFIRM_DATE")
+    @ApiParam(name = "确认时间")
+    private String confirmDate;
+
+    @ApiParam(name = "发起确认人")
+    @Column(name = "ORIGINATE_NAME")
+    private String originateName;
+
+    @ApiParam(name = "发起确认人时间")
+    @Column(name = "ORIGINATE_TIME")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE_TIME)
+    private String originateTime;
+
+    @ApiParam(name = "品质确认人")
+    @Column(name = "QC_USER")
+    private String qcUser;
+
+    @ApiParam(name = "品质确认时间")
+    @Column(name = "QC_TIME")
+    private String qcTime;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocMaster.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocMaster.java
new file mode 100644
index 0000000..94a3202
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocMaster.java
@@ -0,0 +1,246 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+import javax.persistence.*;
+
+/**
+ * @author ns
+ * @create 2022/4/13 0013 下午 17:33
+ * 点检单主表
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EAM_DOC_MASTER", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "REF_NO")
+})
+@ApiModel("点检单主表实体类")
+public class EamDocMaster extends CommonBean {
+
+    @ApiParam(name = "单号")
+    @Column(name = "ORDER_NO")
+    @FieldAnnotation(mainkey = true, popSearch = true, modify = false, defaultValue = "自动生成")
+    private String orderNo;
+
+    @ApiParam(name = "业务类型")
+    @Column(name = "BUSI_TYPE")
+    @FieldAnnotation(notEmpty = true)
+    @Enumerated(EnumType.ORDINAL)
+    private EamEnumUtil.EAM_DOC_BUSI_TYPE busiType;
+
+    @ApiParam(name = "维修业务类型")
+    @Column(name = "REPAIR_BUSI_TYPE")
+    @FieldAnnotation(notEmpty = true)
+    @Enumerated(EnumType.ORDINAL)
+    private EamEnumUtil.EAM_REPAIR_DOC_BUSI_TYPE repairBusiType;
+
+    @ApiParam(name = "周期")
+    @Column(name = "ORDER_NO_TYPE")
+    @FieldAnnotation(notEmpty = true)
+    private String orderNoType = "年点检";
+
+    @ApiParam(name = "关联单据编号")
+    @Column(name = "REF_NO")
+    private String refNo;
+
+    @ApiParam(name = "关联单据类型")
+    @Column(name = "REF_TYPE")
+    private Integer refType;
+
+    @ApiParam(name = "设备编码")
+    @Column(name = "EQU_CODE")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.MULTI_OBJECT, notEmpty = true, typeName = "Equipment")
+    private String equCode;
+
+    @ApiParam(name = "设备名称")
+    @Column(name = "EQU_NAME")
+    private String equName;
+
+    @ApiParam(name = "计划日期")
+    @Column(name = "PLAN_DATE")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE, notEmpty = true)
+    private String planDate;
+
+    @ApiParam(name = "计划时间")
+    @Column(name = "PLAN_TIME")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.TIME, notEmpty = true)
+    private String planTime;
+
+    @ApiParam(name = "优先级")
+    @Column(name = "PRIORITY")
+    private Integer priority;
+
+    @ApiParam(name = "部门")
+    @Column(name = "DEPT_NAME")
+    private String deptName;
+
+    @ApiParam(name = "故障现象")
+    @Column(name = "FALUT_SHOW")
+    private String falutShow;
+
+    @ApiParam(name = "实际开始时间")
+    @Column(name = "FACT_START_TIME")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE_TIME, notEmpty = true)
+    private String factStartTime;
+
+    @ApiParam(name = "实际结束时间")
+    @Column(name = "FACT_END_TIME")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE_TIME, notEmpty = true)
+    private String factEndTime;
+
+    @ApiParam(name = "整体结果")
+    @Column(name = "RESULT")
+    private String result;
+
+    @ApiParam(name = "责任人")
+    @Column(name = "RES_USER")
+    private String resUser;
+
+    @ApiParam(name = "金额")
+    @Column(name = "PRLCE")
+    private Double prlce;
+
+    @ApiParam(name = "状态")
+    @Column(name = "ORDER_STATUS")
+    @Enumerated(EnumType.ORDINAL)
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE_TIME, notEmpty = true, display = false)
+    private EamEnumUtil.EAM_DOC_STATUS orderStatus = EamEnumUtil.EAM_DOC_STATUS.CREATE;
+
+    @Lob
+    @ApiParam(name = "备注")
+    @Column(name = "REMARK")
+    private String remark;
+
+    @Column(name = "IS_ISPECT_TOOL")
+    @ApiParam(name = "是否检查机")
+    private Boolean isIspectTool;
+
+    @ApiParam(name = "生产线编码")
+    @Column(name = "WORK_CENTER")
+    private String workcenter;
+
+    @Column(name = "KEEPING_AREA")
+    @ApiParam(name = "保管场所")
+    private String keepingArea;
+
+    @Column(name = "DOCMASTER_JPG")
+    @ApiParam(name = "主页图片")
+    private String docmasterJpg;
+
+    @Column(name = "DOCMASTER_JPG_ID")
+    @ApiParam(name = "主页图片ID")
+    private String docmasterJpgId;
+
+    @Column(name = "FILE_ROUTE")
+    @ApiParam(name = "资产参考文档")
+    @FieldAnnotation(popSearch = true, modify = false)
+    private String fileRoute;
+
+    @Column(name = "FILE_ROUTE_ID")
+    @ApiParam(name = "资产参考文档id")
+    @FieldAnnotation(modify = false, display = false, isShow = false)
+    private String fileRouteId;
+
+    @Column(name = "IS_OUT_REPAIR")
+    @ApiParam(name = "是否委外")
+    private Boolean isOutRepair;
+
+    @Column(name = "REPAIR_PRLCE")
+    @ApiParam(name = "委外费用")
+    private Double repairPrlce;
+
+    @Transient
+    @ApiParam(name = "是否标红底")
+    @FieldAnnotation(display = false)
+    private Integer isRed = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+    @Transient
+    @ApiParam("耗时")
+    private Long elapse;
+
+    @Transient
+    @ApiParam("任务完成率")
+    private String taskCompletionRate;
+
+    @Transient
+    @ApiParam(name = "平均维修时间")
+    private Double averRepairTime;
+
+    @Transient
+    @ApiParam(name = "故障次数")
+    private Integer failNum;
+
+    @Transient
+    @FieldAnnotation(display = false)
+    private String orderStatusVal;
+
+    @Transient
+    @FieldAnnotation(display = false)
+    private String busiTypeVal;
+
+    public String getOrderStatusVal() {
+        return this.orderStatus.getDescription();
+    }
+
+    public String getBusiTypeVal() {
+        return this.busiType.getDescription();
+    }
+
+    @ApiParam(name = "发起确认人")
+    @Column(name = "ORIGINATE_NAME")
+    private String originateName;
+
+    @ApiParam(name = "发起确认人时间")
+    @Column(name = "ORIGINATE_TIME")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE_TIME)
+    private String originateTime;
+
+    @ApiParam(name = "品质确认人")
+    @Column(name = "QC_USER")
+    private String qcUser;
+
+    @ApiParam(name = "品质确认时间")
+    @Column(name = "QC_TIME")
+    private String qcTime;
+
+
+    @ApiParam(name = "安灯编号")
+    @Column(name = "ANDON_ORDER_NO")
+    private String andonOrderNo;
+
+    @Transient
+    @ApiParam(name = "录入故障原因")
+    public String opItemRemark;
+
+    @Transient
+    @ApiParam(name = "录入故障方法")
+    public String method;
+
+    @Transient
+    @ApiParam(value = "备品备件管理编码")
+    public String partNo;
+
+    @Transient
+    @ApiParam(value = "备品备件名称")
+    public String partName;
+
+    @Transient
+    @ApiParam(value = "出库数量")
+    public Double moveQty;
+
+    @Transient
+    @ApiParam(name = "是否检查机汉字")
+    private String inspectionMachine;
+
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocMasterTask.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocMasterTask.java
new file mode 100644
index 0000000..4e53e8e
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocMasterTask.java
@@ -0,0 +1,140 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+import javax.persistence.*;
+
+/**
+ * @author ns
+ * @create 2022/4/13 0013 下午 17:33
+ * 点检单主表
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EAM_DOC_MASTER_TASK", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "REF_NO")
+})
+@ApiModel("任务报表实体类")
+public class EamDocMasterTask extends CommonBean {
+
+    @ApiParam(value = "单号")
+    @Column(name = "ORDER_NO")
+    @FieldAnnotation(mainkey = true, popSearch = true, modify = false, defaultValue = "自动生成")
+    private String orderNo;
+
+    @ApiParam(value = "业务类型")
+    @Column(name = "BUSI_TYPE")
+    @FieldAnnotation(notEmpty = true)
+    @Enumerated(EnumType.ORDINAL)
+    private EamEnumUtil.EAM_DOC_BUSI_TYPE busiType;
+
+    @ApiParam(value = "周期")
+    @Column(name = "ORDER_NO_TYPE")
+    @FieldAnnotation(notEmpty = true)
+    private String orderNoType = "年点检";
+
+    @ApiParam(value = "关联单据编号")
+    @Column(name = "REF_NO")
+    private String refNo;
+
+    @ApiParam(value = "关联单据类型")
+    @Column(name = "REF_TYPE")
+    private Integer refType;
+
+    @ApiParam(value = "设备编码")
+    @Column(name = "EQU_CODE")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.MULTI_OBJECT, notEmpty = true, typeName = "Equipment")
+    private String equCode;
+
+    @ApiParam(value = "设备名称")
+    @Column(name = "EQU_NAME")
+    private String equName;
+
+    @ApiParam(value = "计划日期")
+    @Column(name = "PLAN_DATE")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE, notEmpty = true)
+    private String planDate;
+
+    @ApiParam(value = "计划时间")
+    @Column(name = "PLAN_TIME")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.TIME, notEmpty = true)
+    private String planTime;
+
+    @ApiParam(value = "优先级")
+    @Column(name = "PRIORITY")
+    private Integer priority;
+
+    @ApiParam(value = "部门")
+    @Column(name = "DEPT_NAME")
+    private String deptName;
+
+    @ApiParam(value = "故障现象")
+    @Column(name = "FALUT_SHOW")
+    private String falutShow;
+
+    @ApiParam(value = "实际开始时间")
+    @Column(name = "FACT_START_TIME")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE_TIME, notEmpty = true)
+    private String factStartTime;
+
+    @ApiParam(value = "实际结束时间")
+    @Column(name = "FACT_END_TIME")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE_TIME, notEmpty = true)
+    private String factEndTime;
+
+    @ApiParam(value = "整体结果")
+    @Column(name = "RESULT")
+    private String result;
+
+    @ApiParam(value = "责任人")
+    @Column(name = "RES_USER")
+    private String resUser;
+
+    @ApiParam(value = "金额")
+    @Column(name = "PRLCE")
+    private Double prlce;
+
+    @ApiParam(value = "状态")
+    @Column(name = "ORDER_STATUS")
+    @Enumerated(EnumType.ORDINAL)
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE_TIME, notEmpty = true, display = false)
+    private EamEnumUtil.EAM_DOC_STATUS orderStatus = EamEnumUtil.EAM_DOC_STATUS.CREATE;
+
+    @Lob
+    @ApiParam(value = "备注")
+    @Column(name = "REMARK")
+    private String remark;
+
+    @Column(name = "IS_ISPECT_TOOL")
+    @ApiParam(value = "是否检查机")
+    private Boolean isIspectTool;
+
+    @ApiParam(value = "生产线编码")
+    @Column(name = "WORKCENTER")
+    private String workcenter;
+
+    @Transient
+    @ApiParam(value = "是否标红底")
+    @FieldAnnotation(display = false)
+    private Integer isRed = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+    @Transient
+    @ApiParam("耗时")
+    private Long elapse;
+
+    @Transient
+    @ApiParam("任务完成率")
+    private String taskCompletionRate;
+
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocMovementDetail.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocMovementDetail.java
new file mode 100644
index 0000000..a20c05e
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocMovementDetail.java
@@ -0,0 +1,122 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 备品备件单据明细表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-05-09 14:23
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "EAM_DOC_MOVEMENT_DETAIL")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Api(value = "备品备件单据明细表", description = "备品备件单据明细表")
+@ExcludeImportExport
+public class EamDocMovementDetail extends CommonBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam(name = "单据号")
+//    @FieldAnnotation(mainkey = true)
+    private String orderNo;
+
+    @Column(name = "ITEM_STATUS")
+    @ApiParam(name = "单据状态")
+    @AnnoOutputColumn(refClass = EamEnumUtil.ORDER_DOC_STATUS.class, refForeignKey = "value", value = "description")
+    private String itemStatus;
+
+    @Column(name = "AREA")
+    @ApiParam(name = "区域")
+    @FieldAnnotation(typeName = "EAM_AREA")
+    private String area;
+
+    @Column(name = "PART_GROUP")
+    @ApiParam(name = "类别")
+    @FieldAnnotation(typeName = "EAM_PART_GROUP")
+    private String partGroup;
+
+    @Column(name = "PART_NO")
+    @ApiParam(name = "备品备件管理编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(name = "备品备件名称")
+    private String partName;
+
+    @Column(name = "SRC_QTY")
+    @ApiParam(name = "在库数量")
+    private Double srcQty;
+
+    @Column(name = "MOVE_QTY")
+    @ApiParam(name = "出入数量")
+    private Double moveQty;
+
+    @Transient
+    @ApiParam(name = "领用人")
+    private String takeUser;
+
+    @Transient
+    @ApiParam(name = "领用部门")
+    private String takeDepartment;
+
+    @Transient
+    @ApiParam(name = "操作类型")
+    private String moveType;
+
+    @Transient
+    @ApiParam(name = "最大库存")
+    private Double max;
+
+    @Transient
+    @ApiParam(name = "最小库存")
+    private Double min;
+
+    @Transient
+    @ApiParam(name = "类别描述")
+    private String partGroupDesc;
+
+    @Transient
+    @ApiParam(name = "区域描述")
+    private String areaDesc;
+
+    public EamDocMovementDetail() {
+    }
+
+    public EamDocMovementDetail(Long id, String orderNo, String area, String partGroup, String partNo, String partName, Double srcQty,
+                                Double moveQty, String takeUser, String takeDepartment, String areaDesc, String partGroupDesc,
+                                String createUser, String modifyUser, String createDatetime, String modifyDatetime) {
+        this.id = id;
+        this.orderNo = orderNo;
+        this.area = area;
+        this.partGroup = partGroup;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.srcQty = srcQty;
+        this.moveQty = moveQty;
+        this.takeUser = takeUser;
+        this.takeDepartment = takeDepartment;
+        this.areaDesc = areaDesc;
+        this.partGroupDesc = partGroupDesc;
+        this.createUser = createUser;
+        this.modifyUser = modifyUser;
+        this.createDatetime = createDatetime;
+        this.modifyDatetime = modifyDatetime;
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocMovementMaster.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocMovementMaster.java
new file mode 100644
index 0000000..6d69437
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamDocMovementMaster.java
@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 备品备件单据主表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-05-09 9:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "EAM_DOC_MOVEMENT_MASTER")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Api(value = "备品备件单据主表", description = "备品备件单据主表")
+@ExcludeImportExport
+public class EamDocMovementMaster extends CommonBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam(name = "单据号")
+    private String orderNo;
+
+    @Column(name = "MOVE_TYPE")
+    @ApiParam(name = "操作类型")
+    @AnnoOutputColumn(refClass = EamEnumUtil.ORDER_MOVE_TYPE.class, refForeignKey = "value", value = "description")
+    private String moveType;
+
+    @Column(name = "ORDER_STATUS")
+    @ApiParam(name = "单据状态")
+    @AnnoOutputColumn(refClass = EamEnumUtil.ORDER_DOC_STATUS.class, refForeignKey = "value", value = "description")
+    private String orderStatus;
+
+    @Column(name = "TAKE_USER")
+    @ApiParam(name = "领用人")
+    @FieldAnnotation
+    private String takeUser;
+
+    @Column(name = "TAKE_DEPARTMENT")
+    @ApiParam(name = "领用部门")
+    private String takeDepartment;
+
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamEquipmentContact.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamEquipmentContact.java
new file mode 100644
index 0000000..d3c81a5
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamEquipmentContact.java
@@ -0,0 +1,132 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+/**
+ * 设备联络单表
+ *
+ * @Author : gsz
+ * @date 2022/5/11 13:39
+ **/
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EAM_EQUIPMENT_CONTACT", indexes = {
+        @Index(columnList = "EQU_CONTACT_NO")
+})
+@ApiModel("设备联络单EamEquipmentContact")
+@ExcludeImportExport
+public class EamEquipmentContact extends CommonBean {
+
+    @ApiParam(name = "联络单号")
+    @Column(name = "EQU_CONTACT_NO")
+    @FieldAnnotation(mainkey = true, popSearch = true, modify = false, defaultValue = "自动生成")
+    private String equContactNo;
+
+    @ApiParam(name = "联络部门")
+    @Column(name = "EQU_CONTACT_DEP")
+    private String equContactDep;
+
+    @ApiParam(name = "联络原因区分代码")
+    @Column(name = "EQU_CAUSE_CODE")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.MULTI_OBJECT, notEmpty = true, typeName = "EamEquipmentContactCause")
+    private String equCauseCode;
+
+    @ApiParam(name = "联络原因区分")
+    @Column(name = "EQU_CAUSE_NAME")
+    private String equCauseName;
+
+    @ApiParam(name = "目的代码")
+    @Column(name = "EQU_PURPOSE_CODE")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.MULTI_OBJECT, notEmpty = true, typeName = "EamEquipmentContactPurpose")
+    private String equPurposeCode;
+
+    @ApiParam(name = "目的")
+    @Column(name = "EQU_PURPOSE_NAME")
+    private String equPurposeName;
+
+    @ApiParam(name = "具体需求内容")
+    @Column(name = "SPECIFIC_NEEDS")
+    private String specificNeeds;
+
+    @ApiParam(name = "答复内容")
+    @Column(name = "REPLY_CONTENT")
+    private String replyContent;
+
+    @ApiParam(name = "答复人")
+    @Column(name = "REPLY_USER")
+    private String replyUser;
+
+    @ApiParam(name = "答复时间")
+    @Column(name = "REPLY_TIME")
+    private String replyTime;
+
+    @ApiParam(name = "计划完成时间")
+    @Column(name = "PLAN_TIME")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE_TIME)
+    private String planTime;
+
+    @ApiParam(name = "提出部门确认人")
+    @Column(name = "SUBMIT_DEPARTMENT_USER")
+    private String submitDepartmentUser;
+
+    @ApiParam(name = "提出部门确认时间")
+    @Column(name = "SUBMIT_DEPARTMENT_TIME")
+    private String submitDepartmentTime;
+
+    @ApiParam(name = "实际完成时间")
+    @Column(name = "COMPLETE_TIME")
+    private String completeTime;
+
+    @ApiParam(name = "备注")
+    @Column(name = "REMARK")
+    private String remark;
+
+    @ApiParam(name = "是否允许编辑")
+    @Column(name = "IS_UPDATE")
+    private Boolean isUpdate;
+
+    @ApiParam(name = "是否品质确认")
+    @Column(name = "IS_QC")
+    private Boolean isQc = false;
+
+    @ApiParam(name = "验收确认人")
+    @Column(name = "ACCEPTANCE_USER")
+    private String acceptanceUser;
+
+    @ApiParam(name = "验收确认时间")
+    @Column(name = "ACCEPTANCE_TIME")
+    private String acceptanceTime;
+
+
+    @ApiParam(name = "品质确认人")
+    @Column(name = "QC_USER")
+    private String qcUser;
+
+    @ApiParam(name = "品质确认时间")
+    @Column(name = "QC_TIME")
+    private String qcTime;
+
+    @ApiParam(name = "状态")
+    @Column(name = "EQU_CON_STATUS")
+    private EamEnumUtil.EQU_CON_STATUS equConStatus = EamEnumUtil.EQU_CON_STATUS.CREATE;
+    /*
+    提出部门确认人	按钮【提出部门确认】	SUBMIT_DEPARTMENT_USER
+    提出部门确认时间	按钮【提出部门确认】	SUBMIT_DEPARTMENT_TIME
+    实际完成时间	当“计划完成时间”为空时，该字段不能有值（判断）	COMPLETE_TIME
+*/
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamEquipmentContactCause.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamEquipmentContactCause.java
new file mode 100644
index 0000000..630d39d
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamEquipmentContactCause.java
@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+/**
+ * 设备联络原因区分表
+ *
+ * @Author : gsz
+ * @date 2022/5/11 13:39
+ **/
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EAM_EQUIPMENT_CONTACT_CAUSE", uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"EQU_CAUSE_CODE"})
+})
+@ApiModel("设备联络原因区分EamEquipmentContactCause")
+@ExcludeImportExport
+public class EamEquipmentContactCause extends CommonBean {
+
+    @ApiParam(name = "联络原因区分代码")
+    @Column(name = "EQU_CAUSE_CODE")
+    @FieldAnnotation(mainkey = true, popSearch = true, popCondition = true)
+    private String equCauseCode;
+
+    @ApiParam(name = "联络原因区分")
+    @Column(name = "EQU_CAUSE_NAME")
+    @FieldAnnotation(popSearch = true)
+    private String equCauseName;
+
+
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamEquipmentContactPurpose.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamEquipmentContactPurpose.java
new file mode 100644
index 0000000..39b48ed
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamEquipmentContactPurpose.java
@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+/**
+ * 设备联络目的表
+ *
+ * @Author : gsz
+ * @date 2022/5/11 13:39
+ **/
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EAM_EQUIPMENT_CONTACT_PURPOSE", uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"EQU_PURPOSE_CODE"})
+})
+@ApiModel("设备联络目的EamEquipmentContactPurpose")
+@ExcludeImportExport
+public class EamEquipmentContactPurpose extends CommonBean {
+
+    @ApiParam(name = "目的代码")
+    @Column(name = "EQU_PURPOSE_CODE")
+    @FieldAnnotation(mainkey = true, popSearch = true, popCondition = true)
+    private String equPurposeCode;
+
+    @ApiParam(name = "目的")
+    @Column(name = "EQU_PURPOSE_NAME")
+    @FieldAnnotation(popSearch = true)
+    private String equPurposeName;
+
+
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamLabelTemplate.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamLabelTemplate.java
new file mode 100644
index 0000000..1af718b
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamLabelTemplate.java
@@ -0,0 +1,70 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.List;
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+/**
+ * @Description : 打印模板
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-08-18 11:00
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "Eam_LABEL_TEMPLATE", indexes = {
+        @Index(columnList = "TEMPLATE_CODE")
+})
+@Api(value = "打印模板", description = "打印模板")
+public class EamLabelTemplate extends CommonBean implements Serializable {
+
+    private static final long serialVersionUID = -7758794366003399222L;
+    @Column(name = "TEMPLATE_CODE")
+    @ApiParam(value = "模板代码")
+    private String templateCode;
+
+    @Column(name = "TEMPLATE_NAME")
+    @ApiParam(value = "模板名称")
+    private String templateName;
+
+    @Lob
+    @Column(name = "TEMPLATE_CONTENT")
+    @ApiParam(value = "模板内容")
+    private String templateContent;
+
+    @Column(name = "METHOD_CODE")
+    @ApiParam("方法代码")
+    private String methodCode;
+
+    @Column(name = "BATCH_METHOD_CODE")
+    @ApiParam("批量方法代码")
+    private String batchMethodCode;
+
+    @Lob
+    @Column(name = "OTHER_TEMPLATE_CONTENT")
+    @ApiParam(value = "第二个模板内容")
+    private String otherTemplateContent;
+
+    // 参数拼接，多参数都好分隔，后台在做处理
+    @ApiParam(value = "模板参数拼接")
+    @Transient
+    private String paramsPack;
+
+    @Transient
+    @ApiParam(value = "模板id对应的模板参数")
+    private List<EamLabelTemplateParam> labelTemplateParamList;
+
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamLabelTemplateParam.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamLabelTemplateParam.java
new file mode 100644
index 0000000..975f51b
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamLabelTemplateParam.java
@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description : 打印模板参数
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-08-18 11:00
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "EAM_LABEL_TEMPLATE_PARAM", indexes = {
+        @Index(columnList = "TEMPLATE_CODE")
+})
+@Api(value = "打印模板参数", description = "打印模板参数")
+public class EamLabelTemplateParam extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6834031991151345038L;
+    @Column(name = "TEMPLATE_ID")
+    @ApiParam(value = "模板ID", access = "模板ID", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long templateId;
+
+    @Column(name = "TEMPLATE_CODE")
+    @ApiParam(value = "模板代码")
+    private String templateCode;
+
+    @Column(name = "TEMPLATE_PARAM")
+    @ApiParam(value = "模板参数")
+    private String templateParam;
+
+    @Lob
+    @Column(name = "TEMPLATE_PARAM_TEXT")
+    @ApiParam(value = "模板参数描述")
+    private String templateParamText;
+
+    // 参数拼接，多参数都好分隔，后台在做处理
+    @ApiParam(value = "模板参数值")
+    @Transient
+    private String templateParamValue;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamLocate.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamLocate.java
new file mode 100644
index 0000000..0edfd03
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamLocate.java
@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 模具库位表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-04-20 14:29
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "EAM_LOCATE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@ExcludeImportExport
+@Api(value = "模具库位表", description = "模具库位表")
+public class EamLocate extends CommonBean {
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位代码")
+    private String locateNo;
+
+    @Column(name = "LOCATE_NAME")
+    @ApiParam(value = "库位名称")
+    private String locateName;
+
+    @Column(name = "IS_EMPTY")
+    @ApiParam(value = "库位状态")
+    @AnnoOutputColumn(refClass = EamEnumUtil.LOCATE_STATUS.class, refForeignKey = "value", value = "description")
+    private String isEmpty;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamManageLineRelation.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamManageLineRelation.java
new file mode 100644
index 0000000..5a8a2d2
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamManageLineRelation.java
@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.common.validator.InsertGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+import javax.validation.constraints.NotBlank;
+
+/**保管场所与产线关系表
+ * @Author : gsz
+ * @date 2022/5/17 19:39
+**/
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EAM_MANAGE_LINE_RELATION", uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"MANAGE_AREA"})})
+@ApiModel("保管场所与产线关系")
+@ExcludeImportExport
+public class EamManageLineRelation extends CommonBean {
+
+    //人为填写
+    @ApiParam(value = "保管区域")
+    @Column(name = "MANAGE_AREA")
+    @NotBlank(groups = InsertGroup.class)
+    private String manageArea;
+
+    //取“设备台账”中的保管场所（产线编码字段）,可多选
+    //多个保管场所之间用逗号隔开存储
+    @ApiParam(value = "保管场所")
+    @Column(name = "WORKCENTER_CODE")
+    @NotBlank(groups = InsertGroup.class)
+    @FieldAnnotation(popSearch = true, typeName = "Equipment", editType = COMMON_EDIT_TYPE.MULTI_OBJECT)
+    private String workcenterCode;
+
+    //"三基色"
+    @ApiParam(value = "颜色")
+    @Column(name = "MANAGE_COLOR")
+    private String manageColor;
+
+    //显示顺序 不能重复	必填，01，02，03……
+    @ApiParam(value = "显示顺序")
+    @Column(name = "MANAGE_ORDER")
+    @NotBlank(groups = InsertGroup.class)
+    private String manageOrder;
+
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamOpItem.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamOpItem.java
new file mode 100644
index 0000000..582ce6d
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamOpItem.java
@@ -0,0 +1,107 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @CreateDate 2022/4/11 9:31
+ * @Author 尹肖
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EAM_OP_ITEM")
+@Api("作业要求")
+@ExcludeImportExport
+public class EamOpItem extends CommonBean {
+
+    @Column(name = "ITEM_CODE")
+    @ApiParam(name = "作业项编码")
+    private String itemCode;
+
+    @Column(name = "OP_TYPE_CODE")
+    @ApiParam(name = "作业类型")
+    @FieldAnnotation(typeName = "EAM_OP_TYPE", mainkey = true)
+    private String opTypeCode;
+
+    @Column(name = "EQU_TYPE")
+    @ApiParam(name = "设备类型")
+    @FieldAnnotation(typeName = "TYPE1",notEmpty = true)
+    private String equType;
+
+    @Column(name = "ITEM_NAME")
+    @ApiParam(name = "作业项名称")
+    @FieldAnnotation(mainkey = true)
+    private String itemName;
+
+    @Column(name = "ITEM_DESC")
+    @ApiParam(name = "作业项类别")
+    @FieldAnnotation(mainkey = true)
+    private String itmeDesc;
+
+    @Column(name = "ITEM_METHOD")
+    @ApiParam(name = "作业项方法")
+    @FieldAnnotation(mainkey = true)
+    private String itemMethod;
+
+    @Column(name = "EQU_CODE")
+    @ApiParam(name = "设备编码")
+    @FieldAnnotation(popSearch = true, typeName = "Equipment", editType = COMMON_EDIT_TYPE.OBJECT, dynamicCalculate = true, mainkey = true)
+    private String equCode;
+
+    @Column(name = "EQU_NAME")
+    @ApiParam(name = "设备名称")
+    private String equName;
+
+    @Column(name = "MAX")
+    @ApiParam(name = "上限")
+    @FieldAnnotation(defaultValue = "0",editType = COMMON_EDIT_TYPE.DOUBLE)
+    private String max;
+
+    @Column(name = "MIN")
+    @ApiParam(name = "下限")
+    @FieldAnnotation(defaultValue = "0",editType = COMMON_EDIT_TYPE.DOUBLE)
+    private String min;
+
+    @Column(name = "STAND")
+    @ApiParam(name = "标准")
+    @FieldAnnotation(mainkey = true)
+    private String stand;
+
+    @Column(name = "IS_QUAN")
+    @ApiParam(name = "是否定量")
+    @FieldAnnotation(defaultValue = "false")
+    private Boolean isQuan;
+
+    @Column(name = "IS_PHOTO")
+    @ApiParam(name = "是否需要图片")
+    @FieldAnnotation(defaultValue = "false")
+    private Boolean itPhoto;
+
+    @Column(name = "IS_OUT_MAINTAIN")
+    @ApiParam(name = "是否委外保养")
+    private Boolean isOutMaintain;
+
+    @Column(name = "MAINTAIN_VENDOR")
+    @ApiParam(name = "保养方")
+    private String maintainVendor;
+    //    @JsonIgnore
+//    @ManyToMany(targetEntity = Equipment.class, cascade = CascadeType.ALL, mappedBy = "eamOpItemList")
+//    private List<Equipment> equipmentList;
+//
+//    @ManyToMany(targetEntity = EamEnum.class)
+//    @JoinColumn(name = "eamEnumList")
+//    private List<EamEnum> eamEnumList;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamOpItemMain.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamOpItemMain.java
new file mode 100644
index 0000000..917a819
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamOpItemMain.java
@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+/**
+ * @Description:
+ * @CreateDate 2022/4/11 9:31
+ * @Author 尹肖
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EAM_OP_ITEM_MAIN", indexes = {
+        @Index(columnList = "")
+})
+@Api("作业要求主界面")
+@ExcludeImportExport
+public class EamOpItemMain extends CommonBean {
+
+    @Column(name = "EQU_CODE")
+    @ApiParam(name = "设备编码")
+    @FieldAnnotation(popSearch = true, typeName = "Equipment", editType = COMMON_EDIT_TYPE.OBJECT, dynamicCalculate = true, mainkey = true)
+    private String equCode;
+
+    @Column(name = "EQU_NAME")
+    @ApiParam(name = "设备名称")
+    private String equName;
+
+    @Column(name = "IS_OUT_MAINTAIN")
+    @ApiParam(name = "是否委外保养")
+    private Boolean isOutMaintain;
+
+    @Column(name = "OP_TYPE_CODE")
+    @ApiParam(name = "作业类型")
+    @FieldAnnotation(typeName = "EAM_OP_TYPE", mainkey = true)
+    private String opTypeCode;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamPart.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamPart.java
new file mode 100644
index 0000000..832cbff
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamPart.java
@@ -0,0 +1,105 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+/**
+ * @Description:
+ * @CreateDate 2022/4/11 11:08
+ * @Author 尹肖
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EAM_PART", uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"PART_NO"})
+})
+@Api("备品备件清单")
+@ExcludeImportExport
+public class EamPart extends CommonBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam(name = "物料编码")
+    @FieldAnnotation(mainkey = true)
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(name = "物料名称")
+    private String partName;
+
+    @Column(name = "PART_SPEC")
+    @ApiParam(name = "物料规格")
+    private String partSpec;
+
+    @Column(name = "PART_QTY")
+    @ApiParam(name = "当前数量")
+    private Integer partQty;
+
+    @Column(name = "MAX")
+    @ApiParam(name = "最大库存")
+    private Double max;
+
+    @Column(name = "MIN")
+    @ApiParam(name = "最小库存")
+    private Double min;
+
+    @Column(name = "PART_TYPE")
+    @ApiParam(name = "物料类型")
+    @FieldAnnotation(typeName = "EAM_PART_TYPE")
+    private String partType;
+
+    @Column(name = "EQU_TYPE")
+    @ApiParam(name = "设备类型")
+    @FieldAnnotation(typeName = "TYPE1")
+    private String equType;
+
+    @Column(name = "PART_TYPE_DESC")
+    @ApiParam(name = "物料类型描述")
+    private String partTypeDesc;
+
+    @Column(name = "PRICE")
+    @ApiParam(name = "单价")
+    private Double price;
+
+    @Column(name = "PRICE_UNIT")
+    @ApiParam(name = "计价单位")
+    private String priceUnit;
+
+    @Column(name = "AREA")
+    @ApiParam(name = "区域")
+    @FieldAnnotation(typeName = "EAM_AREA", isShow = false)
+    private String area;
+
+    @Column(name = "PART_GROUP")
+    @ApiParam(name = "物料组")
+    @FieldAnnotation(typeName = "EAM_PART_GROUP", isShow = false)
+    private String partGroup;
+
+    @Column(name = "KEEPING_AREA")
+    @ApiParam(name = "保管场所")
+    private String keepingArea;
+
+    @Column(name = "EAM_AREA_PART_GROUP")
+    @ApiParam(name = "区域类别")
+    @FieldAnnotation(typeName = "EamAreaPartGroup", editType = COMMON_EDIT_TYPE.OBJECT, display = false, dynamicCalculate = true)
+    private String eamAreaPartGroup;
+
+    @Column(name = "EAM_AREA_PART_GROUP_NAME")
+    @ApiParam(name = "区域类别名称")
+    @FieldAnnotation(display = false)
+    private String eamAreaPartGroupName;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamPartOperateRecord.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamPartOperateRecord.java
new file mode 100644
index 0000000..29c9b92
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamPartOperateRecord.java
@@ -0,0 +1,81 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+import javax.persistence.*;
+
+/**
+ * @Description : 备品备件操作记录
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-05-09 14:28
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "EAM_PART_OPERATE_RECORD")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Api(value = "备品备件操作记录", description = "备品备件操作记录")
+@ExcludeImportExport
+public class EamPartOperateRecord extends CommonBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "单据号")
+    private String orderNo;
+
+    @Column(name = "MOVE_TYPE")
+    @ApiParam(value = "操作类型")
+    @AnnoOutputColumn(refClass = EamEnumUtil.ORDER_MOVE_TYPE.class, refForeignKey = "value", value = "description")
+    private String moveType;
+
+    @Column(name = "BUSI_TYPE")
+    @ApiParam(value = "业务类型")
+    @AnnoOutputColumn(refClass = EamEnumUtil.EAM_DOC_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    private String busiType;
+
+    @Column(name = "AREA")
+    @ApiParam(value = "区域")
+    @FieldAnnotation(typeName = "EAM_AREA")
+    private String area;
+
+    @Column(name = "PART_GROUP")
+    @ApiParam(value = "物料组")
+    @FieldAnnotation(typeName = "EAM_PART_GROUP")
+    private String partGroup;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "备品备件管理编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "备品备件名称")
+    private String partName;
+
+    @Column(name = "SRC_QTY")
+    @ApiParam(value = "原数量")
+    private Double srcQty;
+
+    @Column(name = "MOVE_QTY")
+    @ApiParam(value = "出入数量")
+    private Double moveQty;
+
+    @Column(name = "KEEPING_AREA")
+    @ApiParam(value = "实际保管场所")
+    private String KeepingArea;
+
+
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamPlanRule.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamPlanRule.java
new file mode 100644
index 0000000..7bbf49e
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamPlanRule.java
@@ -0,0 +1,99 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.common.validator.InsertGroup;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.PositiveOrZero;
+
+/**
+ * @author ns
+ * @create 2022/4/12 0012 下午 17:19
+ * 计划规则表
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EAM_PLAN_RULE", indexes = {
+        @Index(columnList = "EQU_CODE")
+})
+@ApiModel("EamPlanRule实体类")
+@ExcludeImportExport
+public class EamPlanRule extends CommonBean {
+
+    @ApiParam(name = "业务类型")
+    @Column(name = "BUSI_TYPE")
+    @NotNull(groups = InsertGroup.class)
+    @Enumerated(EnumType.ORDINAL)
+    @FieldAnnotation( modify = false, defaultValue ="CHECK")
+    private EamEnumUtil.EAM_DOC_BUSI_TYPE busiType = EamEnumUtil.EAM_DOC_BUSI_TYPE.CHECK;
+
+    @ApiParam(name = "设备编码")
+    @Column(name = "EQU_CODE")
+    @NotBlank(groups = InsertGroup.class)
+    @FieldAnnotation(mainkey = true, popSearch = true, typeName = "Equipment", editType = COMMON_EDIT_TYPE.OBJECT)
+    private String equCode;
+
+    @ApiParam(name = "设备名称")
+    @Column(name = "EQU_NAME")
+    private String equName;
+
+    @ApiParam(name = "设备等级")
+    @Column(name = "EQU_LEVEL")
+    @FieldAnnotation(typeName = "EAM_EQU_LEVEL")
+    private String equLevel;
+
+    @ApiParam(name = "频次")
+    @Column(name = "FREQUENCY")
+    @FieldAnnotation(typeName = "FREQUENCY", notEmpty = true)
+    private String frequency;
+
+    @ApiParam(name = "频次单位")
+    @Column(name = "UNIT")
+    private String unit;
+
+    @ApiParam(name = "提前创建天数,默认 0")
+    @Column(name = "ADV_DAYS")
+    @PositiveOrZero
+    private Integer advDays;
+
+    @Lob
+    @ApiParam(name = "备注")
+    @Column(name = "REMARK")
+    private String remark;
+
+    @ApiParam(name = "生产线编码")
+    @Column(name = "WORKCENTER")
+    @FieldAnnotation(typeName = "EAM_WORKCENTER")
+    private String workcenter;
+
+    @ApiParam(name = "上次生成的单号")
+    @Column(name = "LAST_ORDER_NO")
+    private String lastOrderNo;
+
+    @ApiParam(name = "上次生成的单号的时间")
+    @Column(name = "LAST_GENERATE_DATA_TIME")
+    private String lastGenerateDataTime;
+
+    @ApiParam(name = "下次生成的单号的时间")
+    @Column(name = "NEXT_GENERATE_DATA_TIME")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE_TIME)
+    private String nextGenerateDataTime;
+
+    @ApiParam(name = "根据corn表达式生成的下次执行时间")
+    @Column(name = "NEXT_CRON_DATA_TIME")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE_TIME)
+    private String nextCronDataTime;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamPlanRuleMaintenance.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamPlanRuleMaintenance.java
new file mode 100644
index 0000000..9c30ca6
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamPlanRuleMaintenance.java
@@ -0,0 +1,98 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.common.validator.InsertGroup;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.PositiveOrZero;
+
+/**
+ * @author ns
+ * @create 2022/4/12 0012 下午 17:19
+ * 计划规则表
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EAM_PLAN_RULE_MAINTENANCE",indexes = {
+        @Index(columnList = "EQU_CODE")
+})
+@ApiModel("EamPlanRuleMaintenance")
+@ExcludeImportExport
+public class EamPlanRuleMaintenance extends CommonBean {
+
+    @ApiParam(name = "业务类型")
+    @Column(name = "BUSI_TYPE")
+    @NotNull(groups = InsertGroup.class)
+    @Enumerated(EnumType.ORDINAL)
+    @FieldAnnotation( modify = false,defaultValue ="MAINTENANCE")
+    private EamEnumUtil.EAM_DOC_BUSI_TYPE busiType = EamEnumUtil.EAM_DOC_BUSI_TYPE.MAINTENANCE;
+
+    @ApiParam(name = "设备编码")
+    @Column(name = "EQU_CODE")
+    @NotBlank(groups = InsertGroup.class)
+    @FieldAnnotation(mainkey = true, popSearch = true, typeName = "Equipment", editType = COMMON_EDIT_TYPE.OBJECT)
+    private String equCode;
+
+    @ApiParam(name = "设备名称")
+    @Column(name = "EQU_NAME")
+    private String equName;
+
+    @ApiParam(name = "设备等级")
+    @Column(name = "EQU_LEVEL")
+    @NotNull(groups = InsertGroup.class)
+    private Integer equLevel;
+
+    @ApiParam(name = "频次")
+    @Column(name = "FREQUENCY")
+    @FieldAnnotation(typeName = "FREQUENCY", notEmpty = true)
+    private String frequency;
+
+    @ApiParam(name = "频次单位")
+    @Column(name = "UNIT")
+    private String unit;
+
+    @ApiParam(name = "提前创建天数,默认 0")
+    @Column(name = "ADV_DAYS")
+    @PositiveOrZero
+    private Integer advDays;
+
+    @Lob
+    @ApiParam(name = "备注")
+    @Column(name = "REMARK")
+    private String remark;
+
+    @ApiParam(name = "生产线编码")
+    @Column(name = "WORKCENTER")
+    @FieldAnnotation(typeName = "EAM_WORKCENTER", notEmpty = true)
+    @NotBlank(groups = InsertGroup.class)
+    private String workcenter;
+
+    @ApiParam(name = "上次生成的单号")
+    @Column(name = "LAST_ORDER_NO")
+    private String lastOrderNo;
+
+    @ApiParam(name = "上次生成的单号的时间")
+    @Column(name = "LAST_GENERATE_DATA_TIME")
+    private String lastGenerateDataTime;
+
+    @ApiParam(name = "下次生成的单号的时间")
+    @Column(name = "NEXT_GENERATE_DATA_TIME")
+    private String nextGenerateDataTime;
+
+    @ApiParam(name = "根据corn表达式生成的下次执行时间")
+    @Column(name = "NEXT_CRON_DATA_TIME")
+    private String nextCronDataTime;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamSn.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamSn.java
new file mode 100644
index 0000000..f6eb760
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamSn.java
@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description :模具条码表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-04-20 14:27
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "EAM_SN")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Api(value = "模具条码表", description = "模具条码表")
+@ExcludeImportExport
+public class EamSn extends CommonBean {
+
+    @Column(name = "SN")
+    @ApiParam(value = "条码")
+    private String sn;
+
+    @Column(name = "SN_STATUS")
+    @ApiParam(value = "条码状态")
+    @AnnoOutputColumn(refClass = EamEnumUtil.MOULD_SN_STATUS.class, refForeignKey = "value", value = "description")
+    private String snStatus;
+
+    @Column(name = "SN_ONLINE_STATUS")
+    @ApiParam(value = "条码上线状态")
+    @AnnoOutputColumn(refClass = EamEnumUtil.MOULD_OPERATE_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    private String snOnlineStatus;
+
+    @Column(name = "SN_QTY")
+    @ApiParam(value = "条码数量")
+    private Double snQty;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位代码")
+    private String locateNo;
+
+    @Column(name = "LOCATE_NAME")
+    @ApiParam(value = "库位名称")
+    private String locateName;
+
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamSnOperateRecord.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamSnOperateRecord.java
new file mode 100644
index 0000000..2c95602
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamSnOperateRecord.java
@@ -0,0 +1,74 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description :  模具条码操作记录表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-04-20 14:04
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "EAM_SN_OPERATE_RECORD")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Api(value = "模具条码操作记录表", description = "模具条码操作记录表")
+@ExcludeImportExport
+public class EamSnOperateRecord extends CommonBean {
+
+    @Column(name = "SN")
+    @ApiParam(value = "条码")
+    private String sn;
+
+    @Column(name = "SN_STATUS")
+    @ApiParam(value = "条码状态")
+    @AnnoOutputColumn(refClass = EamEnumUtil.MOULD_SN_STATUS.class, refForeignKey = "value", value = "description")
+    private String snStatus;
+
+    @Column(name = "OPERATE_MOVE_TYPE")
+    @ApiParam(value = "操作类型")
+    @AnnoOutputColumn(refClass = EamEnumUtil.MOULD_OPERATE_MOVE_TYPE.class, refForeignKey = "value", value = "description")
+    private String operateMoveType;
+
+    @Column(name = "OPERATE_BUSI_TYPE")
+    @ApiParam(value = "业务类型")
+    @AnnoOutputColumn(refClass = EamEnumUtil.MOULD_OPERATE_BUSI_TYPE.class, refForeignKey = "value", value = "description")
+    private String operateBusiType;
+
+    @Column(name = "OUT_REASON")
+    @ApiParam(value = "出库原因")
+    @AnnoOutputColumn(refClass = EamEnumUtil.MOULD_OUT_REASON.class, refForeignKey = "value", value = "description")
+    private String outReason;
+
+    @Column(name = "SN_QTY")
+    @ApiParam(value = "条码数量")
+    private Double snQty;
+
+    @Column(name = "OPERATE_TIME")
+    @ApiParam(value = "操作时间")
+    private String operateTime;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位代码")
+    private String locateNo;
+
+    @Column(name = "LOCATE_NAME")
+    @ApiParam(value = "库位名称")
+    private String locateName;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamStaticStock.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamStaticStock.java
new file mode 100644
index 0000000..53d1b4f
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamStaticStock.java
@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 静态库存表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-05-19 16:38
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "EAM_STATIC_STOCK")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Api(value = "静态库存表", description = "静态库存表")
+@ExcludeImportExport
+public class EamStaticStock extends CommonBean {
+
+    @Column(name = "YEAR")
+    @ApiParam(value = "年份")
+    private String year;
+
+    @Column(name = "MONTH")
+    @ApiParam(value = "月份")
+    private String month;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "备品备件编号")
+    private String partNo;
+
+    @Column(name = "LAST_YEAR_STOCK")
+    @ApiParam(value = "年库存")
+    private Double lastYearStock;
+
+    @Column(name = "MONTH_IN_STOCK")
+    @ApiParam(value = "月入库总量")
+    private Double monthInStock;
+
+    @Column(name = "MONTH_OUT_STOCK")
+    @ApiParam(value = "月出库总量")
+    private Double monthOutStock;
+
+    @Column(name = "MONTH_OUT_TOTAL_PRICE")
+    @ApiParam(value = "月出库总金额")
+    private Double monthOutTotalPrice;
+
+    @Column(name = "LAST_YEAR_TOTAL_PRICE")
+    @ApiParam(value = "年总金额")
+    private Double lastYearTotalPrice;
+
+
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamStock.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamStock.java
new file mode 100644
index 0000000..7f8549d
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EamStock.java
@@ -0,0 +1,140 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 备品备件库存表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-05-09 14:29
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "EAM_STOCK")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Api("备品备件库存表")
+@ExcludeImportExport
+public class EamStock extends CommonBean {
+
+    @Column(name = "AREA")
+    @ApiParam(name = "区域")
+    @FieldAnnotation(typeName = "EAM_AREA", mainkey = true)
+    private String area;
+
+    @Column(name = "PART_GROUP")
+    @ApiParam(name = "物料组")
+    @FieldAnnotation(typeName = "EAM_PART_GROUP", mainkey = true)
+    private String partGroup;
+
+    @Column(name = "PART_NO")
+    @ApiParam(name = "备品备件管理编码")
+    @FieldAnnotation(mainkey = true)
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(name = "备品备件名称")
+    private String partName;
+
+    @Column(name = "PART_QTY")
+    @ApiParam(name = "在库数量")
+    private Double partQty;
+
+    @Column(name = "IS_FREEZE")
+    @AnnoOutputColumn(refClass = EamEnumUtil.STOCK_STATUS.class, refForeignKey = "value", value = "description")
+    @ApiParam(name = "是否冻结")
+    @FieldAnnotation(excelExportVal = "getEamStockIsFreeze")
+    private EamEnumUtil.STOCK_STATUS isFreeze;
+
+    @Transient
+    @ApiParam(name = "最大库存")
+    private Double max;
+
+    @Transient
+    @ApiParam(name = "最小库存")
+    private Double min;
+
+    @Transient
+    @ApiParam(name = "类别集合")
+    private String partGroupStr;
+
+    @Transient
+    @ApiParam(name = "区域集合")
+    private String areaStr;
+
+    @Transient
+    @ApiParam(name = "保管场所")
+    private String keepingArea;
+
+    @Transient
+    @ApiParam(name = "类别描述")
+    private String partGroupDesc;
+
+    @Transient
+    @ApiParam(name = "区域描述")
+    private String areaDesc;
+
+    public EamStock() {
+    }
+
+    public EamStock(String area, String areaDesc, String partGroup, String partGroupDesc, String partNo, String partName,
+                    Double partQty, Double max, Double min,
+                    String createUser, String modifyUser, String createDatetime, String modifyDatetime, String organizeCode) {
+        this.area = area;
+        this.areaDesc = areaDesc;
+        this.partGroup = partGroup;
+        this.partGroupDesc = partGroupDesc;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.partQty = partQty;
+        this.max = max;
+        this.min = min;
+        this.createUser = createUser;
+        this.modifyUser = modifyUser;
+        this.createDatetime = createDatetime;
+        this.modifyDatetime = modifyDatetime;
+        this.organizeCode = organizeCode;
+    }
+
+    public EamStock(String area, String partGroup, String partNo, String partName, Double partQty,
+                    Double max, Double min, String keepingArea) {
+        this.area = area;
+        this.partGroup = partGroup;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.partQty = partQty;
+        this.max = max;
+        this.min = min;
+        this.keepingArea = keepingArea;
+    }
+
+    public Double getPartQty() {
+        return this.partQty == null ? 0 : this.partQty;
+    }
+
+    public static Object funEamStockIsFreeze(Object[] bean) {
+        if (bean.length <= 0 || bean == null) {
+            return null;
+        }
+        EamStock stock = JSON.parseObject(JSON.toJSONString(bean[0]), EamStock.class);
+        return stock.getIsFreeze().getDescription();
+
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/Equipment.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/Equipment.java
new file mode 100644
index 0000000..70907a2
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/Equipment.java
@@ -0,0 +1,231 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+import javax.persistence.*;
+
+/**
+ * @Description:
+ * @CreateDate 2022/3/30 13:50
+ * @Author 尹肖
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EQUIPMENT", uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"EQU_CODE"})})
+@Api("设备台账")
+@ExcludeImportExport
+public class Equipment extends CommonBean {
+
+    @Column(name = "EQU_CODE")
+    @ApiParam(name = "资产编码")
+    @FieldAnnotation(mainkey = true, popSearch = true, popCondition = true)
+    private String equCode;
+
+    @Column(name = "EQU_CLASS")
+    @ApiParam(name = "设备大类")
+    @FieldAnnotation(popSearch = true)
+    private String equClass;
+
+    @Column(name = "EQU_NAME")
+    @ApiParam(name = "资产名称")
+    @FieldAnnotation(popSearch = true)
+    private String equName;
+
+    @Column(name = "EQU_FILE_ROUTE")
+    @ApiParam(name = "资产参考文档")
+    @FieldAnnotation(popSearch = true, modify = false)
+    private String equFileRoute;
+
+    @Column(name = "EQU_FILE_ROUTE_ID")
+    @ApiParam(name = "资产参考文档id")
+    @FieldAnnotation(modify = false, display = false, isShow = false)
+    private String equFileRouteId;
+
+    @Column(name = "MAIN_USER")
+    @ApiParam(name = "责任人")
+    private String mainUser;
+
+    @Column(name = "EQU_TYPE")
+    @ApiParam(name = "资产类型")
+    @FieldAnnotation(typeName = "EquipmentType", editType = COMMON_EDIT_TYPE.OBJECT, dynamicCalculate = true)
+    private String equType;
+
+    @Column(name = "EQU_TYPE_NAME")
+    @ApiParam(name = "资产类型名称")
+    private String equTypeName;
+
+    @Column(name = "LOCATE")
+    @ApiParam(name = "存放地点")
+    @FieldAnnotation(typeName = "EAM_LOCATE")
+    private String locate;
+
+    @Column(name = "UNIT")
+    @ApiParam(name = "寿命单位")
+    private String unit;
+
+    @Column(name = "LIFE")
+    @ApiParam(name = "寿命")
+    private String life;
+
+    @Column(name = "KEEP_DEPARTMENT")
+    @ApiParam(name = "保管部门")
+    private String keepDepartment;
+
+    @Column(name = "WORKCENTER_CODE")
+    @ApiParam(name = "产线编码")
+    @FieldAnnotation(typeName = "EAM_WORKCENTER", notEmpty = true)
+    private String workcenterCode;
+
+    @Column(name = "EQU_LEVEL")
+    @ApiParam(name = "等级")
+    @FieldAnnotation(typeName = "EAM_EQU_LEVEL", popSearch = true)
+    private String equLevel;
+
+    @Column(name = "EQU_PHOTO")
+    @ApiParam(name = "图片")
+    @FieldAnnotation(modify = false)
+    private String equPhoto;
+
+    @Column(name = "EQU_PHOTO_ID")
+    @ApiParam(name = "图片id")
+    @FieldAnnotation(modify = false, isShow = false, display = false)
+    private String equPhotoId;
+
+    @Column(name = "USED_TIME")
+    @ApiParam(name = "已用时间")
+    @FieldAnnotation(modify = false)
+    private String usedTime;
+
+    @Column(name = "STA")
+    @ApiParam(name = "状态")
+    @FieldAnnotation(typeName = "EAM_EQU_STATUS")
+    private String sta;
+
+    @Column(name = "PRODUCT_VENDOR")
+    @ApiParam(name = "厂商")
+    private String productVendor;
+
+    @Column(name = "IS_ISPECT_TOOL")
+    @ApiParam(name = "是否检查机")
+    private Boolean isIspectTool;
+
+    @Column(name = "EQU_STATUS")
+    @ApiParam(name = "设备状态")
+    private EamEnumUtil.EQU_STATUS equStatus = EamEnumUtil.EQU_STATUS.NORMAL;
+
+    @Transient
+    @ApiParam(name = "设备状态")
+    @FieldAnnotation(modify = false, isShow = false, display = false)
+    private String equStatusVal;
+
+    @Column(name = "WARN")
+    @ApiParam(name = "预警数值")
+    private Integer warn;
+
+    @Column(name = "LAST_MAINTENANCE_TIME")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE_TIME)
+    @ApiParam(name = "上次保养时间")
+    private String lastMaintenanceTime;
+
+    @Column(name = "LIFE_DISTR")
+    @ApiParam(name = "寿命分布")
+    private EamEnumUtil.LIFE_DISTR lifeDistr;
+
+
+    @Column(name = "EAM_CAREER")
+    @ApiParam(name = "事业别")
+    @FieldAnnotation(typeName = "EAM_CAREER")
+    private String eamCareer;
+
+    @Column(name = "EQU_NATURE")
+    @ApiParam(name = "设备性质")
+    @FieldAnnotation(typeName = "EQU_NATURE")
+    private String equNature;
+
+    @Column(name = "ENABLE_TIME")
+    @ApiParam(name = "启动时间")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE)
+    private String enableTime;
+
+    @Column(name = "EQU_PRICE")
+    @ApiParam(name = "资产价值")
+    @FieldAnnotation(popSearch = true)
+    private String equPrice;
+
+    @Column(name = "PARENT_ID")
+    @ApiParam(name = "父id")
+    @FieldAnnotation(modify = false, isShow = false, display = false)
+    private String parentId;
+
+    @Column(name = "TYPE1")
+    @ApiParam(name = "类型1")
+    @FieldAnnotation(typeName = "TYPE1",popSearch = true)
+    private String type1;
+
+    @Column(name = "TYPE2")
+    @ApiParam(name = "类型2")
+    @FieldAnnotation(typeName = "TYPE2")
+    private String type2;
+
+    @Column(name = "TYPE3")
+    @ApiParam(name = "类型3")
+    @FieldAnnotation(typeName = "TYPE3")
+    private String type3;
+
+    @Column(name = "TYPE4")
+    @ApiParam(name = "类型4")
+    @FieldAnnotation(typeName = "TYPE4")
+    private String type4;
+
+    @Column(name = "TYPE5")
+    @ApiParam(name = "类型5")
+    @FieldAnnotation(typeName = "TYPE5")
+    private String type5;
+
+    @Column(name = "VARIANT")
+    @ApiParam(name = "型号")
+    private String variant;
+
+
+    @Column(name = "MAIN_PARAM")
+    @ApiParam(name = "主要参数")
+    private String mainParam;
+
+    @Column(name = "USR_YEAR")
+    @ApiParam(name = "使用年限")
+    private String usrYear;
+
+    @Column(name = "USR_COUNT")
+    @ApiParam(name = "使用次数")
+    private Integer usrCount;
+
+    @Column(name = "PURCHASE_DATA")
+    @ApiParam(name = "采购时间")
+    private String purchaseData;
+
+    public String getEquStatusVal() {
+        if (this.equStatus == null) return equStatusVal;
+        this.equStatusVal = this.equStatus.getValue();
+        return this.equStatusVal;
+    }
+
+    public void setEquStatusVal(String equStatusVal) {
+        if (!StringUtils.isEmpty(equStatusVal)) {
+            this.equStatus = EamEnumUtil.EQU_STATUS.valueOf(equStatusVal);
+        }
+        this.equStatusVal = equStatusVal;
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EquipmentType.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EquipmentType.java
new file mode 100644
index 0000000..007c1a3
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/EquipmentType.java
@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @CreateDate 2022/3/30 13:50
+ * @Author 尹肖
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EQUIPMENT_TYPE")
+@Api("设备台账类型")
+@ExcludeImportExport
+public class EquipmentType extends CommonBean {
+
+    @Column(name = "EQU_TYPE_CODE")
+    @ApiParam(name = "资产类型代码")
+    @FieldAnnotation(mainkey = true)
+    private String equTypeCode;
+
+    @Column(name = "EQU_TYPE_GROUP_NAME")
+    @ApiParam(name = "资产类型分组名称")
+    private String equTypeGroupName;
+
+    @Column(name = "EQU_TYPE_NAME")
+    @ApiParam(name = "资产类型名称")
+    private String equTypeName;
+
+    @Column(name = "EQU_TYPE_COLOR")
+    @ApiParam(name = "资产类型颜色")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.COLOR_PICKER)
+    private String equTypeColor;
+
+    @Column(name = "EQU_TYPE_SORT")
+    @ApiParam(name = "资产类型顺序")
+    private Integer equTypeSort;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/Material.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/Material.java
new file mode 100644
index 0000000..339e4cd
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/Material.java
@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EAM_MATERIAL")
+@Api("物料")
+public class Material extends CommonBean {
+
+    @Column(name="CODE")
+    @ApiParam(value ="编码")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String code;
+
+    @Column(name="NAME")
+    @ApiParam(value ="名称")
+    @FieldAnnotation(popSearch = true)
+    private String name;
+
+    @Column(name="TYPE")
+    @ApiParam(value ="类型")
+    @FieldAnnotation(typeName = "MATERIAL_TYPE")
+    private String type;
+
+    @JsonIgnore
+    @OneToMany(targetEntity = SalesOrder.class, cascade=CascadeType.ALL, mappedBy = "material", orphanRemoval = true)
+    private List<SalesOrder> salesOrders;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/MouldMesToEam.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/MouldMesToEam.java
new file mode 100644
index 0000000..7105124
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/MouldMesToEam.java
@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.ExcludeImportExport;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import cn.estsh.i3plus.pojo.eam.common.COMMON_EDIT_TYPE;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @CreateDate 2022/4/11 11:08
+ * @Author 尹肖
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "MOULD_MES_TO_EAM")
+@Api("开合模次")
+@ExcludeImportExport
+public class MouldMesToEam extends CommonBean {
+
+    @ApiParam(name = "模具编码")
+    @Column(name = "EQU_CODE")
+    private String equCode;
+
+    @ApiParam(name = "开合模次数")
+    @Column(name = "PROCESS_COUNT")
+    private Double processCount;
+
+    @ApiParam(name = "工单号")
+    @Column(name = "ORDER_NO")
+    private String orderNo;
+
+    @Column(name = "LAST_MAINTENANCE_TIME")
+    @FieldAnnotation(editType = COMMON_EDIT_TYPE.DATE_TIME)
+    @ApiParam(name = "上次保养时间")
+    private String lastMaintenanceTime;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/SalesOrder.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/SalesOrder.java
new file mode 100644
index 0000000..1f40996
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/SalesOrder.java
@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+
+/**
+ * @author Jason
+ * @ClassName: Material
+ * @Description: TODO(这里用一句话描述这个类的作用)
+ * @date 2022-03-23
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EAM_SALES_ORDER")
+@Api("销售订单")
+public class SalesOrder extends CommonBean {
+    @Column(name="CODE")
+    @ApiParam(value ="编码")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String code;
+
+    @Column(name="NAME")
+    @ApiParam(value ="名称")
+    @FieldAnnotation(popSearch = true)
+    private String name;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "material")
+    private Material material;
+
+    @OneToOne(mappedBy = "salesOrder")
+    private Work work;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/Work.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/Work.java
new file mode 100644
index 0000000..6ca23e6
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/Work.java
@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EAM_WORK")
+@Api("工作")
+public class Work extends CommonBean {
+    @Column(name="CODE")
+    @ApiParam(value ="编码")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String code;
+
+    @Column(name="TYPE")
+    @ApiParam(value ="类型")
+    private EamEnumUtil.TASK_TYPE type;
+
+    @OneToOne
+    @JoinColumn(name = "salesOrder")
+    private SalesOrder salesOrder;
+
+    @JsonIgnore
+    @ManyToMany(targetEntity = WorkPlan.class, cascade=CascadeType.ALL, mappedBy = "workList")
+    private List<WorkPlan> workPlans;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/WorkPlan.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/WorkPlan.java
new file mode 100644
index 0000000..8c826d3
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/WorkPlan.java
@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.eam.pojo;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "EAM_WORK_PLAN")
+@Api("生产计划")
+public class WorkPlan extends CommonBean {
+    @Column(name="CODE")
+    @ApiParam(value ="编码")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String code;
+
+    @ManyToMany(targetEntity = Work.class)
+    @JoinColumn(name = "workList")
+    private List<Work> workList;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/ext/EamDocMasterExt.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/ext/EamDocMasterExt.java
new file mode 100644
index 0000000..cd07607
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/ext/EamDocMasterExt.java
@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.eam.pojo.ext;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author ns
+ * @create 2022/4/14 0014 上午 11:06
+ */
+@Data
+@ApiModel("点检单主表实体类扩展")
+public class EamDocMasterExt {
+    @ApiModelProperty(name = "单号")
+    private String orderNo;
+
+    @ApiModelProperty(name = "是否通知")
+    private Integer isPush;
+
+    @ApiModelProperty(name = "故障位置")
+    private String falutLoc;
+
+    @ApiModelProperty(name = "维修类型")
+    private String repairType;
+
+    @ApiModelProperty(name = "故障现象")
+    private String falutShow;
+
+    @ApiModelProperty(name = "金额")
+    private String price;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/ext/EamOpItemExt.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/ext/EamOpItemExt.java
new file mode 100644
index 0000000..2d66670
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/ext/EamOpItemExt.java
@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.eam.pojo.ext;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @CreateDate 2022/4/11 9:42
+ * @Author 尹肖
+ */
+@Data
+public class EamOpItemExt {
+    @ApiParam(value = "资产编码")
+    private String equCode;
+
+    @ApiParam(value = "作业项编码")
+    private String opItemCode;
+
+    @ApiParam(value = "资产编码")
+    private String opFileRoute;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/ext/EquipmentExt.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/ext/EquipmentExt.java
new file mode 100644
index 0000000..a848e51
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/ext/EquipmentExt.java
@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.eam.pojo.ext;
+
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @CreateDate 2022/4/7 13:35
+ * @Author 尹肖
+ */
+@Data
+public class EquipmentExt implements Serializable {
+
+    @Column(name = "EQU_CODE")
+    @ApiParam(value = "资产编码")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String equCode;
+
+    @Column(name = "EQU_CLASS")
+    @ApiParam(value = "设备大类")
+    @FieldAnnotation(popSearch = true)
+    private String equClass;
+
+    @Column(name = "WORK_UNIT")
+    @ApiParam(value = "工位代码")
+    @FieldAnnotation(popSearch = true)
+    private String workUnit;
+
+    @Column(name = "PURCHASE_DATE")
+    @ApiParam(value = "采购时间")
+    @FieldAnnotation(popSearch = true)
+    private String purchaseDate;
+
+    @Column(name = "MODEL")
+    @ApiParam(value = "型号")
+    @FieldAnnotation(popSearch = true)
+    private String model;
+
+    @Column(name = "EQU_NATURE")
+    @ApiParam(value = "性质")
+    @FieldAnnotation(popSearch = true)
+    private String equNature;
+
+    @Column(name = "ENABLE_TIME")
+    @ApiParam(value = "启动时间")
+    @FieldAnnotation(popSearch = true)
+    private String enableTime;
+
+    @Column(name = "IS_ISPECT_TOOL")
+    @ApiParam(value = "是否检具")
+    @FieldAnnotation(popSearch = true)
+    private String isIspectTool;
+
+    @Column(name = "EQU_PRICE")
+    @ApiParam(value = "资产价值")
+    @FieldAnnotation(popSearch = true)
+    private String equPrice;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/importexport/ExportField.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/importexport/ExportField.java
new file mode 100644
index 0000000..fb529c6
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/importexport/ExportField.java
@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.eam.pojo.importexport;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+
+/**
+ * @author Jason
+ * @ClassName: ExportField
+ * @Description: 导出字段配置
+ * @date 2022-04-11
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "COMMON_EXPORT_FIELD")
+public class ExportField extends CommonBean {
+
+    @Column(name="FIELD_NAME")
+    @ApiParam(name = "字段名")
+    private String fieldName;
+
+    @Column(name="LABEL_NAME")
+    @ApiParam(name = "标签名称")
+    private String labelName;
+
+    @Column(name="DEFAULT_VALUE")
+    @ApiParam(name = "默认值")
+    private String defaultValue;
+
+    @Column(name="RELATION_TABLE")
+    @ApiParam(name = "关联表名")
+    private String relationTable;
+
+    @Column(name="RELATION_FIELD")
+    @ApiParam(name = "关联字段")
+    private String relationField;
+
+    @Column(name="ORDER_NUMBER")
+    @ApiParam(name ="序号")
+    private Integer orderNumber;
+
+    @ManyToOne
+    @JoinColumn(name = "exportTable")
+    @FieldAnnotation(display = false, isShow = false)
+    private ExportTable exportTable;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/importexport/ExportProject.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/importexport/ExportProject.java
new file mode 100644
index 0000000..0a1bcd1
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/importexport/ExportProject.java
@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.eam.pojo.importexport;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import java.util.List;
+
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "COMMON_EXPORT_PROJECT")
+@Api("数据导出明细集合")
+public class ExportProject extends CommonBean {
+    private static final long serialVersionUID = 1515882386747763487L;
+
+    @Column(name="NAME")
+    @ApiParam(name ="名称")
+    @FieldAnnotation(mainkey = true)
+    private String name;
+
+    @Column(name="GROUP_NAME")
+    @ApiParam(name ="分组名称")
+    @FieldAnnotation(notEmpty = true)
+    private String groupName;
+
+    @Column(name="SUB_GROUP_NAME")
+    @ApiParam(name ="子分组名称")
+    private String subGroupName;
+
+    @JsonIgnore
+    @OneToMany(targetEntity = ExportTable.class, mappedBy = "exportProject", orphanRemoval = true)
+    @FieldAnnotation(display = false, isShow = false)
+    private List<ExportTable> exportTables;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/importexport/ExportTable.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/importexport/ExportTable.java
new file mode 100644
index 0000000..7db1dff
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/importexport/ExportTable.java
@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.eam.pojo.importexport;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import java.util.List;
+
+/**
+ * @author Jason
+ * @ClassName: ExportTable
+ * @Description: 通用导出表
+ * @date 2022-04-11
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "COMMON_EXPORT_TABLE")
+public class ExportTable extends CommonBean {
+
+    @Column(name="IN_NAME")
+    @ApiParam(name ="内部表名")
+    @FieldAnnotation(notEmpty = true)
+    private EamEnumUtil.EXPORT_TABLE_NAME inName;
+
+    @Column(name="OUT_NAME")
+    @ApiParam(name ="外部表名")
+    @FieldAnnotation(notEmpty = true)
+    private String outName;
+
+    @Column(name="ORDER_NUMBER")
+    @ApiParam(name ="序号")
+    private Integer orderNumber;
+
+    @Lob
+    @Column(name="INNER_FILTER")
+    @ApiParam(name ="内部对象筛选")
+    private String innerFilter;
+
+    @ManyToOne
+    @JoinColumn(name = "exportProject")
+    @FieldAnnotation(display = false, isShow = false)
+    private ExportProject exportProject;
+
+    @JsonIgnore
+    @OneToMany(targetEntity = ExportField.class, mappedBy = "exportTable", orphanRemoval = true, fetch=FetchType.EAGER)
+    @FieldAnnotation(display = false, isShow = false)
+    private List<ExportField> exportFields;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/importexport/ImportField.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/importexport/ImportField.java
new file mode 100644
index 0000000..6c98122
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/importexport/ImportField.java
@@ -0,0 +1,77 @@
+package cn.estsh.i3plus.pojo.eam.pojo.importexport;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+
+/**
+ * @author Jason
+ * @ClassName: ImportField
+ * @Description: 通用导入字段映射
+ * @date 2022-04-14
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "COMMON_IMPORT_FIELD")
+public class ImportField extends CommonBean {
+    @Column(name="FIELD_NAME")
+    @ApiParam(name = "字段名")
+    private String fieldName;
+
+    @Column(name="LABEL_NAME")
+    @ApiParam(name = "标签名称")
+    private String labelName;
+
+    @Column(name="DEFAULT_VALUE")
+    @ApiParam(name = "默认值")
+    private String defaultValue;
+
+    @Column(name="IS_REQUIRE")
+    @ApiParam(name = "是否必填", example = "0")
+    private Boolean isRequire;
+
+    @Column(name="IGNORE_NOT_VALID")
+    @ApiParam(name = "无效忽略", example = "0")
+    private Boolean ignoreNotValid;
+
+    @Column(name="MAX_LENGTH")
+    @ApiParam(name = "最大长度", example = "0")
+    @FieldAnnotation(defaultValue = "255")
+    private Integer maxLength;
+
+    @Column(name="ADD_VALUE")
+    @ApiParam(name = "累加数值", example = "0")
+    private Boolean addValue;
+
+    @Column(name="VALIDATOR")
+    @ApiParam(name = "校验表达式")
+    private String validator;
+
+    @Column(name="VALIDATOR_MESSAGE")
+    @ApiParam(name = "校验表达式报错")
+    private String validatorMessage;
+
+    @Column(name="RELATION_TABLE")
+    @ApiParam(name = "关联表名")
+    private String relationTable;
+
+    @Column(name="RELATION_FIELD")
+    @ApiParam(name = "关联字段")
+    private String relationField;
+
+    @Column(name="ORDER_NUMBER")
+    @ApiParam(name ="序号")
+    private Integer orderNumber;
+
+    @ManyToOne
+    @JoinColumn(name = "importTable")
+    @FieldAnnotation(display = false, isShow = false)
+    private ImportTable importTable;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/importexport/ImportProject.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/importexport/ImportProject.java
new file mode 100644
index 0000000..30b0cd6
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/importexport/ImportProject.java
@@ -0,0 +1,73 @@
+package cn.estsh.i3plus.pojo.eam.pojo.importexport;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import java.util.List;
+
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "COMMON_IMPORT_PROJECT")
+public class ImportProject extends CommonBean {
+    private static final long serialVersionUID = 5928921171163874326L;
+
+    @Column(name="NAME", unique = true)
+    @ApiParam(name ="标识名")
+    @FieldAnnotation(mainkey = true)
+    private String name;
+
+    @Column(name="GROUP_NAME")
+    @ApiParam(name ="分组名称")
+    @FieldAnnotation(notEmpty = true)
+    private String groupName;
+
+    @Column(name="SUB_GROUP_NAME")
+    @ApiParam(name ="子分组名称")
+    private String subGroupName;
+
+    @Column(name="LINK_TYPE")
+    @ApiParam(name ="链接类型")
+    @FieldAnnotation(defaultValue = "EXCEL", notEmpty = true)
+    private EamEnumUtil.DATA_LINK_TYPE linkType;
+
+    @Column(name="PATH")
+    @ApiParam(name ="IP/文件路径")
+    private String path;
+
+    @Column(name="PORT")
+    @ApiParam(name ="端口")
+    private Integer port;
+
+    @Column(name="DB_NAME")
+    @ApiParam(name ="数据库名")
+    private String dbName;
+
+    @Column(name="USER_NAME")
+    @ApiParam(name ="用户名")
+    private String userName;
+
+    @Column(name="PASSWORD")
+    @ApiParam(name ="密码")
+    private String password;
+
+    @Column(name="SCRIPT_NO")
+    @ApiParam(name ="脚本编号")
+    private String scriptNo;
+
+    @JsonIgnore
+    @OneToMany(targetEntity = ImportTable.class, mappedBy = "importProject", orphanRemoval = true)
+    @FieldAnnotation(display = false, isShow = false)
+    private List<ImportTable> importTables;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/importexport/ImportTable.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/importexport/ImportTable.java
new file mode 100644
index 0000000..6edcd0c
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/pojo/importexport/ImportTable.java
@@ -0,0 +1,78 @@
+package cn.estsh.i3plus.pojo.eam.pojo.importexport;
+
+import cn.estsh.i3plus.pojo.eam.common.CommonBean;
+import cn.estsh.i3plus.pojo.eam.common.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.eam.util.EamEnumUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiParam;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import java.util.List;
+
+/**
+ * @author Jason
+ * @ClassName: ImportTable
+ * @Description: 通用导入表
+ * @date 2022-04-14
+ */
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "COMMON_IMPORT_TABLE")
+public class ImportTable extends CommonBean {
+
+    @Column(name="IN_NAME")
+    @ApiParam(name ="内部表名")
+    @FieldAnnotation(notEmpty = true)
+    private EamEnumUtil.IMPORT_TABLE_NAME inName;
+
+    @Column(name="OUT_NAME")
+    @ApiParam(name ="外部表名")
+    @FieldAnnotation(notEmpty = true)
+    private String outName;
+
+    @Column(name="SKIP_ROWS")
+    @ApiParam(name ="跳过行数")
+    @FieldAnnotation(defaultValue = "0")
+    private Integer skipRows;
+
+    @Column(name="ORDER_NUMBER")
+    @ApiParam(name ="序号")
+    private Integer orderNumber;
+
+    @Column(name="REPEAT_IGNORE")
+    @ApiParam(name ="重复忽略")
+    private Boolean repeatIgnore;
+
+    @Lob
+    @Column(name="INNER_FILTER")
+    @ApiParam(name ="内部对象筛选")
+    private String innerFilter;
+
+    @Lob
+    @Column(name="OUTTER_FILTER")
+    @ApiParam(name ="外部对象筛选")
+    private String outterFilter;
+
+    @Column(name="POST_HANDLE")
+    @ApiParam(name ="后处理")
+    private String postHandle;
+
+    @Column(name="UPDATE_SQL")
+    @ApiParam(name ="更新外部数据")
+    private String updateSQL;
+
+    @ManyToOne
+    @JoinColumn(name = "importProject")
+    @FieldAnnotation(display = false, isShow = false)
+    private ImportProject importProject;
+
+    @JsonIgnore
+    @OneToMany(targetEntity = ImportField.class, mappedBy = "importTable", orphanRemoval = true, fetch=FetchType.EAGER)
+    @FieldAnnotation(display = false, isShow = false)
+    private List<ImportField> importFields;
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/DynamicEnumRepoitory.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/DynamicEnumRepoitory.java
new file mode 100644
index 0000000..54dfbbb
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/DynamicEnumRepoitory.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.common.pojo.DynamicEnum;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description:
+ * @CreateDate 2022/4/11 17:56
+ * @Author 尹肖
+ */
+@Resource
+public interface DynamicEnumRepoitory extends BaseRepository<DynamicEnum, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamApprovalHisRepoitory.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamApprovalHisRepoitory.java
new file mode 100644
index 0000000..16e6942
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamApprovalHisRepoitory.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamApprovalHis;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description:
+ * @CreateDate 2022/4/11 17:56
+ * @Author 尹肖
+ */
+@Resource
+public interface EamApprovalHisRepoitory extends BaseRepository<EamApprovalHis, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamAreaPartGroupRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamAreaPartGroupRepository.java
new file mode 100644
index 0000000..5eaa676
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamAreaPartGroupRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamAreaPartGroup;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 区别类别关系
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-05-09 17:18
+ * @Modify:
+ **/
+@Repository
+public interface EamAreaPartGroupRepository extends BaseRepository<EamAreaPartGroup, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamDocCsDetailsRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamDocCsDetailsRepository.java
new file mode 100644
index 0000000..3ed2600
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamDocCsDetailsRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamDocCsDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 备品备件盘点明细表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-05-12 10:45
+ * @Modify:
+ **/
+@Repository
+public interface EamDocCsDetailsRepository  extends BaseRepository<EamDocCsDetails, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamDocCsMasterRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamDocCsMasterRepository.java
new file mode 100644
index 0000000..12c85f6
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamDocCsMasterRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamDocCsMaster;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-05-12 10:54
+ * @Modify:
+ **/
+@Repository
+public interface EamDocCsMasterRepository  extends BaseRepository<EamDocCsMaster, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamDocDetailsRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamDocDetailsRepository.java
new file mode 100644
index 0000000..b5e2e4b
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamDocDetailsRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamDocDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author ns
+ * @create 2022/4/13 0013 上午 10:52
+ */
+@Repository
+public interface EamDocDetailsRepository extends BaseRepository<EamDocDetails, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamDocMasterRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamDocMasterRepository.java
new file mode 100644
index 0000000..3df7e6f
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamDocMasterRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamDocMaster;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author ns
+ * @create 2022/4/13 0013 上午 10:52
+ */
+@Repository
+public interface EamDocMasterRepository extends BaseRepository<EamDocMaster, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamDocMovementDetailRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamDocMovementDetailRepository.java
new file mode 100644
index 0000000..6d63218
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamDocMovementDetailRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamDocMovementDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 备品备件单据明细表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-05-09 14:45
+ * @Modify:
+ **/
+@Repository
+public interface EamDocMovementDetailRepository extends BaseRepository<EamDocMovementDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamDocMovementMasterRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamDocMovementMasterRepository.java
new file mode 100644
index 0000000..e97ca38
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamDocMovementMasterRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamDocMovementMaster;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 备品备件单据主表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-05-09 14:45
+ * @Modify:
+ **/
+@Repository
+public interface EamDocMovementMasterRepository extends BaseRepository<EamDocMovementMaster, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamEquipmentContactCauseRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamEquipmentContactCauseRepository.java
new file mode 100644
index 0000000..c1ea364
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamEquipmentContactCauseRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamEquipmentContactCause;
+import org.springframework.stereotype.Repository;
+
+/**EamEquipmentContactCauseRepository
+ * @Author : gsz
+ * @date 2022/5/11 14:17
+**/
+@Repository
+public interface EamEquipmentContactCauseRepository extends BaseRepository<EamEquipmentContactCause, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamEquipmentContactPurposeRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamEquipmentContactPurposeRepository.java
new file mode 100644
index 0000000..89079d9
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamEquipmentContactPurposeRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamEquipmentContactPurpose;
+import org.springframework.stereotype.Repository;
+
+/**EamEquipmentContactPurposeRepository
+ * @Author : gsz
+ * @date 2022/5/11 14:17
+**/
+@Repository
+public interface EamEquipmentContactPurposeRepository extends BaseRepository<EamEquipmentContactPurpose, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamEquipmentContactRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamEquipmentContactRepository.java
new file mode 100644
index 0000000..186fd1c
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamEquipmentContactRepository.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamEquipmentContact;
+import org.springframework.stereotype.Repository;
+
+/**EamEquipmentContactRepository
+ * @Author : gsz
+ * @date 2022/5/11 14:17
+**/
+@Repository
+public interface EamEquipmentContactRepository extends BaseRepository<EamEquipmentContact, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamLabelTemplateParamRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamLabelTemplateParamRepository.java
new file mode 100644
index 0000000..7e1311c
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamLabelTemplateParamRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamLabelTemplateParam;
+
+/**
+ * @Description : 打印模板
+ * @Reference :
+ * @Author : crish
+ * @Date : 2019-08-18 12:03:01.024
+ * @Modify :
+ **/
+public interface EamLabelTemplateParamRepository extends BaseRepository<EamLabelTemplateParam, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamLabelTemplateRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamLabelTemplateRepository.java
new file mode 100644
index 0000000..18fadf1
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamLabelTemplateRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamLabelTemplate;
+
+/**
+ * @Description : 打印模板
+ * @Reference :
+ * @Author : crish
+ * @Date : 2019-08-18 12:03:01.024
+ * @Modify :
+ **/
+public interface EamLabelTemplateRepository extends BaseRepository<EamLabelTemplate, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamLocateRepoitory.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamLocateRepoitory.java
new file mode 100644
index 0000000..6c29e90
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamLocateRepoitory.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamLocate;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :模具库位表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-04-20 14:29
+ * @Modify:
+ **/
+@Repository
+public interface EamLocateRepoitory extends BaseRepository<EamLocate, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamManageLineRelationRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamManageLineRelationRepository.java
new file mode 100644
index 0000000..5fea2c0
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamManageLineRelationRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamManageLineRelation;
+import org.springframework.stereotype.Repository;
+
+/**EamManageLineRelationRepository
+ * @Author : gsz
+ * @date 2022/5/11 14:17
+**/
+@Repository
+public interface EamManageLineRelationRepository extends BaseRepository<EamManageLineRelation, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamOpItemMainRepoitory.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamOpItemMainRepoitory.java
new file mode 100644
index 0000000..23483be
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamOpItemMainRepoitory.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamOpItemMain;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description:
+ * @CreateDate 2022/4/11 17:56
+ * @Author 尹肖
+ */
+@Resource
+public interface EamOpItemMainRepoitory extends BaseRepository<EamOpItemMain, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamOpItemRepoitory.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamOpItemRepoitory.java
new file mode 100644
index 0000000..4d04727
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamOpItemRepoitory.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamOpItem;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description:
+ * @CreateDate 2022/4/11 17:56
+ * @Author 尹肖
+ */
+@Resource
+public interface EamOpItemRepoitory extends BaseRepository<EamOpItem, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamPartOperateRecordRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamPartOperateRecordRepository.java
new file mode 100644
index 0000000..e1fab4d
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamPartOperateRecordRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamPartOperateRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 备品备件操作记录
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-05-09 14:41
+ * @Modify:
+ **/
+@Repository
+public interface EamPartOperateRecordRepository extends BaseRepository<EamPartOperateRecord, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamPartRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamPartRepository.java
new file mode 100644
index 0000000..b4ae8ca
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamPartRepository.java
@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamPart;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @CreateDate 2022/4/11 17:56
+ * @Author 尹肖
+ */
+@Repository
+public interface EamPartRepository extends BaseRepository<EamPart, Long> {
+
+    /**
+     * 统计各区域个数
+     * @param organizeCode
+     * @return
+     */
+    @Query("select p.area,count(p) from EamPart p group by p.area,p.organizeCode having p.organizeCode = ?1")
+    List<Object[]> findGroupByAreaCount(@Param("organizeCode") String organizeCode);
+
+    /**
+     * 计算总库存金额
+     * @param organizeCode
+     * @return
+     */
+    @Query("select sum(p.price * s.partQty) from EamStock s inner join EamPart p on s.partNo = p.partNo and s.organizeCode = :organizeCode and p.organizeCode = :organizeCode")
+    double getStockTotalAmount(@Param("organizeCode") String organizeCode);
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamPlanRuleMaintenanceRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamPlanRuleMaintenanceRepository.java
new file mode 100644
index 0000000..c20d433
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamPlanRuleMaintenanceRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamPlanRuleMaintenance;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author ns
+ * @create 2022/4/13 0013 上午 10:52
+ */
+@Repository
+public interface EamPlanRuleMaintenanceRepository extends BaseRepository<EamPlanRuleMaintenance, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamPlanRuleRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamPlanRuleRepository.java
new file mode 100644
index 0000000..2f91d97
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamPlanRuleRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamPlanRule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author ns
+ * @create 2022/4/13 0013 上午 10:52
+ */
+@Repository
+public interface EamPlanRuleRepository extends BaseRepository<EamPlanRule, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamSnOperateRecordRepoitory.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamSnOperateRecordRepoitory.java
new file mode 100644
index 0000000..ed009b0
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamSnOperateRecordRepoitory.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamSnOperateRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 模具条码操作记录表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-04-20 14:25
+ * @Modify:
+ **/
+@Repository
+public interface EamSnOperateRecordRepoitory extends BaseRepository<EamSnOperateRecord, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamSnRepoitory.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamSnRepoitory.java
new file mode 100644
index 0000000..609fe03
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamSnRepoitory.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamSn;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 模具条码表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-04-20 14:28
+ * @Modify:
+ **/
+@Repository
+public interface EamSnRepoitory extends BaseRepository<EamSn, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamStaticStockRepoitory.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamStaticStockRepoitory.java
new file mode 100644
index 0000000..6918ea3
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamStaticStockRepoitory.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamStaticStock;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 静态库存表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-05-19 16:49
+ * @Modify:
+ **/
+@Repository
+public interface EamStaticStockRepoitory extends BaseRepository<EamStaticStock, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamStockRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamStockRepository.java
new file mode 100644
index 0000000..c28ee94
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EamStockRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EamStock;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 备品备件库存表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2022-05-09 14:44
+ * @Modify:
+ **/
+@Repository
+public interface EamStockRepository extends BaseRepository<EamStock, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EngineScriptPersistenceRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EngineScriptPersistenceRepository.java
new file mode 100644
index 0000000..428da84
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EngineScriptPersistenceRepository.java
@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.common.pojo.EngineScriptPersistence;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface EngineScriptPersistenceRepository extends BaseRepository<EngineScriptPersistence, Long> {
+    /**
+     * 按照工厂代码和脚本编号查询脚本实体对象
+     * @param organizeCode 工厂代码
+     * @param scriptNo 脚本编号
+     * @return 脚本实体对象
+     */
+    EngineScriptPersistence findByOrganizeCodeAndScriptNo(String organizeCode, String scriptNo);
+
+    /**
+     * 按照脚本编号查询脚本实体对象
+     * @param scriptNo 脚本编号
+     * @return 脚本实体对象
+     */
+    EngineScriptPersistence findByScriptNo(String scriptNo);
+
+    /**
+     * 查找所有的脚本语言类型
+     * @return 数据库中已经存在的脚本语言类型
+     */
+    @Query("select t.languageType from EngineScriptPersistence t group by t.organizeCode, t.languageType")
+    List findGroupByLanguageType();
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EquipmentRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EquipmentRepository.java
new file mode 100644
index 0000000..d19c3dc
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EquipmentRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.Equipment;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description:
+ * @CreateDate 2022/4/11 17:55
+ * @Author 尹肖
+ */
+@Resource
+public interface EquipmentRepository extends BaseRepository<Equipment, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EquipmentTypeRepoitory.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EquipmentTypeRepoitory.java
new file mode 100644
index 0000000..81c26c8
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/EquipmentTypeRepoitory.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.EquipmentType;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description:
+ * @CreateDate 2022/4/11 17:56
+ * @Author 尹肖
+ */
+@Resource
+public interface EquipmentTypeRepoitory extends BaseRepository<EquipmentType, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/FieldInfoRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/FieldInfoRepository.java
new file mode 100644
index 0000000..050bcd3
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/FieldInfoRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.common.pojo.FieldInfo;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface FieldInfoRepository extends BaseRepository<FieldInfo, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/GridFieldRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/GridFieldRepository.java
new file mode 100644
index 0000000..b740fd9
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/GridFieldRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.common.pojo.GridField;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface GridFieldRepository extends BaseRepository<GridField, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/MaterialRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/MaterialRepository.java
new file mode 100644
index 0000000..1f0b153
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/MaterialRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.Material;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface MaterialRepository extends BaseRepository<Material, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/MouldMesToEamRepoitory.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/MouldMesToEamRepoitory.java
new file mode 100644
index 0000000..4932174
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/MouldMesToEamRepoitory.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.MouldMesToEam;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description:
+ * @CreateDate 2022/4/11 17:56
+ * @Author 尹肖
+ */
+@Resource
+public interface MouldMesToEamRepoitory extends BaseRepository<MouldMesToEam, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/SalesOrderRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/SalesOrderRepository.java
new file mode 100644
index 0000000..aac69a3
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/SalesOrderRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.SalesOrder;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SalesOrderRepository extends BaseRepository<SalesOrder, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/SysParamRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/SysParamRepository.java
new file mode 100644
index 0000000..d5da97f
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/SysParamRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.common.pojo.SysParam;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SysParamRepository extends BaseRepository<SysParam, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/UploadFileConfigRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/UploadFileConfigRepository.java
new file mode 100644
index 0000000..f2a8755
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/UploadFileConfigRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.common.pojo.UploadFileConfig;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UploadFileConfigRepository extends BaseRepository<UploadFileConfig, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/UploadFileInfoRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/UploadFileInfoRepository.java
new file mode 100644
index 0000000..c864ca8
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/UploadFileInfoRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.common.pojo.UploadFileInfo;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UploadFileInfoRepository extends BaseRepository<UploadFileInfo, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/WorkPlanRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/WorkPlanRepository.java
new file mode 100644
index 0000000..3300f3a
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/WorkPlanRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.WorkPlan;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface WorkPlanRepository extends BaseRepository<WorkPlan, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/WorkRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/WorkRepository.java
new file mode 100644
index 0000000..4c7eaff
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/WorkRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.eam.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.Work;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface WorkRepository extends BaseRepository<Work, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/importexport/ExportFieldRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/importexport/ExportFieldRepository.java
new file mode 100644
index 0000000..fbf4722
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/importexport/ExportFieldRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.eam.repository.importexport;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.importexport.ExportField;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ExportFieldRepository extends BaseRepository<ExportField, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/importexport/ExportProjectRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/importexport/ExportProjectRepository.java
new file mode 100644
index 0000000..56f8a90
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/importexport/ExportProjectRepository.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.eam.repository.importexport;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.importexport.ExportProject;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ExportProjectRepository extends BaseRepository<ExportProject, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/importexport/ExportTableRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/importexport/ExportTableRepository.java
new file mode 100644
index 0000000..bfdadcf
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/importexport/ExportTableRepository.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.eam.repository.importexport;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.importexport.ExportTable;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ExportTableRepository extends BaseRepository<ExportTable, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/importexport/ImportFieldRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/importexport/ImportFieldRepository.java
new file mode 100644
index 0000000..9040d17
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/importexport/ImportFieldRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.eam.repository.importexport;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.importexport.ImportField;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ImportFieldRepository extends BaseRepository<ImportField, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/importexport/ImportProjectRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/importexport/ImportProjectRepository.java
new file mode 100644
index 0000000..30001f3
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/importexport/ImportProjectRepository.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.eam.repository.importexport;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.importexport.ImportProject;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ImportProjectRepository extends BaseRepository<ImportProject, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/importexport/ImportTableRepository.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/importexport/ImportTableRepository.java
new file mode 100644
index 0000000..46fa014
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/repository/importexport/ImportTableRepository.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.eam.repository.importexport;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.eam.pojo.importexport.ImportTable;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ImportTableRepository extends BaseRepository<ImportTable, Long> {
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/util/DateUtil.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/util/DateUtil.java
new file mode 100644
index 0000000..4650f98
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/util/DateUtil.java
@@ -0,0 +1,896 @@
+package cn.estsh.i3plus.pojo.eam.util;
+
+
+import cn.estsh.i3plus.platform.common.tool.TimeTool;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Calendar;
+import java.util.Date;
+
+public class DateUtil {
+    private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+    public static final String BASE_FORMAT = "yyyy-MM-dd HH:mm:ss";
+    public static final String BASE_FORMAT1 = "yyyy-MM-dd HH:mm";
+    public static final String BASE_FORMAT2 = "yyyyMMdd HH:mm";
+    public static final String SHORT_FORMAT = "yyyy-MM-dd";
+    public static final String SHORT_FORMAT_MY = "yyyy-MM";
+    public static final String SHORT_FORMAT_MM = "MM";
+    public static final String SHORT_FORMAT_MY_CHINESE = "yyyy年MM月";
+    public static final String CHINESE_FORMAT = "yyyy年MM月dd日HH时mm分ss秒";
+    public static final String CHINESE_FORMAT_NOSECOND = "yyyy年MM月dd日HH时mm分";
+    public static final String SHORT_C_FORMAT = "yyyy年MM月dd日";
+    public static final String EN_FORMAT_A = "yyyyMMddHHmmss";
+    public static final String EN_FORMAT_B = "yyyy/MM/dd HH:mm:ss";
+    public static final String EN_FORMAT_C = "yyyyMMddHHmmss.SSS";
+    public static final String BASE_FORMAT3 = "MM/dd HH:mm";
+    public static final String BASE_FORMAT4 = "yy/MM/dd HH:mm";
+    public static final String BASE_FORMAT5 = "yy/MM/dd";
+    public static final String END_DAY_FOMAT_A = "yyyy/MM/dd 23:59:59";
+    public static final String END_DAY_FOMAT_B = "yyyy-MM-dd 23:59:59";
+    public static final String SHORT_EN_FORMAT = "yyyyMMdd";
+    public static final String MINUTE_FORMAT = "yyyyMMddHHmm";
+    public static final String SHORT_FORMAT_HOUR = "HH:mm";
+    public static final String SHORT_FORMAT_HOUR_MINUTE = "HH:mm:ss";
+    public static final String CN_SHORT_FORMAT = "MM月dd日";
+
+    public static final String CN_CUT_FORMAT = "MM月dd日 HH:mm";
+    public static final String CN_NOSECOND_FORMAT = "yyyy年MM月dd日 HH:mm";
+    public static final String EN_NOSECOND_FORMAT = "yyyy-MM-dd HH:mm";
+
+    public final static int ERA = 0;
+    public final static int YEAR = 1;
+    public final static int MONTH = 2;
+    public final static int WEEK_OF_YEAR = 3;
+    public final static int WEEK_OF_MONTH = 4;
+    public final static int DATE = 5;
+    public final static int DAY_OF_MONTH = 5;
+    public final static int DAY_OF_YEAR = 6;
+    public final static int DAY_OF_WEEK = 7;
+    public final static int DAY_OF_WEEK_IN_MONTH = 8;
+    public final static int AM_PM = 9;
+    public final static int HOUR = 10;
+    public final static int HOUR_OF_DAY = 11;
+    public final static int MINUTE = 12;
+    public final static int SECOND = 13;
+    public final static int MILLISECOND = 14;
+
+    public static final SimpleDateFormat FORMAT_HH_MM = new SimpleDateFormat("HH:mm");
+    public static final SimpleDateFormat FORMAT_YYYY_MM_DD = new SimpleDateFormat("yyyy-MM-dd");
+    private static final String START_HH_MM = "08:00:00";
+    private static final String END_HH_MM = "08:00:00";
+
+    public static String getStartDateTime() {
+        Date date = new Date();
+        String startTime = FORMAT_HH_MM.format(date);
+        if (startTime.compareTo(START_HH_MM) < 1) {
+            Date yesterday = TimeTool.getDateBefore(date, 1);
+            return FORMAT_HH_MM.format(yesterday) + " " + START_HH_MM;
+        } else {
+            String todayDate = TimeTool.getToday();
+            return todayDate + " " + START_HH_MM;
+        }
+    }
+
+    public static String getStartTime() {
+        return START_HH_MM;
+    }
+
+    public static String getEndTime() {
+        return END_HH_MM;
+    }
+
+    public static String getEndDateTime() {
+        Date date = new Date();
+        String startTime = FORMAT_HH_MM.format(date);
+        if (startTime.compareTo(START_HH_MM) < 1) {
+            String todayDate = TimeTool.getToday();
+            return todayDate + " " + END_HH_MM;
+        } else {
+            Date yesterday = TimeTool.getDateAfter(date, 1);
+            return FORMAT_YYYY_MM_DD.format(yesterday) + " " + END_HH_MM;
+        }
+    }
+
+    public static String getStartDateTime(String startTime) {
+        Date date = new Date();
+        if (startTime.compareTo(START_HH_MM) < 1) {
+            Date yesterday = TimeTool.getDateBefore(TimeTool.stringParseToDate(startTime), 1);
+            return FORMAT_HH_MM.format(yesterday) + " " + START_HH_MM;
+        } else {
+            String todayDate = TimeTool.getToday();
+            return todayDate + " " + START_HH_MM;
+        }
+    }
+
+    public static String getDateTimeHHMM(String dateTime) {
+        return dateTime + " " + START_HH_MM;
+    }
+
+    public static String getEndDateTime(String endTime) {
+        Date date = new Date();
+        if (endTime.compareTo(START_HH_MM) < 1) {
+            String todayDate = TimeTool.getToday();
+            return todayDate + " " + END_HH_MM;
+        } else {
+            Date yesterday = TimeTool.getDateAfter(date, 1);
+            return FORMAT_YYYY_MM_DD.format(yesterday) + " " + END_HH_MM;
+        }
+    }
+
+    public static String getLastDateTime(String dateTime) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date yesterday = null;
+        try {
+            yesterday = TimeTool.getDateAfter(sdf.parse(dateTime), 1);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return sdf.format(yesterday) + " " + END_HH_MM;
+    }
+
+    public static String getMonthFirstDay() {
+        Calendar cale = Calendar.getInstance();
+        cale.add(Calendar.MONTH, 0);
+        cale.set(Calendar.DAY_OF_MONTH, 1);
+        return FORMAT_YYYY_MM_DD.format(cale.getTime());
+    }
+
+    public static String getMonthLastDay() {
+        Calendar cale = Calendar.getInstance();
+        cale.add(Calendar.MONTH, 1);
+        cale.set(Calendar.DAY_OF_MONTH, 0);
+        return FORMAT_YYYY_MM_DD.format(cale.getTime());
+    }
+
+
+    public static Date now() {
+        return new Date();
+    }
+
+    public static String formatDateYesterday() {
+        Calendar c = Calendar.getInstance();
+        c.add(DAY_OF_MONTH, -1);
+        SimpleDateFormat a = new SimpleDateFormat(END_DAY_FOMAT_B);
+        String format = a.format(c.getTime());
+        return format;
+
+    }
+
+    public static String formatDateCou() {
+        SimpleDateFormat format = new SimpleDateFormat(EN_FORMAT_A);
+        return format.format(new Date());
+    }
+
+    public static String formatDate() {
+        SimpleDateFormat format = new SimpleDateFormat(BASE_FORMAT);
+        return format.format(new Date());
+    }
+
+    public static String formatDateCoupon() {
+        SimpleDateFormat format = new SimpleDateFormat(SHORT_EN_FORMAT);
+        return format.format(new Date());
+    }
+
+    public static String formatBaseDate(Date date) {
+        SimpleDateFormat format = new SimpleDateFormat(BASE_FORMAT);
+        return format.format(date);
+    }
+
+    public static String formatDateBase() {
+        SimpleDateFormat format = new SimpleDateFormat(BASE_FORMAT1);
+        return format.format(new Date());
+    }
+
+    public static String formatDate(String hour) {
+        SimpleDateFormat format = new SimpleDateFormat(SHORT_FORMAT_HOUR);
+        return format.format(parse(hour, SHORT_FORMAT_HOUR));
+    }
+
+    public static String formatDateCou(Date date) {
+        SimpleDateFormat format = new SimpleDateFormat(EN_FORMAT_A);
+        return format.format(date);
+    }
+
+    public static String formatDateApp() {
+        SimpleDateFormat format = new SimpleDateFormat(EN_FORMAT_B);
+        return format.format(new Date());
+    }
+
+    public static String formatDate(String formatter, Date date) {
+        if (date == null) {
+            return null;
+        }
+        SimpleDateFormat format = new SimpleDateFormat(formatter);
+        return format.format(date);
+    }
+
+    public static String formatDateCnNosecondFormat(String time) {
+        SimpleDateFormat format = new SimpleDateFormat(CN_NOSECOND_FORMAT);
+        return format.format(parse(time));
+    }
+
+    public static String formatDateCN(String dateStr) {
+        SimpleDateFormat format = new SimpleDateFormat(CN_SHORT_FORMAT);
+        return format.format(parse(dateStr));
+    }
+
+    public static Date yesterday() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.DATE, -1);
+        return calendar.getTime();
+    }
+
+    public static String calendarYesterday(String dateStr) {
+        SimpleDateFormat format = new SimpleDateFormat(CN_SHORT_FORMAT);
+        return format.format(parse(dateStr));
+    }
+    public static Date lastMinute() {
+        return lastMinute(new Date());
+    }
+
+    public static Long oneMinute() {
+        return 60000l;
+    }
+
+    public static Long minutes(int num) {
+        return num * oneMinute();
+    }
+
+    public static Long oneHour() {
+        return 60 * oneMinute();
+    }
+
+    public static Long hours(int num) {
+        return num * oneHour();
+    }
+
+    public static Date lastMinute(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.MINUTE, -1);
+        return calendar.getTime();
+    }
+
+    public static Date addDays(Date date, int days) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.DATE, days);
+        return calendar.getTime();
+    }
+
+    public static Date addDays(String time, int days) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(parse(time));
+        calendar.add(Calendar.DATE, days);
+        return calendar.getTime();
+    }
+
+//    public static String checkTwoTime(String timeS, String timeE, String dayTime, int addDay, int type) {
+//        if (timeS == null) {
+//            return null;
+//        }
+//        if (addDay != 0) {
+//            dayTime = formatBaseDate(addDays(dayTime, addDay));
+//        }
+//        String dayS = dayTime.substring(0, 11) + "00:00:00", dayE = dayTime.substring(0, 11) + "23:59:59";
+//        long time1 = parse(timeS).getTime(), time2 = parse(timeS).getTime(), dayStart = parse(dayS).getTime(), dayEnd = parse(dayE).getTime();
+//
+//        if (type == 2) {
+//            if (time2 > dayEnd && time1 < dayEnd) {//中间
+//                timeS = dayE.substring(0, 16);
+//            }
+//            if (time2 >= dayStart && time2 <= dayEnd) {//中间
+//                timeS = timeE.substring(0, 16);
+//            } else {
+//                timeS = null;
+//            }
+//        } else {
+//            if (time1 >= dayStart && time1 <= dayEnd) {//中间
+//                timeS = timeS.substring(0, 16);
+//            } else if (time1 < dayStart && time2 > dayStart) {//左边
+//                timeS = dayS.substring(0, 16);
+//            } else {
+//                timeS = null;
+//            }
+//        }
+//
+//        return timeS;
+//    }
+
+    public static Date addMonths(Date date, int months) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.MONTH, months);
+        return calendar.getTime();
+    }
+
+    public static Date addMinutes(Date date, int minute) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.MINUTE, minute);
+        return calendar.getTime();
+    }
+
+    public static Date addTime(Date date, int minute, int hour, int days, int months) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        if (minute != 0) {
+            calendar.add(Calendar.MINUTE, minute);
+        }
+        if (hour != 0) {
+            calendar.add(Calendar.HOUR, hour);
+        }
+        if (days != 0) {
+            calendar.add(Calendar.DATE, days);
+        }
+        if (months != 0) {
+            calendar.add(Calendar.MONTH, months);
+        }
+        return calendar.getTime();
+    }
+
+    public static String formatDate(Date date) {
+        SimpleDateFormat format = new SimpleDateFormat(BASE_FORMAT);
+        return format.format(date);
+    }
+
+    public static String formatDateShort(Date date) {
+        SimpleDateFormat format = new SimpleDateFormat(SHORT_FORMAT);
+        return format.format(date);
+    }
+
+    public static Date addFileds(Date date, int filed, int val) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(filed, val);
+        return calendar.getTime();
+    }
+
+    public static Date startOfDay(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        Calendar calendar2 = Calendar.getInstance();
+        calendar2.setTime(date);
+        calendar2.set(Calendar.HOUR_OF_DAY, 0);
+        calendar2.set(Calendar.MINUTE, 0);
+        calendar2.set(Calendar.SECOND, 0);
+        calendar2.set(Calendar.MILLISECOND, 0);
+        return calendar2.getTime();
+    }
+
+    public static Date endOfDay(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        Calendar calendar2 = Calendar.getInstance();
+        calendar2.setTime(date);
+        calendar2.set(Calendar.HOUR_OF_DAY, 23);
+        calendar2.set(Calendar.MINUTE, 59);
+        calendar2.set(Calendar.SECOND, 59);
+        calendar2.set(Calendar.MILLISECOND, 999);
+        return calendar2.getTime();
+    }
+
+    public static Date startOfMonth(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        Calendar calendar2 = Calendar.getInstance();
+        calendar2.setTime(date);
+        calendar2.set(Calendar.YEAR, calendar.get(Calendar.YEAR));
+        calendar2.set(Calendar.MONTH, calendar.get(Calendar.MONTH));
+        calendar2.set(Calendar.DATE, 1);
+        return startOfDay(calendar2.getTime());
+    }
+
+    public static Date endOfMonth(Date date) {
+        Date tempDate = startOfMonth(date);
+        tempDate = addMonths(tempDate, 1);
+        tempDate = addDays(tempDate, -1);
+        tempDate = endOfDay(tempDate);
+        return tempDate;
+    }
+
+    public static Date parse(String dateStr) {
+        if (dateStr.length() == 16) {
+            return parse(dateStr, BASE_FORMAT1);
+        }
+        if (dateStr.length() == 10) {
+            return parse(dateStr, SHORT_FORMAT);
+        }
+        return parse(dateStr, BASE_FORMAT);
+    }
+
+    public static Date parse(String dateStr, String formatStr) {
+        return parse(dateStr, formatStr, null);
+    }
+
+    public static Date parse(String dateStr, String formatStr, Date defaultDate) {
+        SimpleDateFormat format = new SimpleDateFormat(formatStr);
+        try {
+            return format.parse(dateStr);
+        } catch (ParseException e) {
+            return defaultDate;
+        }
+    }
+
+    public static Date set(Date srcDate, int field, int value) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(srcDate);
+        calendar.set(field, value);
+        return calendar.getTime();
+    }
+
+    public static int get(Date srcDate, int field) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(srcDate);
+        return calendar.get(field);
+    }
+
+    public static long randomNum(int len) {
+        int sum = 1;
+        for (int i = 0; i < len; i++) {
+            sum *= 10;
+        }
+        return (long) (Math.random() * sum);
+    }
+
+    public static String itenfiy(int len) {
+        return formatDate(SHORT_EN_FORMAT, new Date()) + randomNum(len);
+    }
+
+    public static long minutesBetweenTwoTime(Date end, Date start) {
+        Calendar dateOne = Calendar.getInstance(), dateTwo = Calendar.getInstance();
+        dateOne.setTime(end);
+        dateTwo.setTime(start);
+        long timeOne = dateOne.getTimeInMillis();
+        long timeTwo = dateTwo.getTimeInMillis();
+        long minute = (timeOne - timeTwo) / (1000 * 60);//转化minute
+        return minute;
+    }
+
+    public static long houresBetweenTwoTime(Date end, Date start) {
+        Calendar dateOne = Calendar.getInstance(), dateTwo = Calendar.getInstance();
+        dateOne.setTime(end);
+        dateTwo.setTime(start);
+        long timeOne = dateOne.getTimeInMillis();
+        long timeTwo = dateTwo.getTimeInMillis();
+        long hours = (timeOne - timeTwo) / (1000 * 60 * 60);//转化小时
+        if ((timeOne - timeTwo) % (1000 * 60 * 60) > 0) {
+            hours += 1L;
+        }
+        return hours;
+    }
+
+    public static long daysBetweenTwoTime(Date end, Date start) {
+        Calendar dateOne = Calendar.getInstance(), dateTwo = Calendar.getInstance();
+        dateOne.setTime(end);
+        dateTwo.setTime(start);
+        long timeOne = dateOne.getTimeInMillis();
+        long timeTwo = dateTwo.getTimeInMillis();
+        long days = (timeOne - timeTwo) / (1000 * 60 * 60 * 24) + 1L;//转化minute
+        return days;
+    }
+
+    public static String getDayOfWeek(Date date) {
+        SimpleDateFormat dateFm = new SimpleDateFormat("EEEE");
+        return dateFm.format(date);
+    }
+
+    @SuppressWarnings("deprecation")
+    public static String translateBaseTime(String time) {
+        Date tim = parse(time);
+        String t = formatDate(CN_SHORT_FORMAT, tim);
+        //t += hourVal(tim.getHours())+tim.getMinutes()+"分";
+        return t;
+    }
+
+    public static String hourVal(int hour) {
+        if (0 < hour && hour <= 6) {
+            return "凌晨" + hour + "点";
+        } else if (hour <= 8) {
+            return "早晨" + hour + "点";
+        } else if (hour <= 11) {
+            return "上午" + hour + "点";
+        } else if (hour <= 13) {
+            if (hour == 13) {
+                hour = 1;
+            }
+            return "中午" + hour + "点";
+        } else if (hour <= 17) {
+            hour = hour - 12;
+            return "下午" + hour + "点";
+        } else if (hour <= 22) {
+            hour = hour - 12;
+            return "晚上" + hour + "点";
+        } else {
+            hour = hour - 12;
+            return "夜间" + hour + "点";
+        }
+    }
+
+    public static int getCurDayOfWeek(Date dt) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(dt);
+        int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
+        if (w < 0)
+            w = 0;
+        if (w == 0) {
+            return 7;
+        }
+        return w;
+    }
+
+    public static int getCurDayEnOfWeek(Date dt) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(dt);
+        return cal.get(Calendar.DAY_OF_WEEK);
+    }
+
+    public static String getWeekOfDate(String dateStr) {
+        String[] weekOfDays = {"星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"};
+        Calendar calendar = Calendar.getInstance();
+        if (dateStr != null && dateStr.length() > 9) {
+            Date da = parse(dateStr);
+            calendar.setTime(da);
+        }
+        int w = calendar.get(Calendar.DAY_OF_WEEK) - 1;
+        if (w < 0) {
+            w = 0;
+        }
+        return weekOfDays[w];
+    }
+
+    public static String getWeekOfDateShort(String dateStr) {
+        String[] weekOfDays = {"日", "一", "二", "三", "四", "五", "六"};
+        Calendar calendar = Calendar.getInstance();
+        if (dateStr != null && dateStr.length() > 9) {
+            Date da = parse(dateStr);
+            calendar.setTime(da);
+        }
+        int w = calendar.get(Calendar.DAY_OF_WEEK) - 1;
+        if (w < 0) {
+            w = 0;
+        }
+        return weekOfDays[w];
+    }
+
+//    public static int daysOfTwo(String startTime, String endTime) {
+//        int days = (int) ((parse(startTime).getTime() - parse(endTime).getTime()) / 86400000);
+//        if (days < 0) {
+//            return -days;
+//        }
+//        return days;
+//
+//    }
+//
+//    public static boolean boolTwodays(String oneTime, String twoTime) {//oneTime > true
+//        long a = (parse(oneTime).getTime() - parse(twoTime).getTime());
+//        boolean flag = a > 0 ? true : false;
+//        return flag;
+//
+//    }
+
+//    public static boolean boolTwodays(Date dateS, Date dateE) {//oneTime > true
+//        long a = (dateE.getTime() - dateS.getTime());
+//        boolean flag = a > 0 ? true : false;
+//        return flag;
+//
+//    }
+
+    /**
+     * 获取上一周的起始时间
+     *
+     * @return
+     * @author sundf
+     * 2016年9月19日下午5:44:58
+     */
+    public static Date getStartOfWeek() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.WEEK_OF_YEAR, -1);
+        calendar.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        return calendar.getTime();
+    }
+
+    /**
+     * 获取上一周 的结束时间
+     *
+     * @return
+     * @author sundf
+     * 2016年9月19日下午5:45:11
+     */
+    public static Date getEndOfWeek() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.WEEK_OF_YEAR, -1);
+        calendar.set(Calendar.DAY_OF_WEEK, Calendar.SATURDAY);
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+        return calendar.getTime();
+    }
+
+//    public static List<String> getDayListBetweenDate(String startTime, String endTime) {
+//        Long startMills = DateUtil.parse(startTime).getTime();
+//        Long endMills = DateUtil.parse(endTime).getTime();
+//        List<String> rlist = new ArrayList<>();
+//        Long oneDay = (long) (24 * 60 * 60 * 1000);
+//        rlist.add(DateUtil.formatDateShort(new Date(startMills)));
+//        while (endMills - startMills > oneDay) {
+//            startMills += oneDay;
+//            rlist.add(DateUtil.formatDateShort(new Date(startMills)));
+//        }
+//        return rlist;
+//    }
+
+    public static int getTotalDay(String time) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(DateUtil.parse(time));
+        return calendar.getActualMaximum(DateUtil.DAY_OF_MONTH);
+    }
+
+    public static int getMonthsBetweenTime(String fromTime, String toTime) {
+        int result = 0;
+        Calendar c1 = Calendar.getInstance();
+        Calendar c2 = Calendar.getInstance();
+        c1.setTime(DateUtil.parse(fromTime));
+        c2.setTime(DateUtil.parse(toTime));
+        int months = (c2.get(DateUtil.YEAR) - c1.get(DateUtil.YEAR)) * 12;
+        result = c2.get(Calendar.MONTH) - c1.get(Calendar.MONTH) + months;
+        if (c1.get(DateUtil.DAY_OF_MONTH) != 1) {
+            result = result - 1;
+        }
+        return result == 0 ? 1 : Math.abs(result);
+    }
+
+    /**
+     * 按半小时分割两个时间段
+     *
+     * @param startTime 开始时间，格式yyyy-MM-dd HH:mm
+     * @param endTime   结束时间，格式同上
+     * @param separate  分隔数，例：30代表按半小时分割
+     * @return
+     * @author zhangjx
+     * @date 2017年6月19日 下午5:10:11
+     */
+//    public static List<String> splitTimeBySeparate(String startTime, String endTime, int separate) {
+//
+//        Date startDate = parse(startTime, DateUtil.BASE_FORMAT1);
+//        Date endDate = parse(endTime, DateUtil.BASE_FORMAT1);
+//        List<String> dateList = new ArrayList<String>();
+//        for (Date tempDate = startDate; tempDate.before(endDate) == true; tempDate = addMinutes(tempDate, separate)) {
+//            dateList.add(formatDate(DateUtil.BASE_FORMAT1, tempDate));
+//        }
+//        dateList.add(formatDate(DateUtil.BASE_FORMAT1, endDate));
+//        return dateList;
+//    }
+
+    /**
+     * 获取当前时间的月份的第一天第一秒
+     *
+     * @param "startTime" 开始时间，格式yyyy-MM-dd HH:mm
+     * @param "endTime"   结束时间，格式同上
+     * @param "separate"
+     * @return
+     * @author liwq
+     * @date 2017年8月06日 下午5:10:11
+     */
+    public static String getFirstDayOfMonth() {
+        SimpleDateFormat dateFormat = new SimpleDateFormat(BASE_FORMAT);
+        Calendar c = Calendar.getInstance();
+        c.add(Calendar.MONTH, 0);
+        c.set(Calendar.DAY_OF_MONTH, 1);
+        c.set(Calendar.HOUR_OF_DAY, 0);
+        c.set(Calendar.MINUTE, 0);
+        c.set(Calendar.SECOND, 0);
+        return dateFormat.format(c.getTime());
+    }
+
+
+    /**
+     * 获取时间差
+     *
+     * @param "startTime" 开始时间，格式yyyy-MM-dd HH:mm
+     * @param "endTime"   结束时间，格式同上
+     * @param "separate"
+     * @return
+     * @author liwq
+     * @date 2017年8月06日 下午5:10:11
+     */
+    public static String getTimeDifference(String arriveTime, String auditTime, Byte status) {
+        SimpleDateFormat format = new SimpleDateFormat(BASE_FORMAT);
+        try {
+            String date = format.format(new Date());
+            Date parse1 = format.parse(arriveTime);
+            Date parse2 = format.parse(date);
+            Date parse3 = format.parse(auditTime);
+            long l = 0;
+            if (status == (byte) 1) {
+
+                l = parse2.getTime() - parse1.getTime();
+            } else {
+                l = parse3.getTime() - parse1.getTime();
+
+            }
+            long day = l / (24 * 60 * 60 * 1000);
+            long hour = (l / (60 * 60 * 1000) - day * 24);
+            long min = ((l / (60 * 1000)) - day * 24 * 60 - hour * 60);
+//    		    long s=(l/1000-day*24*60*60-hour*60*60-min*60);
+            String m = day + "天" + hour + "小时" + min + "分";
+            if (day == (long) 0) {
+                m = hour + "小时" + min + "分";
+            }
+            if (day == (long) 0 && hour == (long) 0) {
+                m = min + "分";
+            }
+            return m;
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return null;
+
+    }
+
+
+    /**
+     * 获取指定格式的时间格式
+     *
+     * @param format
+     * @return
+     */
+    public static String getShortHourMinute(String format) {
+        try {
+            DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(format);
+            String shortHourMinute = dateTimeFormatter.format(LocalDateTime.now());
+            return shortHourMinute;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 获取前一天
+     *
+     * @return yyyy-MM-dd
+     */
+    public static String getPreviousDay(Date dateTime) {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar c = Calendar.getInstance();
+        if (dateTime != null) {
+            c.setTime(dateTime);
+        }
+        c.add(Calendar.DATE, -1);
+        Date start = c.getTime();
+        String date = format.format(start);//前一天
+        return date;
+    }
+
+    /**
+     * 获取后一天
+     *
+     * @return yyyy-MM-dd
+     */
+    public static String getTomorrowDay(Date dateTime) {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar c = Calendar.getInstance();
+        if (dateTime != null) {
+            c.setTime(dateTime);
+        }
+        c.add(Calendar.DATE, 1);
+        Date start = c.getTime();
+        String date = format.format(start);//前一天
+        return date;
+    }
+
+    public static Date strToFormatDate(String date, String initformat, String endformat) {
+        SimpleDateFormat initsdf = new SimpleDateFormat(initformat);
+        try {
+            Date parse = initsdf.parse(date);
+            SimpleDateFormat endsdf = new SimpleDateFormat(endformat);
+            return endsdf.parse(endsdf.format(parse));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static long millisBetweenTwoTime(Date end, Date start) {
+        Calendar dateOne = Calendar.getInstance(), dateTwo = Calendar.getInstance();
+        dateOne.setTime(end);
+        dateTwo.setTime(start);
+        long timeOne = dateOne.getTimeInMillis();
+        long timeTwo = dateTwo.getTimeInMillis();
+        long minute = timeOne - timeTwo;//转化minute
+        return minute;
+    }
+
+    /**
+     * 获取过去第几天的日期
+     */
+    public static String getPastDate(int past) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - past);
+        Date today = calendar.getTime();
+        SimpleDateFormat format = new SimpleDateFormat(SHORT_FORMAT);
+        return format.format(today);
+    }
+
+    public static void main(String[] args) {
+        System.out.println(getPastDate(7));
+        System.out.println(formatDateShort(new Date()));
+    }
+
+    public static boolean isValidDate(String dateStr) {
+        //判断结果 默认为true
+        boolean judgeresult = true;
+        //1、首先使用SimpleDateFormat初步进行判断，过滤掉注入 yyyy-01-32 或yyyy-00-0x等格式
+        //此处可根据实际需求进行调整，如需判断yyyy/MM/dd格式将参数改掉即可
+        SimpleDateFormat format = new SimpleDateFormat(BASE_FORMAT);
+        try {
+            //增加强判断条件，否则 诸如2022-02-29也可判断出去
+            format.setLenient(false);
+            Date date = DateUtil.parse(DateUtil.formatDate(DateUtil.BASE_FORMAT,DateUtil.parse(dateStr)));
+            ;
+            System.out.println(date);
+        } catch (Exception e) {
+            judgeresult = false;
+        }
+        //由于上述方法只能验证正常的日期格式，像诸如 0001-01-01、11-01-01，10001-01-01等无法校验，此处再添加校验年费是否合法
+        String yearStr = dateStr.split("-")[0];
+        if (yearStr.startsWith("0") || yearStr.length() != 4) {
+            judgeresult = false;
+        }
+        return judgeresult;
+    }
+
+    /**
+     * 获取上个月最后一天
+     */
+    public static String getLastMonthLastDay() {
+        Calendar calendar = Calendar.getInstance();
+        //指定日期月份减去一
+        calendar.add(Calendar.MONTH, -1);
+        //指定日期月份减去一后的 最大天数
+        calendar.set(Calendar.DATE, calendar.getActualMaximum(Calendar.DATE));
+        //获取上给月最后一天的日期
+        Date lastDateOfPrevMonth = calendar.getTime();
+
+        return dateFormat.format(lastDateOfPrevMonth);
+    }
+
+    /**
+     * 获取上个月第一天
+     */
+    public static String getLastMonthFristDay() {
+
+        Calendar calendar = Calendar.getInstance();
+        //指定日期月份减去一
+        calendar.add(Calendar.MONTH, -1);
+        //指定日期月份减去一后的 最大天数
+        calendar.set(Calendar.DATE, calendar.getActualMinimum(Calendar.DATE));
+        //获取上给月第一天的日期
+        Date lastDateOfPrevMonth = calendar.getTime();
+
+        return dateFormat.format(lastDateOfPrevMonth);
+    }
+
+    /**
+     * 获取上个月
+     */
+    public static String getLastMonth() {
+        Date date = new Date();
+
+        SimpleDateFormat dateFormat = new SimpleDateFormat("MM");
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1);
+        Date lastDateOfPrevMonth = calendar.getTime();
+
+        return dateFormat.format(lastDateOfPrevMonth);
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/util/EamEnumUtil.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/util/EamEnumUtil.java
new file mode 100644
index 0000000..0de9e17
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/util/EamEnumUtil.java
@@ -0,0 +1,1681 @@
+package cn.estsh.i3plus.pojo.eam.util;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yinxiao
+ * @CreateDate : 2022-01-20 15点04分
+ * @Modify:
+ **/
+public class EamEnumUtil {
+
+    /**
+     * 可以导入的内部表
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IMPORT_TABLE_NAME {
+        Equipment("Equipment", "设备台账"),
+        EamOpItem("EamOpItem", "作业要求"),
+        EamPart("EamPart", "备品备件清单"),
+        DynamicEnum("DynamicEnum", "字典"),
+        EamAreaPartGroup("EamAreaPartGroup", "区别类别"),
+        EamDocMaster("EamDocMaster", "单据主表"),
+        EamDocDetails("EamDocDetails", "单据明细"),
+        EamDocMovementDetail("EamDocMovementDetail", "备品备件出入库导入"),
+        EamDocCsDetails("EamDocCsDetails", "备品备件盘点导入"),
+        EamPlanRule("EamPlanRule", "计划规则表"),
+        EamPlanRuleMaintenance("EamPlanRuleMaintenance", "计划规则表(保养)"),
+        EamEquipmentContact("EamEquipmentContact", "设备联络单表"),
+        EamEquipmentContactCause("EamEquipmentContactCause", "设备联络原因区分表"),
+        EamEquipmentContactPurpose("EamEquipmentContactPurpose", "设备联络目的表"),
+        EamOpItemMain("EamOpItemMain", "主作业要求"),
+        amStock("EamStock", "备品备件库存"),
+        EamManageLineRelation("EamManageLineRelation", "保管场所与产线关系"),
+        EquipmentType("EquipmentType", "设备类型"),
+        EamGdUser("EamGdUser", "人员信息(广东)"),
+        EamHnUser("EamHnUser", "人员信息(海宁)"),
+        EamGdPlanRule("EamGdPlanRule", "计划规则表(广东)"),
+        EamHnPlanRule("EamHnPlanRule", "计划规则表(海宁)"),
+        ;
+
+        private final String value;
+        private final String description;
+
+        IMPORT_TABLE_NAME(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+    }
+
+    /**
+     * 可以导出的内部表
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EXPORT_TABLE_NAME {
+        Equipment("Equipment", "设备台账/模具台账"),
+        EamOpItem("EamOpItem", "作业要求"),
+        EamPart("EamPart", "备品备件清单"),
+        DynamicEnum("DynamicEnum", "字典"),
+        EamAreaPartGroup("EamAreaPartGroup", "区别类别"),
+        EamDocMaster("EamDocMaster", "单据主表"),
+        EamDocDetails("EamDocDetails", "单据明细"),
+        EamDocMovementMaster("EamDocMovementMaster", "备品备件单据主表"),
+        EamDocMovementDetail("EamDocMovementDetail", "备品备件单据明细表"),
+        EamDocCsMaster("EamDocCsMaster", "备品备件盘点主表"),
+        EamDocCsDetails("EamDocCsDetails", "备品备件盘点明细表"),
+        EamPlanRule("EamPlanRule", "计划规则表"),
+        EamPlanRuleMaintenance("EamPlanRuleMaintenance", "计划规则表(保养)"),
+        EamEquipmentContact("EamEquipmentContact", "设备联络单表"),
+        EamEquipmentContactCause("EamEquipmentContactCause", "设备联络原因区分表"),
+        EamEquipmentContactPurpose("EamEquipmentContactPurpose", "设备联络目的表"),
+        EamOpItemMain("EamOpItemMain", "主作业要求"),
+        EamStock("EamStock", "备品备件库存"),
+        EamManageLineRelation("EamManageLineRelation", "保管场所与产线关系"),
+        EquipmentType("EquipmentType", "设备类型"),
+        EamGdUser("EamGdUser", "人员信息(广东)"),
+        EamHnUser("EamHnUser", "人员信息(海宁)"),
+        EamGdPlanRule("EamGdPlanRule", "计划规则表(广东)"),
+        EamHnPlanRule("EamHnPlanRule", "计划规则表(海宁)"),
+        ;
+
+        private final String value;
+        private final String description;
+
+        EXPORT_TABLE_NAME(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+    }
+
+    /**
+     * 工艺路径有效性判断类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTING_VALID_TYPE {
+        ORDER_CALC_LET("ORDER_CALC_LET", "与订单的最晚结束时刻计算值做比较"),
+        CALC_LET_LT("CALC_LET_LT", "与最晚结束时刻计算值-提前期做比较"),
+        BASE_TIME("BASE_TIME", "与基准时刻做比较");
+
+        private final String value;
+        private final String description;
+
+        ROUTING_VALID_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 字段的编辑类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EDIT_TYPE {
+        NONE("NONE", "未知"),
+        BOOLEAN("BOOLEAN", "布尔, 开关编辑"),
+        CHAR("CHAR", "字符, 文本框编辑"),
+        SHORT("SHORT", "短整型, 数字编辑"),
+        INTEGER("INTEGER", "整型, 数字编辑"),
+        LONG("LONG", "长整型, 数字编辑"),
+        DOUBLE("DOUBLE", "浮点型, 文本框编辑"),
+        DATE("DATE", "日期类型(2019-09-16)"),
+        TIME("TIME", "时间类型(17:35:30)"),
+        DATE_TIME("DATE_TIME", "日期时间类型(2019-09-16 17:35:30)"),
+        DURATION("DURATION", "时间段(1H),文本框编辑"),
+        ENUM("ENUM", "枚举,下拉选择"),
+        MULTI_ENUM("MULTI_ENUM", "多选枚举， 下拉多选"),
+        STRING("STRING", "字符串，文本框编辑"),
+        OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值"),
+        LIST("LIST", "对象集合，不可编辑。"),
+        MULTI_OBJECT("MULTI_OBJECT", "多选对象，弹出框选择，可以选择全部对象，以*表示选择全部"),
+        QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项"),
+        COLOR_PICKER("COLOR_PICKER", "颜色选择框");
+
+        private final String value;
+        private final String description;
+
+        EDIT_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 字段类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FIELD_TYPE {
+        NONE("NONE", "未知"),
+        BOOLEAN("BOOLEAN", "布尔"),
+        CHAR("CHAR", "字符"),
+        SHORT("SHORT", "短整型"),
+        INTEGER("INTEGER", "整型"),
+        LONG("LONG", "长整型"),
+        DOUBLE("DOUBLE", "浮点型"),
+        DATE("DATE", "日期类型(2019-09-16)"),
+        TIME("TIME", "时间类型(17:35:30)"),
+        DATE_TIME("DATE_TIME", "日期时间类型(2019-09-16 17:35:30)"),
+        DURATION("DURATION", "时间段(1H)"),
+        ENUM("ENUM", "枚举"),
+        MULTI_ENUM("MULTI_ENUM", "多选枚举"),
+        STRING("STRING", "字符串"),
+        OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值"),
+        LIST("LIST", "对象集合，不可编辑。");
+
+        private final String value;
+        private final String description;
+
+        FIELD_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    public static enum LANGUAGE_TYPE {
+        GROOVY(1, "Groovy", 10),
+        PYTHON(2, "jython", 20),
+        JS(3, "JavaScript", 30);
+
+        private int index;
+        private String description;
+        private int value;
+
+        private LANGUAGE_TYPE(int index, String description, int value) {
+            this.index = index;
+            this.description = description;
+            this.value = value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public int getIndex() {
+            return this.index;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public static String getCodeByIndex(Integer index) {
+            LANGUAGE_TYPE[] var1 = values();
+            int var2 = var1.length;
+
+            for (int var3 = 0; var3 < var2; ++var3) {
+                LANGUAGE_TYPE languageType = var1[var3];
+                if (languageType.getValue() == index) {
+                    return languageType.getDescription();
+                }
+            }
+
+            return null;
+        }
+    }
+
+    /**
+     * 日志推送至MQ的处理类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOG_TO_MQ_HANDLE_TYPE {
+        INSERT(10, "新增"), UPDATE(20, "修改"), DELETE(30, "删除");
+        private int value;
+        private String description;
+
+        LOG_TO_MQ_HANDLE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 自定义列表：优先级  (CUSTOMIZE_PROP)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CUSTOMIZE_PROP {
+        DEFAULT(1, "默认"), CUSTOMIZE(2, "自定义");
+        private int value;
+        private String description;
+
+        CUSTOMIZE_PROP(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum QUEUE_JIT_ACTUAL_DETAIL_STATUS {
+        NORMAL(10, "正常"),
+        WASHED_MATERIAL(20, "已冲料");
+
+        private int value;
+        private String description;
+
+        private QUEUE_JIT_ACTUAL_DETAIL_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public enum TASK_TYPE {
+        QUALITATIVE(10, "定性"),
+        QUANTITATIVE(20, "定量");
+
+        private int value;
+        private String description;
+
+        private TASK_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum ASC_OR_DESC {
+        ASC(0, "正序"),
+        DESC(1, "倒序");
+
+        private int value;
+        private String description;
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        private ASC_OR_DESC(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum SHOW_COLOR {
+        NORMAL("NORMAL", "正常"),
+        YELLOW("YELLOW", "黄色"),
+
+        RED("RED", "红色"),
+        ;
+
+        private String value;
+        private String description;
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        private SHOW_COLOR(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+    }
+
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum APPROVAL_STATE {
+        YES("YES", "已审批"),
+        NO("NO", "待审批");
+
+        private String value;
+        private String description;
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        private APPROVAL_STATE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+    }
+
+    /**
+     * 审核是否通过
+     */
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum APPROVAL_RESULT {
+        OK("OK", "通过"),
+        NO("NO", "未通过");
+
+        private String value;
+        private String description;
+
+        private APPROVAL_RESULT(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 设备状态
+     */
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum EQU_STATUS {
+        NORMAL("NORMAL", "正常"),
+        MAINTENANCE("MAINTENANCE", "保养"),
+        REPAIR("REPAIR", "维修");
+
+        private String value;
+        private String description;
+
+        private EQU_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 寿命分布
+     */
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum LIFE_DISTR {
+        SOP("SOP", "SOP"),
+        LESS_EOP("LESS_EOP", "EOP(少用)"),
+        EOP_RIN_SCRAP("EOP_RIN_SCRAP", "EOP(待报废)");
+
+        private String value;
+        private String description;
+
+        private LIFE_DISTR(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 审核是否通过
+     */
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum TRUE_OR_FALSE {
+        YES("YES", "是"),
+        FALSE("FALSE", "否");
+
+        private String value;
+        private String description;
+
+        private TRUE_OR_FALSE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum EAM_EQUIPMENT_TYPE {
+        PHYSICAL("10", "物理设备"),
+        LOGIC("20", "逻辑设备");
+
+        private String value;
+        private String description;
+
+        private EAM_EQUIPMENT_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum EQUIPMENT_BIG_CLAESS {
+        ZS("10", "注塑机");
+
+        private String value;
+        private String description;
+
+        private EQUIPMENT_BIG_CLAESS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum EAM_EQUIPMENT_CATEGORY {
+        A("A", "A"),
+        B("B", "B"),
+        C("C", "C"),
+        D("D", "D");
+
+        private String value;
+        private String description;
+
+        private EAM_EQUIPMENT_CATEGORY(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum EAM_DOC_ITEM_DESC {
+        A("A", "合格(正常)", "●", "A"),
+        B("B", "设备故障中", "▲", ""),
+        C("C", "设备异常", "×", "B"),
+        D("D", "合格，并在选择的同时自动在备注字段带出“该项不需要点检", "■", ""),
+        E("E", "保养", "OK", "▲"),
+        F("F", "维修(点检)", "NG", "■"),
+        G("G", "确认", "", "O");
+
+        private String value;
+        private String description;
+        private String remark;
+        private String gdRemark;
+
+        private EAM_DOC_ITEM_DESC(String value, String description, String remark, String gdRemark) {
+            this.value = value;
+            this.description = description;
+            this.remark = remark;
+            this.gdRemark = gdRemark;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getRemark() {
+            return this.remark;
+        }
+
+        public String getGdRemark() {
+            return this.gdRemark;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum EAM_EQUIPMENT_CONNECT_TYPE {
+        PLC(10, "PLC"),
+        DB(20, "DB"),
+        OTHER(30, "其他");
+
+        private int value;
+        private String description;
+
+        private EAM_EQUIPMENT_CONNECT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum CHECK_MODEL {
+        NO_CHECK(10, "不校验"),
+        CHECK(20, "校验设备就绪信号");
+
+        private int value;
+        private String description;
+
+        private CHECK_MODEL(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 导入类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IMPORT_DETAIL_TYPE {
+        REPLACE("REPLACE", "替代导入"),
+        DIFF("DIFF", "差分导入");
+
+        private final String value;
+        private final String description;
+
+        IMPORT_DETAIL_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+
+    /**
+     * 数据连接类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_LINK_TYPE {
+        EXCEL("EXCEL", "EXCEL"),
+        MYSQL("MYSQL", "MySql"),
+        ORACLE("ORACLE", "Oracle"),
+        SQLSERVER("SQLSERVER", "SqlServer");
+
+        private final String value;
+        private final String description;
+
+        DATA_LINK_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+
+    /**
+     * 点检计划单状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EAM_DOC_STATUS {
+
+        CREATE("CREATE", "创建"),
+        PROCESSING("PROCESSING", "处理中"),
+        COMPLETE("COMPLETE", "完成"),
+        CLOSE("CLOSE", "关闭"),
+        PENDING("PENDING", "待审批");
+
+        private String value;
+        private String description;
+
+        EAM_DOC_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer valueIndex(String val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    return i;
+                }
+            }
+            return null;
+        }
+    }
+
+
+    /**
+     * 周期作业业务类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EAM_DOC_BUSI_TYPE {
+        CHECK("CHECK", "点检"),
+        MAINTENANCE("MAINTENANCE", "保养"),
+        REPAIR("REPAIR", "维修");
+
+        private String value;
+        private String description;
+
+        EAM_DOC_BUSI_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static EAM_DOC_BUSI_TYPE getByValue(String value) {
+            for (EAM_DOC_BUSI_TYPE type : values()) {
+                if (type.getValue().equals(value)) {
+                    return type;
+                }
+            }
+            return null;
+        }
+
+        public static Integer valueIndex(String val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    return i;
+                }
+            }
+            return null;
+        }
+
+        public static Integer descriptionIndex(String desc) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    return i;
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * 周期作业业务类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EAM_REPAIR_DOC_BUSI_TYPE {
+        CHECK_TO_REPAIR("CHECK_TO_REPAIR", "点检维修"),
+        MAINTENANCE_TO_REPAIR("MAINTENANCE_TO_REPAIR", "保养维修"),
+        REPAIR("REPAIR", "维修");
+
+        private String value;
+        private String description;
+
+        EAM_REPAIR_DOC_BUSI_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static EAM_REPAIR_DOC_BUSI_TYPE getByValue(String value) {
+            for (EAM_REPAIR_DOC_BUSI_TYPE type : values()) {
+                if (type.getValue().equals(value)) {
+                    return type;
+                }
+            }
+            return null;
+        }
+
+        public static Integer valueIndex(String val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    return i;
+                }
+            }
+            return null;
+        }
+
+        public static Integer descriptionIndex(String desc) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    return i;
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * 周期作业业务类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EQU_CON_STATUS {
+        CREATE("CREATE", "创建"),
+        REPLY("REPLY", "已答复"),
+        CONFIRM("CONFIRM", "已确认"),
+        COMPLETE("COMPLETE", "完成"),
+        CLOSE("CLOSE", "关闭");
+
+        private String value;
+        private String description;
+
+        EQU_CON_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static EQU_CON_STATUS getByValue(String value) {
+            for (EQU_CON_STATUS type : values()) {
+                if (type.getValue().equals(value)) {
+                    return type;
+                }
+            }
+            return null;
+        }
+
+        public static Integer valueIndex(String val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    return i;
+                }
+            }
+            return null;
+        }
+
+        public static Integer descriptionIndex(String desc) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    return i;
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * 模具条码状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MOULD_SN_STATUS {
+        IN_STOCK("IN_STOCK", "在库"),
+        OUT_STOCK("OUT_STOCK", "出库"),
+        IN_ONLINE("IN_ONLINE", "上线");
+
+        private String value;
+        private String description;
+
+        MOULD_SN_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equalsIgnoreCase(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * 模具条码操作类型状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MOULD_OPERATE_MOVE_TYPE {
+        IN_STOCK("IN_STOCK", "入库"),
+        OUT_STOCK("OUT_STOCK", "出库"),
+        IN_ONLINE("IN_ONLINE", "上线");
+
+        private String value;
+        private String description;
+
+        MOULD_OPERATE_MOVE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equalsIgnoreCase(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * 模具条码业务类型状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MOULD_OPERATE_BUSI_TYPE {
+        START_CHANGE("START_CHANGE", "开始换膜"),
+        END_CHANGE("END_CHANGE", "结束换膜"),
+        START_DEBUG("START_DEBUG", "开始调试"),
+        END_DEBUG("END_DEBUG", "结束调试"),
+        START_UNLOAD_MOULD("START_UNLOAD_MOULD", "开始卸膜"),
+        END_UNLOAD_MOULD("END_UNLOAD_MOULD", "结束卸膜");
+
+        private String value;
+        private String description;
+
+        MOULD_OPERATE_BUSI_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equalsIgnoreCase(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+
+    }
+
+    /**
+     * 模具条码出库原因
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MOULD_OUT_REASON {
+        SPOT_CHECK("SPOT_CHECK", "点检"),
+        MAINTAIN("MAINTAIN", "保养"),
+        REPAIR("REPAIR", "维修");
+
+        private String value;
+        private String description;
+
+        MOULD_OUT_REASON(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equalsIgnoreCase(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * 库位状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOCATE_STATUS {
+        EMPTY("EMPTY", "空"),
+        FULL("FULL", "满");
+
+        private String value;
+        private String description;
+
+        LOCATE_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equalsIgnoreCase(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 入库单操作类型状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_MOVE_TYPE {
+        IN_STOCK("IN_STOCK", "入库"),
+        OUT_STOCK("OUT_STOCK", "出库");
+
+        private String value;
+        private String description;
+
+        ORDER_MOVE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 入库、出库单据状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_DOC_STATUS {
+
+        CREATE("CREATE", "创建"),
+        PROCESSING("PROCESSING", "处理中"),
+        COMPLETE("COMPLETE", "完成");
+
+        private String value;
+        private String description;
+
+        ORDER_DOC_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 盘点单据状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_DOC_CS_STATUS {
+
+        CREATE("CREATE", "创建"),
+        STARTING_INVENTORY("STARTING_INVENTORY", "开启盘点"),
+        IN_INVENTORY("IN_INVENTORY", "盘点中"),
+        INVENTORY_FINISH("INVENTORY_FINISH", "盘点完成");
+
+        private String value;
+        private String description;
+
+        ORDER_DOC_CS_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    /**
+     * 库存状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOCK_STATUS {
+
+        NORMAL("NORMAL", "正常"),
+        FROZEN("FROZEN", "冻结");
+
+        private String value;
+        private String description;
+
+        STOCK_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 区域类别
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_GROUP {
+        CABINET_ONE("CABINET_ONE", "一号柜（光电传感类）"),
+        CABINET_TWO("CABINET_TWO", "二号柜（主控电器类）"),
+        CABINET_THREE("CABINET_THREE", "三号柜（主控接插类）"),
+        CABINET_FOUR("CABINET_FOUR", "四号柜（控制电器类）"),
+        CABINET_FIVE("CABINET_FIVE", "五号柜（执行电器类）"),
+        CABINET_SIX("CABINET_SIX", "六号柜（控制元件类）"),
+        CABINET_SEVEN("CABINET_SEVEN", "七号柜（执行元件类）"),
+        CABINET_EIGHT("CABINET_EIGHT", "八号柜（机械传动类）"),
+        CABINET_NINE("CABINET_NINE", "九号柜（机械五金类）"),
+        CABINET_TEN("CABINET_TEN", "十号柜（水气配件类）"),
+        CABINET_ELEVEN("CABINET_ELEVEN", "十一号柜（常用消耗类）"),
+        CABINET_TWELVE("CABINET_TWELVE", "十二号柜（其它附件类）"),
+        CABINET_THIRTEEN("CABINET_THIRTEEN", "十三号柜（气动接头类）"),
+        CABINET_FOURTEEN("CABINET_FOURTEEN", "十四号柜（机械工具类）"),
+        CABINET_FIFTEEN("CABINET_FIFTEEN", "十五号柜（紧固件分类）"),
+        CABINET_SIXTEEN("CABINET_SIXTEEN", "十六号小仓库（电缆气管灯管）");
+
+        private String value;
+        private String description;
+
+        PART_GROUP(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TIME_DIMENSION {
+        YEAR("YEAR", "年"),
+        MONTH("MONTH", "月"),
+        DAY("DAY", "日");
+
+        private String value;
+        private String description;
+
+        TIME_DIMENSION(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equalsIgnoreCase(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_DIMENSION {
+        WORKCENTERCODE("WORKCENTERCODE", "保管场所"),
+        EQUCODE("EQUCODE", "设备名称");
+
+
+        private String value;
+        private String description;
+
+        DATA_DIMENSION(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equalsIgnoreCase(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+}
diff --git a/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/util/EnumUtil.java b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/util/EnumUtil.java
new file mode 100644
index 0000000..b8d8c11
--- /dev/null
+++ b/modules/i3plus-pojo-eam/src/main/java/cn/estsh/i3plus/pojo/eam/util/EnumUtil.java
@@ -0,0 +1,135 @@
+package cn.estsh.i3plus.pojo.eam.util;
+
+import cn.estsh.impp.framework.boot.util.LocaleUtils;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
+
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/12/22 9:47 AM
+ * @Modify:
+ */
+@Slf4j
+public class EnumUtil {
+    private static final ObjectMapper mapper = new ObjectMapper();
+
+    static {
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+    }
+
+    public static void main(String[] args) throws ClassNotFoundException {
+        Class clazz = EamEnumUtil.class;
+        Map<String, Object> map = getEnumByName(clazz, "ROUTING_VALID_TYPE");
+        System.out.println(clazz.getName());
+        System.out.println(map.toString());
+    }
+
+    /**
+     * 单层级枚举
+     *
+     * @param clz      包路径
+     * @param enumName 类名
+     * @return 枚举集合
+     * @throws ClassNotFoundException 当类没找到throw
+     */
+    public static Map<String, Object> getEnumByName(Class clz, String enumName) {
+
+        return clz == null ? null : reflectGetEnumConstants(clz);
+    }
+
+
+    /**
+     * 根据路径找枚举
+     *
+     * @param clazz 类路径
+     * @return 枚举项集合
+     */
+    private static Map<String, Object> reflectGetEnumConstants(Class clazz) {
+        Map<String, Object> enumMap;
+        enumMap = new HashMap<>(8);
+
+        Optional<Method> getCodeMethodOp = getMethod(clazz, "getCode");
+        Optional<Method> getValueMethodOp = getMethod(clazz, "getValue");
+        Optional<Method> getDescriptionMethodOp = getMethod(clazz, "getDescription");
+
+        List<Map<String, Object>> data = new ArrayList<>();
+        // 获取所有枚举项
+        Enum[] enumConstants = (Enum[]) clazz.getEnumConstants();
+        for (Enum enumConstant : enumConstants) {
+            Map<String, Object> eachData = new HashMap<>(8);
+
+            getValueMethodOp.ifPresent(d -> eachData.put("value", invokeGetMethod(enumConstant, d)));
+            getCodeMethodOp.ifPresent(d -> eachData.put("code", invokeGetMethod(enumConstant, d)));
+            getDescriptionMethodOp.ifPresent(d -> {
+                String key = clazz.getSimpleName() + ":" + enumConstant.name();
+                String desc = LocaleUtils.getLocaleRes(key);
+                eachData.put("description", !StringUtils.isEmpty(desc) && !key.equals(desc) ? desc : invokeGetMethod(enumConstant, d));
+            });
+
+            data.add(eachData);
+        }
+        enumMap.put("enumName", clazz.getSimpleName());
+        enumMap.put("valuesList", data);
+
+        return enumMap;
+    }
+
+    /**
+     * 对一个枚举项调用一个方法
+     *
+     * @param enumConstant 枚举项
+     * @param method       调用方法
+     * @return get方法返回
+     */
+    private static Object invokeGetMethod(Enum enumConstant, Method method) {
+        try {
+            method.setAccessible(true);
+            return method.invoke(enumConstant);
+        } catch (IllegalAccessException e) {
+            log.debug("MES获取枚举接口 非法访问:{}", e.getMessage());
+        } catch (InvocationTargetException e) {
+            log.debug("MES获取枚举接口 执行方法失败:{}", e.getMessage());
+        }
+        return null;
+    }
+
+    /**
+     * 根据方法名反射获取类中的方法
+     *
+     * @param clazz      类
+     * @param methodName 方法名
+     * @return {@link Optional}形式的方法
+     */
+    private static Optional<Method> getMethod(Class clazz, String methodName) {
+        Method method = null;
+        try {
+            method = clazz.getMethod(methodName);
+        } catch (NoSuchMethodException e) {
+            log.debug("MES获取枚举接口 --> 枚举类：{},没有方法名:{}", clazz.getSimpleName(), methodName);
+        }
+        return Optional.ofNullable(method);
+    }
+
+    public static List<Map<String, Object>> convertEnumConstants(Class<? extends Enum<?>> cls) {
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (Enum<?> el : cls.getEnumConstants()) {
+            try {
+                result.add(mapper.readValue(mapper.writeValueAsString(el), Map.class));
+            } catch (IOException ignored) {
+            }
+        }
+        return result;
+    }
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/annotation/EntityColumn.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/annotation/EntityColumn.java
new file mode 100644
index 0000000..cb87bc5
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/annotation/EntityColumn.java
@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.qms.annotation;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Api("实体字段")
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EntityColumn {
+    @ApiParam("是否业务主键")
+    boolean isPrimary() default false;
+    @ApiParam("是否必须")
+    boolean isRequired() default false;
+    @ApiParam("是否唯一")
+    boolean isUnique() default false;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/annotation/ExcelColumn.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/annotation/ExcelColumn.java
new file mode 100644
index 0000000..e1aae4d
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/annotation/ExcelColumn.java
@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.qms.annotation;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Api("EXCEL导入字段")
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ExcelColumn {
+    @ApiParam("对应的Excel列")
+    int corresExcelColumn() default -1;
+    @ApiParam("自定义逻辑获取")
+    boolean customLogicGet() default false;
+    @ApiParam("自定义逻辑为公共方法")
+    boolean customLogicGetCommon() default false;
+    @ApiParam("自定义逻辑校验")
+    boolean customLogicCheck() default false;
+    @ApiParam("自定义逻辑校验为公共方法")
+    boolean customLogicCheckCommon() default false;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/annotation/ExcelTable.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/annotation/ExcelTable.java
new file mode 100644
index 0000000..a9fe22a
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/annotation/ExcelTable.java
@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.qms.annotation;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Api("EXCEL导入表格")
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ExcelTable {
+    @ApiParam("读取的工作簿数")
+    int readSheetNum() default 3;
+    @ApiParam("读取的总行数")
+    int readRowNum() default 0;
+    @ApiParam("读取的开始行")
+    int readRowStart() default 1;
+    @ApiParam("只读取标注字段")
+    boolean onlyReadLabel() default true;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsAbnormalConfirm.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsAbnormalConfirm.java
new file mode 100644
index 0000000..abe6902
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsAbnormalConfirm.java
@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 异常联络单确认
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-19 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_ABNORMAL_CONFIRM",indexes = {@Index(columnList = "ORDER_NO")})
+@Api("异常联络单确认记录")
+public class SxQmsAbnormalConfirm extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name="CONFIRM_STATUS")
+    @ApiParam("确认状态")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PASS_OR_NO_PASS.class, refForeignKey = "value", value = "description")
+    public Integer confirmStatus;
+    /**
+     * 枚举值:10-物管确认，20-调达确认，30-受人确认，40-联络单确认，50-回复确认
+     */
+    @Column(name="CONFIRM_TYPE")
+    @ApiParam("确认类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ABNORMAL_CONFIRM_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer confirmType;
+
+    @Column(name = "CONFIRM_OPTION")
+    @ApiParam("意见")
+    private String confirmOption;
+
+    @Column(name = "IS_REPORT")
+    @ApiParam("是否向事业部汇报")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isReport;
+
+    @Column(name = "IS_PREVENT_OCCUR")
+    @ApiParam("是否再发防止")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isPreventOccur;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsAbnormalDetail.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsAbnormalDetail.java
new file mode 100644
index 0000000..bf01ace
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsAbnormalDetail.java
@@ -0,0 +1,142 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.util.List;
+
+/**
+ * @Description : 异常联络单明细
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-19 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_ABNORMAL_DETAIL",indexes = {@Index(columnList = "ORDER_NO")})
+@Api("异常联络单")
+public class SxQmsAbnormalDetail extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "ABNORMAL_TYPE")
+    @ApiParam("不良项目")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ABNORMAL_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer abnormalType;
+
+    @Column(name = "BAD_CONTENT")
+    @ApiParam("不良内容")
+    private String badContent;
+
+    @Lob
+    @Column(name = "EXCPTION_INFO")
+    @ApiParam("异常信息")
+    private String excptionInfo;
+
+    @Column(name = "UPLOAD_DATE_TIME")
+    @ApiParam("上传时间")
+    private String uploadDateTime;
+
+    @Column(name = "FILE_ID")
+    @ApiParam("文件ID")
+    private Long fileId;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件源名")
+    private String fileOriginName;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Column(name = "FREQUENCY")
+    @ApiParam("异常频次")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ABNORMAL_FREQUENCY.class, refForeignKey = "value", value = "description")
+    private Integer frequency;
+
+    @Column(name = "IS_STOP_PRODUCE")
+    @ApiParam("是否停止生产")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isStopProduce;
+
+    @Column(name = "IS_REPORT")
+    @ApiParam("是否向事业部汇报")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isReport;
+
+    @Column(name = "OCCURE_DATE")
+    @ApiParam("发生日期")
+    private String occureDate;
+
+    @Column(name = "OCCURE_COUNT")
+    @ApiParam("发生数")
+    private Integer occureCount;
+
+    @Column(name = "RECHECK_PLACE")
+    @ApiParam("检查数")
+    private Integer recheckPlace;
+
+    @Column(name = "QTY")
+    @ApiParam("对象台数")
+    private Double qty;
+
+    @Column(name = "FACTORY_STOCK_QTY")
+    @ApiParam("工厂在库数")
+    private Double factoryStockQty;
+
+    @Column(name = "PRE_BATCH_REQUIREMENT")
+    @ApiParam("前批次处理要求")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer preBatchRequirement;
+
+    @Column(name = "MATERIAL_OPTION")
+    @ApiParam("部品对应")
+    private String materialOption;
+
+    @Column(name = "PRODUCT_OPTION")
+    @ApiParam("成品对应")
+    private String productOption;
+
+    @Column(name = "CHECK_DATE")
+    @ApiParam("检查日期")
+    private String checkDate;
+
+    @Column(name = "DATE_CODE")
+    @ApiParam("部品生产日期")
+    private String dateCode;
+
+    @Column(name = "VENDOR_STOCK_QTY")
+    @ApiParam("厂家在库数")
+    private Double vendorStockQty;
+
+    @Column(name = "CURRENT_BATCH_OPTION")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ABNORMAL_DETAIL_OPTION.class, refForeignKey = "value", value = "description")
+    @ApiParam("本批次处理意见")
+    private Integer currentBatchOption;
+
+    /* BU使用字段 */
+    @Column(name = "ABNORMAL_PROJECT")
+    @ApiParam("不良项目")
+    private String abnormalProject;
+
+    @Transient
+    @ApiParam("文件列表")
+    private List<SxQmsFile> sxQmsFileList;
+
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsAbnormalFourHourMeet.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsAbnormalFourHourMeet.java
new file mode 100644
index 0000000..fd2da2d
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsAbnormalFourHourMeet.java
@@ -0,0 +1,156 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 四时会议
+ * @Reference :
+ * @Author : songlian.shi
+ * @CreateDate : 2022-06-29 14:57
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_ABNORMAL_FOUR_HOUR_MEET",indexes = {@Index(columnList = "ORDER_NO,PART_NO,MACHINE_CODE")})
+@Api("四时会议")
+public class SxQmsAbnormalFourHourMeet extends BaseBean {
+
+    //master
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "APPLY_DATE_TIME")
+    @ApiParam("发生日(问题提出日期)")
+    private String applyDatetime;
+
+    @Column(name = "DEFECT_LEVEL")
+    @ApiParam("缺陷等级")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.DEFECT_LEVEL.class, refForeignKey = "value", value = "description")
+    private Integer defectLevel;
+
+    //confirm
+
+    @Column(name = "IS_PREVENT_OCCUR")
+    @ApiParam("是否再发防止")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isPreventOccur;
+
+    //master
+
+    @Column(name = "MACHINE_CODE")
+    @ApiParam("机型(机种编码)")
+    private String machineCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("番号(物料编码)")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("部品名(物料名称)")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNameRdd;
+
+    //detail
+
+    @Column(name = "BAD_CONTENT")
+    @ApiParam("异常内容(不良内容)")
+    private String badContent;
+
+    @Column(name = "DATE_CODE")
+    @ApiParam("不良批次(部品生产日期)")
+    private String dateCode;
+
+    @Column(name = "DUTY_DIFF_NAME")
+    @ApiParam("责任部门")
+    private String dutyDiffName;
+
+    @Column(name = "OCCURE_COUNT")
+    @ApiParam("不良数(发生数/检查数)")
+    private Integer occureCount;
+
+    @Column(name = "RECHECK_PLACE")
+    @ApiParam("检查数")
+    private Integer recheckPlace;
+
+    //fourHourMeet
+
+    @Column(name = "BAD_NATURE")
+    @ApiParam("不良性质")
+    private String badNature;
+
+    @Column(name = "IMPERMANENT_POLICY")
+    @ApiParam("临时对策")
+    private String impermanentPolicy;
+
+    @Column(name = "IS_RELEASE_QUALITY",columnDefinition = "int default 1")
+    @ApiParam("是否发行异常联络")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isReleaseQuality;
+
+    //master
+
+    @Column(name = "ABNORMAL_CREATE_DATE")
+    @ApiParam("异常发出日(创建日期)")
+    public String abnormalCreateDate;
+
+    @Column(name = "REPLY_END_DATE")
+    @ApiParam("对策要求回复日(回复期限日期)")
+    private String replyEndDate;
+
+    //fourHourMeet
+
+    @Column(name = "ACTUAL_REPLY_DATE")
+    @ApiParam("实际回复日")
+    private String actualReplyDate;
+
+    //reply
+
+    @Column(name="OCCURE_OUT_FLOW_REASON")
+    @ApiParam("原因(发生原因+流出原因,之间;隔开)")
+    public String occureOutFlowReason;
+
+    @Column(name="TEMP_DEAL_PREVENT_OPTION")
+    @ApiParam("对策(临时应急对策+再发防止对策,之间;隔开)")
+    public String tempDealPreventOption;
+
+    //fourHourMeet
+
+    @Column(name = "END_DATE")
+    @ApiParam("完结日")
+    private String endDate;
+
+    @Column(name = "PROGRESS_TRACK")
+    @ApiParam("进度跟踪")
+    private String progressTrack;
+
+    @Column(name = "EFFECT_TRACK")
+    @ApiParam("对策后效果跟踪")
+    private String effectTrack;
+
+    @Column(name = "MEET_PERSONNEL")
+    @ApiParam("与会部门/人员")
+    private String meetPersonnel;
+
+    @Column(name = "CAUSE_ANALYSIS")
+    @ApiParam("原因分析")
+    private String causeAnalysis;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsAbnormalMaster.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsAbnormalMaster.java
new file mode 100644
index 0000000..7732e4e
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsAbnormalMaster.java
@@ -0,0 +1,422 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.util.List;
+
+/**
+ * @Description : 异常联络单
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-19 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_ABNORMAL_MASTER",indexes = {@Index(columnList = "ORDER_NO,PART_NO")})
+@Api("异常联络单")
+public class SxQmsAbnormalMaster extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("异常场所")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ABNORMAL_SOURCE.class, refForeignKey = "value", value = "description")
+    public Integer busiType;
+
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNameRdd;
+
+    @Column(name = "MACHINE_CODE")
+    @ApiParam("机种编码")
+    private String machineCode;
+
+    /**
+     * yyyy-MM-dd 格式
+     */
+    @Column(name = "APPLY_DATE_TIME")
+    @ApiParam("问题提出日期")
+    private String applyDatetime;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "DEFECT_LEVEL")
+    @ApiParam("缺陷等级")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.DEFECT_LEVEL.class, refForeignKey = "value", value = "description")
+    private Integer defectLevel;
+
+    @Column(name = "ORDER_STATUS")
+    @ApiParam("状态")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ABNORMAL_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer orderStatus;
+
+    @Column(name = "SAFETY_MGR_TYPE")
+    @ApiParam("安全管理责任")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.SAFETY_MGR_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer safetyMgrType;
+
+    @Column(name = "SAFETY_JUDGE_TYPE")
+    @ApiParam("安全判定要求")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.SAFETY_JUDGE_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer safetyJudgeType;
+
+    /**
+     * yyyy-MM-dd 格式
+     */
+    @Column(name = "REPLY_END_DATE")
+    @ApiParam("回复期限日期")
+    private String replyEndDate;
+
+
+    @Column(name = "REPLY_OVER_TIME",columnDefinition = "int default 2")
+    @ApiParam("是否超时回复")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer replyOverTime;
+
+
+    @Column(name = "REF_ORDER_NO")
+    @ApiParam("关联单号")
+    private String refOrderNo;
+
+    /**
+     * 责任区分
+     */
+    @Column(name = "DUTY_DIFF")
+    @ApiParam("责任区分")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.DUTY_DIFF.class, refForeignKey = "value", value = "description")
+    private Integer dutyDiff;
+
+    @Column(name = "MANAGEMENT_CONFIRM",columnDefinition = "int default 20")
+    @ApiParam("物管确认")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CONFIRM_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer managementConfirm;
+
+    @Column(name = "MANAGEMENT_CONFIRM_STATUS")
+    @ApiParam("物管确认结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PASS_OR_NO_PASS.class, refForeignKey = "value", value = "description")
+    private Integer managementConfirmStatus;
+
+    @Column(name = "MANAGEMENT_CONFIRM_DATE_TIME")
+    @ApiParam("物管确认时间")
+    private String managementConfirmDateTime;
+
+    @Column(name = "MATERIL_CONFIRM",columnDefinition = "int default 20")
+    @ApiParam("资材确认")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CONFIRM_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer materialConfirm;
+
+    @Column(name = "MATERIL_CONFIRM_STATUS")
+    @ApiParam("资材确认结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PASS_OR_NO_PASS.class, refForeignKey = "value", value = "description")
+    private Integer materialConfirmStatus;
+
+    @Column(name = "MATERIL_CONFIRM_DATE_TIME")
+    @ApiParam("资材确认时间")
+    private String materialConfirmDateTime;
+
+
+    @Column(name = "RECEIVE_CONFIRM",columnDefinition = "int default 20")
+    @ApiParam("发行")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CONFIRM_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer receiveConfirm;
+
+    @Column(name = "RECEIVE_CONFIRM_STATUS")
+    @ApiParam("发行结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PASS_OR_NO_PASS.class, refForeignKey = "value", value = "description")
+    private Integer receiveConfirmStatus;
+
+    @Column(name = "RECEIVE_CONFIRM_DATE_TIME")
+    @ApiParam("发行时间")
+    private String receiveConfirmDateTime;
+
+
+    @Column(name = "REGULATE_CONFIRM",columnDefinition = "int default 20")
+    @ApiParam("调达确认")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CONFIRM_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer regulateConfirm;
+
+    @Column(name = "REGULATE_CONFIRM_STATUS")
+    @ApiParam("调达确认状态")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PASS_OR_NO_PASS.class, refForeignKey = "value", value = "description")
+    private Integer regulateConfirmStatus;
+
+    @Column(name = "REGULATE_CONFIRM_DATE_TIME")
+    @ApiParam("调达确认时间")
+    private String regulateConfirmDateTime;
+
+
+    @Column(name = "CONTACT_CONFIRM",columnDefinition = "int default 20")
+    @ApiParam("联络单确认")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CONFIRM_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer contactConfirm;
+
+    @Column(name = "CONTACT_CONFIRM_STATUS")
+    @ApiParam("联络单确认结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PASS_OR_NO_PASS.class, refForeignKey = "value", value = "description")
+    private Integer contactConfirmStatus;
+
+    @Column(name = "CONTACT_CONFIRM_DATE_TIME")
+    @ApiParam("联络单确认时间")
+    private String contactConfirmDateTime;
+
+
+    @Column(name = "DEAL_CONFIRM",columnDefinition = "int default 20")
+    @ApiParam("联络单回复")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CONFIRM_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer dealConfirm;
+
+    @Column(name = "DEAL_CONFIRM_STATUS")
+    @ApiParam("联络单回复结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PASS_OR_NO_PASS.class, refForeignKey = "value", value = "description")
+    private Integer dealConfirmStatus;
+
+    @Column(name = "DEAL_CONFIRM_DATE_TIME")
+    @ApiParam("联络单回复时间")
+    private String dealConfirmDateTime;
+
+    @Column(name = "ISSUE_DEPARTMENT_CONFIRM",columnDefinition = "int default 20")
+    @ApiParam("回复确认")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CONFIRM_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer issueDePartmentConfirm;
+
+    @Column(name = "ISSUE_DEPARTMENT_CONFIRM_STATUS")
+    @ApiParam("回复确认结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PASS_OR_NO_PASS.class, refForeignKey = "value", value = "description")
+    private Integer issueDePartmentConfirmStatus;
+
+    @Column(name = "ISSUE_DEPARTMENT_CONFIRM_DATE_TIME")
+    @ApiParam("回复确认时间")
+    private String issueDePartmentConfirmDateTime;
+
+    @Column(name = "SUPERVISOR_CONFIRM",columnDefinition = "int default 20")
+    @ApiParam("课长确认")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CONFIRM_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer supervisorConfirm;
+
+    @Column(name = "SUPERVISOR_CONFIRM_STATUS")
+    @ApiParam("课长确认结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PASS_OR_NO_PASS.class, refForeignKey = "value", value = "description")
+    private Integer supervisorConfirmStatus;
+
+    @Column(name = "SUPERVISOR_CONFIRM_DATE_TIME")
+    @ApiParam("课长确认时间")
+    private String supervisorConfirmDateTime;
+
+    @Column(name = "QUALITY_DIRECTOR_CONFIRM",columnDefinition = "int default 20")
+    @ApiParam("品质部长确认")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CONFIRM_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer qualityDirectorConfirm;
+
+    @Column(name = "QUALITY_DIRECTOR_CONFIRM_STATUS")
+    @ApiParam("品质部长确认结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PASS_OR_NO_PASS.class, refForeignKey = "value", value = "description")
+    private Integer qualityDirectorConfirmStatus;
+
+
+
+    @Column(name = "QUALITY_DIRECTOR_DATE_TIME")
+    @ApiParam("品质部长确认时间")
+    private String qualityDirectorConfirmDateTime;
+
+
+    @Column(name = "DIRECTOR_CONFIRM",columnDefinition = "int default 20")
+    @ApiParam("部长确认")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CONFIRM_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer directorConfirm;
+
+    @Column(name = "DIRECTOR_CONFIRM_STATUS")
+    @ApiParam("部长确认结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PASS_OR_NO_PASS.class, refForeignKey = "value", value = "description")
+    private Integer directorConfirmStatus;
+
+
+    @Column(name = "DIRECTOR_DATE_TIME")
+    @ApiParam("部长确认时间")
+    private String directorConfirmDateTime;
+
+
+    @Column(name = "CHECK_CONFIRM",columnDefinition = "int default 20")
+    @ApiParam("检印确认")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CONFIRM_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer checkConfirm;
+
+    @Column(name = "CHECK_CONFIRM_STATUS")
+    @ApiParam("检印结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PASS_OR_NO_PASS.class, refForeignKey = "value", value = "description")
+    private Integer checkConfirmStatus;
+
+    @Column(name = "CHECK_CONFIRM_DATE_TIME")
+    @ApiParam("检印时间")
+    private String checkConfirmDateTime;
+
+    @Column(name = "RECOGNIZE_CONFIRM",columnDefinition = "int default 20")
+    @ApiParam("承认确认")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CONFIRM_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer recognizeConfirm;
+
+    @Column(name = "RECOGNIZE_CONFIRM_STATUS")
+    @ApiParam("承认结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PASS_OR_NO_PASS.class, refForeignKey = "value", value = "description")
+    private Integer recognizeConfirmStatus;
+
+    @Column(name = "RECOGNIZE_CONFIRM_DATE_TIME")
+    @ApiParam("承认时间")
+    private String recognizeConfirmDateTime;
+
+    @Column(name = "APPLY_DEPARTMENT_CODE")
+    @ApiParam("申请部门")
+    private String applyDepartmentCode;
+
+
+    @Column(name = "IS_SEND_EMAIL",columnDefinition = "int default 2")
+    @ApiParam("发送邮件")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isSendEmail;
+
+    /**
+     * 取字典信息
+     */
+    @Column(name = "PRODUCT_TYPE")
+    @ApiParam("产品分类")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.EP_PRODUCT_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer productType;
+
+
+
+    @Column(name = "EXTRA_REF_ORDER_NO")
+    @ApiParam("次要关联单号")
+    private String extraRefOrderNo;
+
+
+    @Transient
+    @ApiParam("开始时间")
+    private String createDatetimeStart;
+
+    @Transient
+    @ApiParam("结束时间")
+    private String createDatetimeEnd;
+
+    @Transient
+    @ApiParam("线别")
+    private String workCenterCode;
+
+
+    @Transient
+    @ApiParam("部门代码")
+    private String departmentcode;
+
+
+    @Transient
+    @ApiParam("异常场所名称")
+    private String busiTypeName;
+
+
+    @Transient
+    @ApiParam("缺陷等级名称")
+    private String defectLevelName;
+
+    @Transient
+    @ApiParam("责任区分名称")
+    private String dutyDiffName;
+
+    @Transient
+    @ApiParam("不良内容")
+    private String badContent;
+
+    @Transient
+    @ApiParam("导出模板code")
+    private String exportTemplateCode;
+
+    @Transient
+    @ApiParam("供应商编码集合")
+    private List<String> vendorNoLst;
+
+
+    private Double rcQty;
+
+    private Double rejectQty;
+
+    private String dateCode;
+
+    private String rcDate;
+
+    private String checkDate;
+
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ABNORMAL_DETAIL_OPTION.class, refForeignKey = "value", value = "description")
+    private Integer currentBatchOption;
+
+    public SxQmsAbnormalMaster() {
+
+    }
+    public SxQmsAbnormalMaster(String orderNo,
+                               Integer productType,
+                               String workCenterCode,
+                               String vendorNo,
+                               String vendorName,
+                               String partNo,
+                               String partNameRdd,
+                               Double rcQty,
+                               Double rejectQty,
+                               String dateCode,
+                               String rcDate,
+                               String checkDate,
+                               String badContent,
+                               Integer currentBatchOption,
+                               String createUser) {
+        this.orderNo = orderNo;
+        this.productType = productType;
+        this.workCenterCode =workCenterCode;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.rcQty = rcQty;
+        this.rejectQty = rejectQty;
+        this.dateCode =dateCode;
+        this.rcDate = rcDate;
+        this.checkDate =checkDate;
+        this.badContent = badContent;
+        this.currentBatchOption =currentBatchOption;
+        this.createUser = createUser;
+    }
+
+    public Integer getManagementConfirm() {
+        if(this.managementConfirm==null || this.managementConfirm==0) {
+            return null;
+        }
+        return this.managementConfirm;
+    }
+
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsAbnormalReply.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsAbnormalReply.java
new file mode 100644
index 0000000..093d4e2
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsAbnormalReply.java
@@ -0,0 +1,136 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 异常联络单回复
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-19 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_ABNORMAL_REPLY",indexes = {@Index(columnList = "ORDER_NO")})
+@Api("异常联络单")
+public class SxQmsAbnormalReply extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name="OCCURE_CAUSE")
+    @ApiParam("发生原因")
+    public String occureReason;
+
+    @Column(name="OCCURE_CAUSE_FILE")
+    @ApiParam("发生原因附件")
+    public String occureReasonFileUrl;
+
+    @Column(name="OUT_FLOW_REASON")
+    @ApiParam("流出原因")
+    public String outFlowReason;
+
+    @Column(name="OUT_FLOW_REASON_FILE")
+    @ApiParam("流出原因附件")
+    public String outFlowReasonFileUrl;
+
+    @Column(name="TEMP_DEAL_OPTION")
+    @ApiParam("临时应急对策")
+    public String tempDealOption;
+
+    @Column(name="TEMP_DEAL_OPTION_FILE")
+    @ApiParam("临时应急对策附件")
+    public String tempDealOptionFileUrl;
+
+    /**
+     * 公司内部、公司外部。
+     */
+    @Column(name="WORK_SITE")
+    @ApiParam("加工场所")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.WORK_SITE.class, refForeignKey = "value", value = "description")
+    public Integer workSite;
+
+    /**
+     * 枚举：作业人员、设备/机器、原材料、作业方法、环境因素、管理上不完善、作业指导文件和管理资料不足、其他。
+     */
+    @Column(name="CAUSE_ANALYSIS")
+    @ApiParam("原因分析")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ABNORMAL_ANALYSIS_CAUSE.class, refForeignKey = "value", value = "description")
+    public Integer causeAnalysis;
+
+    @Column(name="OTHER_REASON")
+    @ApiParam("其它原因说明")
+    public String otherReason;
+
+    @Column(name = "PREVENT_OPTION")
+    @ApiParam("再发防止对策")
+    private String preventOption;
+
+    @Column(name = "PREVENT_OPTION_FILE")
+    @ApiParam("再发防止对策附件")
+    private String preventOptionFileUrl;
+
+    @Column(name = "UPLOAD_DATE_TIME")
+    @ApiParam("上传时间")
+    private String uploadDateTime;
+
+    @Column(name = "FILE_ID")
+    @ApiParam("文件ID")
+    private Long fileId;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件源名")
+    private String fileOriginName;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+
+    /**
+     * 责任区分
+     */
+    @ApiParam("责任区分")
+    @Transient
+    private Integer dutyDiff;
+
+    /**
+     * yyyy-MM-dd 格式
+     */
+    @ApiParam("回复期限日期")
+    @Transient
+    private String replyEndDate;
+
+    @ApiParam("异常发行日期")
+    @Transient
+    private String abnormalReleaseDate;
+
+    @ApiParam("实际回答日期")
+    @Transient
+    private String actualReplyDate;
+
+    public SxQmsAbnormalReply(){
+
+    }
+
+    public SxQmsAbnormalReply(String orderNo, String organizeCode) {
+        this.orderNo = orderNo;
+        this.organizeCode = organizeCode;
+    }
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBadness.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBadness.java
new file mode 100644
index 0000000..72dcb59
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBadness.java
@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description :配置表
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_BADNESS", indexes = {
+        @Index(columnList = "BADNESS_CODE"),
+        @Index(columnList = "BADNESS_NAME"),
+        @Index(columnList = "BADNESS_CODE, BADNESS_NAME")
+})
+@Api("不良表")
+public class SxQmsBadness extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -2171261617112342637L;
+
+    @Column(name = "BADNESS_MODULE")
+    @ApiParam("不良类型模块")
+    private Integer badnessModule;
+
+    @Column(name = "BADNESS_CODE")
+    @ApiParam("不良编码")
+    private String badnessCode;
+
+    @Column(name = "BADNESS_NAME")
+    @ApiParam("不良名称 ")
+    private String badnessName;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBasCustomer.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBasCustomer.java
new file mode 100644
index 0000000..134e44d
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBasCustomer.java
@@ -0,0 +1,80 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description :客户信息表
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 17:16
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="SX_QMS_BAS_CUSTOMER")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Api(value="客户信息表",description = "客户信息表")
+public class SxQmsBasCustomer extends BaseBean {
+
+    @Column(name = "CUST_NO")
+    @ApiParam(value = "客户编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String custNo;
+
+    @Column(name = "CUST_NAME")
+    @ApiParam(value = "客户简称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String custName;
+
+    @Column(name = "CUST_DESC")
+    @ApiParam(value = "客户全称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String custDesc;
+
+    @Column(name = "CUST_ADDR")
+    @ApiParam(value = "客户地址")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String custAddr;
+
+    @Column(name = "CUST_OWNER")
+    @ApiParam(value = "联系人")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String custOwner;
+
+    @Column(name = "CUST_EMAIL")
+    @ApiParam(value = "邮箱")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String custEmail;
+
+    @Column(name = "CUST_TEL")
+    @ApiParam(value = "电话号码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String custTel;
+
+    @Column(name = "CUST_FAX")
+    @ApiParam(value = "传真")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String custFax;
+
+    @Column(name = "SAFETY_STOCK")
+    @ApiParam(value = "安全库存")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
+    private Double safetyStock;
+
+    public double getSafetyStockVal() {
+        return this.safetyStock == null ? 0.0d : this.safetyStock;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBasVendor.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBasVendor.java
new file mode 100644
index 0000000..9890b4a
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBasVendor.java
@@ -0,0 +1,126 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 供应商
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name="SX_QMS_BAS_VENDOR")
+@Api("供应商信息")
+public class SxQmsBasVendor extends BaseBean{
+
+    @Column(name="VENDOR_NO")
+    @ApiParam("供应商编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String vendorNo;
+
+    @Column(name="VENDOR_NAME")
+    @ApiParam("供应商简称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String vendorName;
+
+    @Column(name="VENDOR_DESC")
+    @ApiParam("供应商全称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String vendorDesc;
+
+    @Column(name = "USER_NAME")
+    @ApiParam("用户名")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            dataSrc = "/impp/operate/sys-user/query-user-by-pager",
+            searchColumnName = "userName",listColumnName = "userLoginName,userName", explicitColumnName = "userName")
+    private String userName;
+
+    @Column(name="VENDOR_ADDR")
+    @ApiParam("供应商地址")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String vendorAddr;
+
+    @Column(name="VENDOR_OWNER")
+    @ApiParam("联系人")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String vendorOwner;
+
+    @Column(name="VENDOR_EMAIL")
+    @ApiParam("邮箱")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String vendorEmail;
+
+    @Column(name = "IS_ASN")
+    @ApiParam(value = "是否发ASN", example = "0")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
+    private Integer isAsn;
+
+    @Column(name = "PASSWORD")
+    @ApiParam(value = "密码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String password;
+
+    @Column(name = "VENDOR_CALL")
+    @ApiParam("供应商电话")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String vendorCall;
+
+    @Column(name = "VENDOR_FAX")
+    @ApiParam("传真")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String vendorFax;
+
+    @Column(name = "VENDOR_PHONE")
+    @ApiParam("手机")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String vendorPhone;
+
+    @Column(name = "KILOBIT")
+    @ApiParam("千位符号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String kilobit;
+
+    @Column(name = "DECIMALS")
+    @ApiParam("小数位符号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String decimals;
+
+    @Column(name = "VENDOR_TYPE")
+    @ApiParam("供应商类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "VENDOR_TYPE")
+    private Integer vendorType;
+
+    @Column(name = "MAP_LOCATION")
+    @ApiParam("经纬度")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String mapLocation;
+
+    @Column(name = "FIRST_LOGIN")
+    @ApiParam("是否首次登录")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Integer firstLogin;
+
+    public SxQmsBasVendor() {
+    }
+
+    public SxQmsBasVendor(Long id, String userName) {
+        this.id = id;
+        this.userName = userName;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuBadnessClassify.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuBadnessClassify.java
new file mode 100644
index 0000000..8fbc0e3
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuBadnessClassify.java
@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description :配置表
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_BU_BADNESS_CLASSIFY", indexes = {
+        @Index(columnList = "BADNESS_TYPE_CODE"),
+        @Index(columnList = "BADNESS_TYPE_NAME"),
+        @Index(columnList = "BADNESS_CLASSIFY_CODE"),
+        @Index(columnList = "BADNESS_CLASSIFY_NAME"),
+        @Index(columnList = "BADNESS_CLASSIFY_CODE, BADNESS_CLASSIFY_NAME")
+})
+@Api("不良分类表")
+public class SxQmsBuBadnessClassify extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1437439621279886482L;
+    @Column(name = "BADNESS_TYPE_CODE")
+    @ApiParam("不良类型代码")
+    private String badnessTypeCode;
+
+    @Column(name = "BADNESS_TYPE_NAME")
+    @ApiParam("不良类型名称")
+    private String badnessTypeName;
+
+    @Column(name = "BADNESS_CLASSIFY_CODE")
+    @ApiParam("不良分类代码")
+    private String badnessClassifyCode;
+
+    @Column(name = "BADNESS_CLASSIFY_NAME")
+    @ApiParam("不良分类名称")
+    private String badnessClassifyName;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuBadnessClassifyDetail.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuBadnessClassifyDetail.java
new file mode 100644
index 0000000..a86c758
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuBadnessClassifyDetail.java
@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description :配置表
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_BU_BADNESS_CLASSIFY_DETAIL", indexes = {
+        @Index(columnList = "BADNESS_CLASSIFY_CODE"),
+        @Index(columnList = "BADNESS_CLASSIFY_NAME"),
+        @Index(columnList = "BADNESS_CLASSIFY_DETAIL_CODE"),
+        @Index(columnList = "BADNESS_CLASSIFY_DETAIL_NAME"),
+        @Index(columnList = "BADNESS_CLASSIFY_DETAIL_CODE, BADNESS_CLASSIFY_DETAIL_NAME")
+})
+@Api("不良分类明细表")
+public class SxQmsBuBadnessClassifyDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -5513605644942914005L;
+    @Column(name = "BADNESS_CLASSIFY_CODE")
+    @ApiParam("不良分类代码")
+    private String badnessClassifyCode;
+
+    @Column(name = "BADNESS_CLASSIFY_NAME")
+    @ApiParam("不良分类名称")
+    private String badnessClassifyName;
+
+    @Column(name = "BADNESS_CLASSIFY_DETAIL_CODE")
+    @ApiParam("不良分类明细代码")
+    private String badnessClassifyDetailCode;
+
+    @Column(name = "BADNESS_CLASSIFY_DETAIL_NAME")
+    @ApiParam("不良分类明细名称")
+    private String badnessClassifyDetailName;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuBadnessType.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuBadnessType.java
new file mode 100644
index 0000000..2c9fa0e
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuBadnessType.java
@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description :配置表
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_BU_BADNESS_TYPE", indexes = {
+        @Index(columnList = "BADNESS_TYPE_CODE"),
+        @Index(columnList = "BADNESS_TYPE_NAME"),
+        @Index(columnList = "BADNESS_TYPE_CODE, BADNESS_TYPE_NAME")
+})
+@Api("不良类型表")
+public class SxQmsBuBadnessType extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3601614095816519123L;
+    @Column(name = "BADNESS_TYPE_CODE")
+    @ApiParam("不良类型代码")
+    private String badnessTypeCode;
+
+    @Column(name = "BADNESS_TYPE_NAME")
+    @ApiParam("不良类型名称")
+    private String badnessTypeName;
+
+    @Column(name = "COLOR")
+    @ApiParam("颜色 三原色：230,230,230")
+    private String color;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuCareer.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuCareer.java
new file mode 100644
index 0000000..fe99dfb
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuCareer.java
@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @description: 事业别表
+ * @author: jiaqi.hou
+ * @date: 2022/06/15
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_BU_CAREER", indexes = {@Index(columnList = "SERIAL,CAREER_CODE,CAREER_NAME")})
+@Api("事业别表")
+public class SxQmsBuCareer extends BaseBean implements Serializable {
+
+    @Column(name = "SERIAL")
+    @ApiParam("顺序")
+    private Integer serial;
+
+    @Column(name = "CAREER_CODE")
+    @ApiParam("事业别代码")
+    private String careerCode;
+
+    @Column(name = "CAREER_NAME")
+    @ApiParam("事业别名称")
+    private String careerName;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuIqcList.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuIqcList.java
new file mode 100644
index 0000000..48a7017
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuIqcList.java
@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @description: BU免检清单
+ * @author: jiaqi.hou
+ * @date: 2022/07/12
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_BU_IQC_LIST",indexes = {@Index(columnList = "VENDOR_NO,PART_NO")})
+@Api("QMS_BU_免检清单")
+public class SxQmsBuIqcList extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNameRdd;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "IQC")
+    @ApiParam("是否免检")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true)
+    @ColumnDefault(value = "2")
+    private Integer iqc;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuOqcProject.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuOqcProject.java
new file mode 100644
index 0000000..9d70bc2
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuOqcProject.java
@@ -0,0 +1,97 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @author yumingxing
+ * @version 1.0
+ * @date 2021/1/29 13:58
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SX_QMS_BU_OQC_PROJECT", indexes = {
+        @Index(columnList = "PART_NO,OQC_TYPE")
+})
+@Api("QMS_BU出货检验项目")
+public class SxQmsBuOqcProject extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 8572799206832897539L;
+
+    @Column(
+            name = "SEQ",
+            columnDefinition = "decimal(18,8)"
+    )
+    @ColumnDefault("0")
+    @ApiParam("序号")
+    private Double seq;
+
+    @Column(name = "CATEGORY_CODE3")
+    @ApiParam("产品类别")
+    private String categoryCode3;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "OQC_PROJECT")
+    @ApiParam("检验项目")
+    @Lob
+    private String oqcProject;
+
+    @Column(name = "STANDARD")
+    @ApiParam("判断基准")
+    @Lob
+    private String standard;
+
+    /**
+     * 比值类型、结果类型、等值类型
+     */
+    @Column(name = "VALUE_TYPE")
+    @ApiParam("值类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.BU_CHECK_JUDGE_TYPE.class, refForeignKey = "value", value = "description", hidden = true)
+    private Integer valueType;
+
+    @Transient
+    @ApiParam("值类型")
+    private String valueTypeName;
+
+    @Column(name = "STANDARD_VALUE")
+    @ApiParam("标准值")
+    private String standardValue;
+
+    @Column(name = "UP_LIMIT")
+    @ApiParam("上限值")
+    private String upLimit;
+
+    @Column(name = "DOWN_LIMT")
+    @ApiParam("下限值")
+    private String downLimit;
+
+    @Column(name = "APPLIANCE")
+    @ApiParam("启用器具")
+    private String appliance;
+
+    @Column(name = "OQC_TYPE")
+    @ApiParam("检验类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.OQC_CHECK_TYPE.class, refForeignKey = "value", value = "description", hidden = true)
+    private Integer oqcType;
+
+    @Transient
+    @ApiParam("检验类型")
+    private String oqcTypeName;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuOutsourcedCommoditySuppliers.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuOutsourcedCommoditySuppliers.java
new file mode 100644
index 0000000..1d669a3
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBuOutsourcedCommoditySuppliers.java
@@ -0,0 +1,84 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @description: 委外商品供应商
+ * @author: jiaqi.hou
+ * @date: 2022/07/12
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_BU_OUTSOURCED_COMMODITY_SUPPLIERS",indexes = {@Index(columnList = "VENDOR_NO,PART_NO")})
+@Api("委外商品供应商")
+public class SxQmsBuOutsourcedCommoditySuppliers extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNameRdd;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("PO单号")
+    private String orderNo;
+
+    @Column(name = "RC_DATE_TIME")
+    @ApiParam("收货时间")
+    private String rcDateTime;
+
+    @Column(name = "UPLOAD_DATE_TIME")
+    @ApiParam("上传时间")
+    private String uploadDateTime;
+
+    @Column(name = "FILE_ID")
+    @ApiParam("文件ID")
+    private Long fileId;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件源名")
+    private String fileOriginName;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Column(name = "UPLOAD_USER_NAME")
+    @ApiParam("上传用户")
+    private String uploadUserName;
+
+    @Column(name = "FILE_TYPE")
+    @ApiParam("文件类型")
+    private String fileType;
+
+    @Column(name = "FILE_SIZE")
+    @ApiParam("文件大小")
+    private String fileSize;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBusiConfig.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBusiConfig.java
new file mode 100644
index 0000000..22d9d41
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsBusiConfig.java
@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @description: SX_QMS_业务配置表
+ * @author: jiaqi.hou
+ * @date: 2022/07/12
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SX_QMS_BUSI_CONFIG")
+@Api("SX_QMS_业务配置表")
+public class SxQmsBusiConfig extends BaseBean implements Serializable {
+    @Column(name = "BUSI_CODE")
+    @ApiParam("配置代码")
+    private String busiCode;
+
+    @Column(name = "BUSI_NAME")
+    @ApiParam("配置名称")
+    private String busiName;
+
+    @Column(name = "BUSI_VALUE")
+    @ApiParam("配置值")
+    private String busiValue;
+
+    @Column(name = "HOURLY_BASIS")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.HOURLY_BASIS.class, refForeignKey = "value", value = "description")
+    @ApiParam("时间单位")
+    private String hourlyBasis;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsCauseClassify.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsCauseClassify.java
new file mode 100644
index 0000000..ce30468
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsCauseClassify.java
@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description :原因分类表
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_CAUSE_CLASSIFY", indexes = {
+        @Index(columnList = "CAUSE_CLASSIFY_CODE"),
+        @Index(columnList = "CAUSE_CLASSIFY_NAME"),
+        @Index(columnList = "CAUSE_CLASSIFY_CODE, CAUSE_CLASSIFY_NAME")
+})
+@Api("原因分类表")
+public class SxQmsCauseClassify extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -2171261617112342637L;
+
+    @Column(name = "CAUSE_CLASSIFY_CODE")
+    @ApiParam("原因分类代码")
+    private String causeClassifyCode;
+
+    @Column(name = "CAUSE_CLASSIFY_NAME")
+    @ApiParam("原因分类名称 ")
+    private String causeClassifyName;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsChangeResume.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsChangeResume.java
new file mode 100644
index 0000000..d9d0a11
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsChangeResume.java
@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.*;
+
+/**
+ * @description: 变更履历
+ * @author: jiaqi.hou
+ */
+@Data
+@Entity
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_CHANGE_RESUME")
+@Api("变更履历表")
+public class SxQmsChangeResume extends BaseBean {
+    @Column(name = "CHANGE_THE_CONTACT_NUMBER")
+    @ApiParam("变更联络单号")
+    private String changeTheContactNumber;
+
+    @Column(name = "CHANGE_TIME")
+    @ApiParam("计划变更时间")
+    private String changeTime;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料代码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商代码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Lob
+    @Column(name = "CHANGE_CONTENT")
+    @ApiParam("变更内容")
+    private String changeContent;
+
+    @Column(name = "ACTUAL_CHANGE_TIME")
+    @ApiParam("实际变更时间")
+    private String actualChangeTime;
+
+    @ApiParam("计划变更时间Start")
+    private String changeTimeStart;
+
+    @ApiParam("计划变更时间End")
+    private String changeTimeEnd;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsConfig.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsConfig.java
new file mode 100644
index 0000000..93d723f
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsConfig.java
@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description :配置表
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_CONFIG", indexes = {
+        @Index(columnList = "CFG_CODE"),
+        @Index(columnList = "CFG_CODE, CFG_KEY")
+})
+@Api("配置表")
+public class SxQmsConfig extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1815261789184250194L;
+
+    @Column(name = "CFG_CODE")
+    @ApiParam("配置代码")
+    private String cfgCode;
+
+    @Column(name = "CFG_NAME")
+    @ApiParam("配置名称")
+    private String cfgName;
+
+    @Column(name = "CFG_TYPE")
+    @ApiParam("配置类型")
+    private String cfgType;
+
+    @Column(name = "CFG_KEY")
+    @ApiParam("配置key")
+    private String cfgKey;
+
+    @Column(name = "CFG_VALUE")
+    @ApiParam("配置value")
+    private String cfgValue;
+
+    @Column(name = "CFG_VAULE_DESC")
+    @ApiParam("配置value描述")
+    private String cfgValueDesc;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsCustomerComplaintAbarbeitung.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsCustomerComplaintAbarbeitung.java
new file mode 100644
index 0000000..4725ce1
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsCustomerComplaintAbarbeitung.java
@@ -0,0 +1,122 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-02-15 11:14
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_CUSTOMER_COMPLAINT_ABARBEITUNG",indexes = {@Index(columnList = "COMPLAINT_NO")})
+@Api("客诉整改表")
+public class SxQmsCustomerComplaintAbarbeitung extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -7583945509760043557L;
+
+    @Column(name = "COMPLAINT_NO")
+    @ApiParam("客诉单号")
+    private String complaintNo;
+
+    @Column(name = "DUTY_DIFF")
+    @ApiParam("责任区分")
+    private Integer dutyDiff;
+
+    @Column(name = "ARRIVE_DATE")
+    @ApiParam("实物到达日期")
+    private String arriveDate;
+
+    @Column(name = "PREVENTION_METHOD")
+    @ApiParam("再发防止（防止方法）")
+    private String preventionMethod;
+
+    @Column(name = "OCCUR_REASON")
+    @ApiParam("发生原因")
+    private String occurReason;
+
+    @Column(name = "OUTFLOW_REASON")
+    @ApiParam("流出原因")
+    private String outflowReason;
+
+    @Column(name = "SOLUTION")
+    @ApiParam("对策")
+    private String solution;
+
+    @Column(name = "ABNORMAL_RELEASE_DATE")
+    @ApiParam("异常发行日期")
+    private String abnormalReleaseDate;
+
+    @Column(name = "EXPECTED_REPLY_DATE")
+    @ApiParam("预定回复日期")
+    private String expectedReplyDate;
+
+    @Column(name = "CORRESPONDING_TO_THE_DATE")
+    @ApiParam("对应日期")
+    private String correspondingToTheDate;
+
+    @Column(name = "ACTUAL_REPLY_DATE")
+    @ApiParam("实际回答日期")
+    private String actualReplyDate;
+
+    @Column(name = "TEMPORARY_COUNTERMEASURE_OF_SOURCE")
+    @ApiParam("发生源临时对策")
+    private String temporaryCountermeasureOfSource;
+
+    @Column(name = "PERSISTENT_GAME_OF_ORIGIN")
+    @ApiParam("发生源恒久对策")
+    private String persistentGameOfOrigin;
+
+    @Column(name = "OUTFLOW_SOURCE_TEMPORARY_COUNTERMEASURE")
+    @ApiParam("流出源临时对策")
+    private String outflowSourceTemporaryCountermeasure;
+
+    @Column(name = "OUTFLOW_SOURCE_PERMANENT_COUNTERMEASURE")
+    @ApiParam("流出源恒久对策")
+    private String outflowSourcePermanentCountermeasure;
+
+    @Column(name = "FILE_ID")
+    @ApiParam("文件id 对策附件id")
+    private Long fileId;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件原名")
+    private String fileOriginName;
+
+    @Column(name = "UPLOAD_DATE_TIME")
+    @ApiParam("上传时间")
+    private String uploadDatetime;
+
+    public SxQmsCustomerComplaintAbarbeitung() {
+    }
+
+    public SxQmsCustomerComplaintAbarbeitung(String occurReason, String outflowReason, String temporaryCountermeasureOfSource,
+                                             String persistentGameOfOrigin, String abnormalReleaseDate, String expectedReplyDate,
+                                             String actualReplyDate) {
+        this.occurReason = occurReason;
+        this.outflowReason = outflowReason;
+        this.temporaryCountermeasureOfSource = temporaryCountermeasureOfSource;
+        this.persistentGameOfOrigin = persistentGameOfOrigin;
+        this.abnormalReleaseDate = abnormalReleaseDate;
+        this.expectedReplyDate = expectedReplyDate;
+        this.actualReplyDate = actualReplyDate;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsCustomerComplaintAbarbeitungConfirm.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsCustomerComplaintAbarbeitungConfirm.java
new file mode 100644
index 0000000..049007c
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsCustomerComplaintAbarbeitungConfirm.java
@@ -0,0 +1,68 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-02-16 14:39
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_CUSTOMER_COMPLAINT_ABARBEITUNG_CONFIRM",indexes = {@Index(columnList = "COMPLAINT_NO")})
+@Api("客诉回复状态表")
+public class SxQmsCustomerComplaintAbarbeitungConfirm extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6928463390276132576L;
+
+    @Column(name = "COMPLAINT_NO")
+    @ApiParam("客诉单号")
+    private String complaintNo;
+
+    @Column(name = "ACTUAL_REPLY_DATE")
+    @ApiParam("实际回答日期")
+    private String actualReplyDate;
+
+    @Column(name = "REPLY_STATUS")
+    @ApiParam("回复状态")
+    private Integer replyStatus;
+
+    @Column(name = "SHIPPING_BD")
+    @ApiParam("发往DB")
+    private Integer shippingBd;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+
+    @Column(name = "FILE_ID")
+    @ApiParam("文件编号")
+    private Long fileId;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件原名")
+    private String fileOriginName;
+
+    @Column(name = "UPLOAD_DATE_TIME")
+    @ApiParam("上传时间")
+    private String uploadDatetime;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsCustomerComplaintAnalyse.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsCustomerComplaintAnalyse.java
new file mode 100644
index 0000000..546c4e8
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsCustomerComplaintAnalyse.java
@@ -0,0 +1,176 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-02-15 11:14
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_CUSTOMER_COMPLAINT_ANALYSE",indexes = {@Index(columnList = "COMPLAINT_NO")})
+@Api("客诉分析表")
+public class SxQmsCustomerComplaintAnalyse extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 5321994093082677149L;
+
+    @Column(name = "COMPLAINT_NO")
+    @ApiParam("客诉单号")
+    private String complaintNo;
+
+    @Column(name = "DUTY_DIFF")
+    @ApiParam("责任区分 10-制造、20-部品、30技术、40-其他，每个客诉单分析可选择多条原因区分项")
+    private String dutyDiff;
+
+    @Column(name = "REASON_PROJECT")
+    @ApiParam("原因项目 10-制造-组立、20-部品-成型、30-组立、40-电装、50-熔接、60-组立、70-技术、80-设计、90-其他。原因区分子项目可多选。")
+    private String reasonProject;
+
+    @Column(name = "CUSTOMER_NO")
+    @ApiParam("客户编码")
+    private String customerNo;
+
+    @Column(name = "CUSTOMER_NAME")
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "IS_COST")
+    @ApiParam("费用有无 10-有，20-无")
+    private Integer isCost;
+
+    @Column(name = "IS_ENTITY_RETURN")
+    @ApiParam("是否实体返回 10-是，20-否")
+    private Integer isEntityReturn;
+
+    @Column(name = "ABNORMAL_NO")
+    @ApiParam("工程异常编号")
+    private String abnormalNo;
+
+    @Column(name = "COUNTERMEASURE_ACTION")
+    @ApiParam("对策前/后")
+    private Integer countermeasureAction;
+
+    @Column(name = "TEMPORARY_DISPOSAL")
+    @ApiParam("临时对策")
+    private String temporaryDisposal;
+
+    @Column(name = "FINISH_PRODUCT_DIFF")
+    @ApiParam("完成品区分")
+    private String finishProductDiff;
+
+    @Column(name = "RECUR_TIMES")
+    @ApiParam("再发次数")
+    private Integer recurTimes;
+
+    @Column(name = "DEPARTMENT_OF_PRODUCT_CODING")
+    @ApiParam("部品编码")
+    private String departmentOfProductCoding;
+
+    @Column(name = "DEPARTMENT_OF_PRODUCT_NAME")
+    @ApiParam("部品名称")
+    private String departmentOfProductName;
+
+    @Column(name = "PRODUCT_LINE_CODE")
+    @ApiParam("产线代码")
+    private String productLineCode;
+
+    @Column(name = "PRODUCT_CLASSIFICATION")
+    @ApiParam("产品分类")
+    private String productClassification;
+
+    @Column(name = "CATEGORY_CODE")
+    @ApiParam("机种分类")
+    private String categoryCode;
+
+    @Column(name = "DEFECT_LEVEL")
+    @ApiParam("缺陷等级  10-轻度缺陷，20-中度缺陷，30-重度缺陷")
+    private Integer defectLevel;
+
+    @Column(name = "PRODUCE_DATE")
+    @ApiParam("生产日期")
+    private String produceDate;
+
+    @Column(name = "PROD_LOT")
+    @ApiParam("生产批次")
+    private String prodLot;
+
+    @Column(name = "FILE_ID1")
+    @ApiParam("文件编号1")
+    private Long fileId1;
+
+    @Column(name = "FILE_URL1")
+    @ApiParam("文件URL1")
+    private String fileUrl1;
+
+    @Column(name = "FILE_ORIGIN_NAME1")
+    @ApiParam("文件原名1")
+    private String fileOriginName1;
+
+    @Column(name = "FILE_ID2")
+    @ApiParam("文件编号2")
+    private Long fileId2;
+
+    @Column(name = "FILE_URL2")
+    @ApiParam("文件URL2")
+    private String fileUrl2;
+
+    @Column(name = "FILE_ORIGINNAME2")
+    @ApiParam("文件原名2")
+    private String fileOriginName2;
+
+    @Column(name = "UPLOAD_DATE_TIME")
+    @ApiParam("上传时间")
+    private String uploadDatetime;
+
+    @Column(name = "QUANTITY_OF_PARTS_IN_WAREHOUSE")
+    @ApiParam("部品在库数量")
+    private BigDecimal quantityOfPartsInWarehouse;
+
+    @Column(name = "QUANTITY_OF_FINISHED_PRODUCTS_IN_WAREHOUSE")
+    @ApiParam("成品在库数量")
+    private BigDecimal quantityOfFinishedProductsInWarehouse;
+
+    @Column(name = "WTCRPR")
+    @ApiParam("是否进行再发防止报告")
+    private Integer wtcrpr;
+
+    @Column(name = "CAUSE_OF_DEFECT")
+    @ApiParam("不良原因")
+    private String causeOfDefect;
+
+    @Column(name = "CORRESPONDING_DATE")
+    @ApiParam("对应日期")
+    private String correspondingDate;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsCustomerComplaintMaster.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsCustomerComplaintMaster.java
new file mode 100644
index 0000000..c297d50
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsCustomerComplaintMaster.java
@@ -0,0 +1,227 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Author: Xinwang.Yi
+ * @CreateDate: 2022/02/11 02:01 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_CUSTOMER_COMPLAINT_MASTER", indexes = {
+        @Index(columnList = "COMPLAINT_NO"),
+        @Index(columnList = "COMPLAINT_TYPE"),
+        @Index(columnList = "ABNORMAL_SOURCE"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "CUSTOMER_NO"),
+        @Index(columnList = "PUBLISH_DATE"),
+        @Index(columnList = "PLAN_ARRIVE_DATE"),
+        @Index(columnList = "DEFECT_LEVEL"),
+        @Index(columnList = "SITUATION"),
+})
+@Api("客诉记录主表")
+public class SxQmsCustomerComplaintMaster extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1032035656058358048L;
+
+    @Column(name = "COMPLAINT_NO")
+    @ApiParam("客诉单号")
+    private String complaintNo;
+
+    @Column(name = "COMPLAINT_TYPE")
+    @ApiParam("客诉类型 10-异常联络，20-速报")
+    private Integer complaintType;
+
+    @Column(name = "ABNORMAL_SOURCE")
+    @ApiParam("异常场所 10-市场不良、20-到货不良、30-受入不良、40-工程不良、50-改判")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.BU_ABNORMAL_SOURCE.class, refForeignKey = "value", value = "description")
+    private Integer abnormalSource;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "CUSTOMER_NO")
+    @ApiParam("客户编码")
+    private String customerNo;
+
+    @Column(name = "CUSTOMER_NAME")
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @Column(name = "PUBLISH_DATE")
+    @ApiParam("发行日期")
+    private String publishDate;
+
+    @Column(name = "PLAN_ARRIVE_DATE")
+    @ApiParam("预定回达日")
+    private String planArriveDate;
+
+    @Column(name = "DEPARTMENT_NO")
+    @ApiParam("事业部管理NO")
+    private String departmentNo;
+
+    @Column(name = "BADNESS_CODE")
+    @ApiParam("不良点")
+    private String badnessCode;
+
+    @Column(name = "BADNESS_NAME")
+    @ApiParam("不良点名称")
+    private String badnessName;
+
+    @Column(name = "ISSUE_DESC")
+    @ApiParam("问题点描述")
+    private String issueDesc;
+
+    @Column(name = "DEFECT_LEVEL")
+    @ApiParam("缺陷等级 10-轻度缺陷，20-中度缺陷，30-重度缺陷")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.DEFECT_LEVEL.class, refForeignKey = "value", value = "description")
+    private Integer defectLevel;
+
+    @Column(name = "QTY")
+    @ApiParam("件数")
+    private Integer qty;
+
+    @Column(name = "SITUATION")
+    @ApiParam("发生情况 10-初发，20-再发")
+    private Integer situation;
+
+    @Column(name = "PRODUCE_DATE")
+    @ApiParam("生产日期")
+    private String produceDate;
+
+    @Column(name = "COMPLAINT_STATUS")
+    @ApiParam("客诉单状态 10-已创建、20-已分析、30-已整改、40-已确认")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.BU_COMPLAINT_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer complaintStatus;
+
+    @Column(name = "FILE_ID1")
+    @ApiParam("文件编号1")
+    private Long fileId1;
+
+    @Column(name = "FILE_URL1")
+    @ApiParam("文件URL1")
+    private String fileUrl1;
+
+    @Column(name = "FILE_ORIGIN_NAME1")
+    @ApiParam("文件原名1")
+    private String fileOriginName1;
+
+    @Column(name = "FILE_ID2")
+    @ApiParam("文件编号2")
+    private Long fileId2;
+
+    @Column(name = "FILE_URL2")
+    @ApiParam("文件URL2")
+    private String fileUrl2;
+
+    @Column(name = "FILE_ORIGINNAME2")
+    @ApiParam("文件原名2")
+    private String fileOriginName2;
+
+    @Column(name = "UPLOAD_DATE_TIME")
+    @ApiParam("上传时间")
+    private String uploadDatetime;
+
+    @Column(name = "COUNTERMEASURE_CONFIRM")
+    @ApiParam("对策确认 10-通过，20-不通过")
+    private Integer countermeasureConfirm;
+
+    @Column(name = "COUNTERMEASURE_NO_PASS_EXPLAIN")
+    @ApiParam("对策不通过说明")
+    private String countermeasureNoPassExplain;
+
+    @Column(name = "ABARBEITUNG_CONFIRM")
+    @ApiParam("整改确认 10-通过，20-不通过")
+    private Integer abarbeitungConfirm;
+
+    @Column(name = "ABARBEITUNG_NO_PASS_EXPLAIN")
+    @ApiParam("整改不通过说明")
+    private String abarbeitungNoPassExplain;
+
+    @Column(name = "MANUFACTURING_SERIAL_NO")
+    @ApiParam("制造编号")
+    private String manufacturingSerialNo;
+
+    @Column(name = "INSTALLATION_TIME")
+    @ApiParam("安装时间")
+    private String installationTime;
+
+    @Column(name = "THE_COST_OF_TIME")
+    @ApiParam("购机时间")
+    private String theCostOfTime;
+
+    @Column(name = "TIME_OF_FAILURE")
+    @ApiParam("故障发生时间")
+    private String timeOfFailure;
+
+    @Column(name = "FAULT_PHENOMENON")
+    @ApiParam("故障现象")
+    private String faultPhenomenon;
+
+    @Column(name = "FAILURE_CAUSE")
+    @ApiParam("故障原因")
+    private String failureCause;
+
+    @Column(name = "MANUFACTURING_DATE")
+    @ApiParam("制造日期")
+    private String manufacturingDate;
+
+    @Column(name = "HOURS_OF_USE")
+    @ApiParam("使用时间 故障发生时间-安装时间。单位：月")
+    private Double hoursOfUse;
+
+    @Column(name = "DEPARTMENT_OF_PRODUCT_CODING")
+    @ApiParam("部品编码")
+    private String departmentOfProductCoding;
+
+    @Column(name = "DEPARTMENT_OF_PRODUCT_NAME")
+    @ApiParam("部品名称")
+    private String departmentOfProductName;
+
+    @Column(name = "UNIT_PRICE")
+    @ApiParam("单价")
+    private BigDecimal unitPrice;
+
+    @Column(name = "AMOUNT")
+    @ApiParam("金额")
+    private BigDecimal amount;
+
+    @Column(name = "SERVICE_NETWORK_STATION")
+    @ApiParam("服务网点")
+    private String serviceNetworkStation;
+
+    @Column(name = "WHETHER_SECONDARY_MAINTENANCE")
+    @ApiParam("是否二次维修")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.WHETHER_SECONDARY_MAINTENANCE.class, refForeignKey = "value", value = "description")
+    private Integer whetherSecondaryMaintenance;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name = "SEND_ADDRESS")
+    @ApiParam("仕向地")
+    private String sendAddress;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsCustomerComplaintSnRecord.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsCustomerComplaintSnRecord.java
new file mode 100644
index 0000000..25b122d
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsCustomerComplaintSnRecord.java
@@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: Xinwang.Yi
+ * @CreateDate: 2022/02/11 02:01 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_CUSTOMER_COMPLAINT_SN_RECORD",indexes = {@Index(columnList = "COMPLAINT_NO")})
+@Api("客诉关联条码表")
+public class SxQmsCustomerComplaintSnRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -7596108366351143473L;
+
+    @Column(name = "COMPLAINT_NO")
+    @ApiParam("客诉单号")
+    private String complaintNo;
+
+    @AnnoOutputColumn(
+            refClass = CommonEnumUtil.TRUE_OR_FALSE.class,
+            refForeignKey = "value",
+            value = "description",
+            hidden = true
+    )
+    @Column(name = "SN_EXIST_FLAG")
+    @ApiParam("条码是否存在于MES包装条码库 1-是；2-否")
+    private Integer snExistFlag;
+
+    @Column(name = "SN")
+    @ApiParam("条码")
+    private String sn;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "WORK_TIME")
+    @ApiParam("生产日期")
+    private String workTime;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsDefectRateTarget.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsDefectRateTarget.java
new file mode 100644
index 0000000..0fc2bc2
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsDefectRateTarget.java
@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description :不良率目标表
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_DEFECT_RATE_TARGET", indexes = {
+        @Index(columnList = "TARGET_TYPE"),
+        @Index(columnList = "TARGET_TIME"),
+        @Index(columnList = "DATA_TYPE"),
+        @Index(columnList = "DATA_VALUE")
+})
+@Api("不良率目标表")
+public class SxQmsDefectRateTarget extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 8611171654839315886L;
+
+    @Column(name = "DATA_TYPE")
+    @ApiParam("数据类型")
+    private Integer dataType;
+
+    @Column(name = "DATA_VALUE")
+    @ApiParam("数据值")
+    private String dataValue;
+
+    @Column(name = "TARGET_DESC")
+    @ApiParam("描述")
+    private String targetDesc;
+
+    @Column(name = "TARGET_TYPE")
+    @ApiParam("目标类型 字典维护")
+    private String targetType;
+
+    @Column(name = "TARGET_VALUE")
+    @ApiParam("目标值")
+    private String targetValue;
+
+    @Column(name = "TARGET_TIME")
+    @ApiParam("目标年月")
+    private String targetTime;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsEnum.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsEnum.java
new file mode 100644
index 0000000..9cd3ec0
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsEnum.java
@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 数据字典-枚举
+ * @Reference :
+ * @Author : PUXIAO
+ * @CreateDate : 2022-02-16
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_ENUM")
+@Api("数据字典-枚举")
+public class SxQmsEnum extends BaseBean {
+
+    //枚举名称
+    @Column(name = "ENUM_TYPE")
+    @ApiParam(value = "枚举类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String enumType;
+
+    @Column(name = "ENUM_TYPE_DESC")
+    @ApiParam(value = "枚举类型描述")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String enumTypeDesc;
+
+    //value
+    @Column(name = "ENUM_VALUE_SEQ")
+    @ApiParam(value = "枚举值序号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer enumValueSeq;
+
+
+    //code 部门code
+    @Column(name = "ENUM_VALUE")
+    @ApiParam(value = "枚举值")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String enumValue;
+
+    //描述
+    @Column(name = "ENUM_VALUE_DESC")
+    @ApiParam(value = "枚举值描述")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String enumValueDesc;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsErrorLineOff.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsErrorLineOff.java
new file mode 100644
index 0000000..4edb5e0
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsErrorLineOff.java
@@ -0,0 +1,92 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/7/30 9:30 AM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_ERROR_LINE_OFF", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "WORK_ORDER_NO"),
+        @Index(columnList = "WORK_ORDER_NO,SERIAL_NUMBER")
+})
+@Api("异常下线表")
+public class SxQmsErrorLineOff extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 2058343710063384942L;
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("下线产线")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @Column(name = "OUT_WC_TIME")
+    @ApiParam("下线时间")
+    private String outWcTime;
+
+    @Column(name = "FRE_STATUS")
+    @ApiParam("补件状态")
+    private Integer freStatus;
+
+    @Column(name = "FRE_USER")
+    @ApiParam("补件人")
+    private String freUser;
+
+    @Column(name = "FRE_TIME")
+    @ApiParam("补件时间")
+    private String freTime;
+
+    @Column(name = "CONFIRM_STATUS")
+    @ApiParam("确认状态")
+    private Integer confirmStatus;
+
+    @Column(name = "CONFIRM_USER")
+    @ApiParam("确认人")
+    private String confirmUser;
+
+    @Column(name = "CONFIRM_TIME")
+    @ApiParam("确认时间")
+    private String confirmTime;
+
+    @Column(name = "SYSTEM_SYNC_STATUS")
+    @ColumnDefault("2")
+    @ApiParam(value = "系统同步标志")
+    public Integer systemSyncStatus = 2;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsErrorLineOffDetail.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsErrorLineOffDetail.java
new file mode 100644
index 0000000..dff9f5a
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsErrorLineOffDetail.java
@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/7/30 9:30 AM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_ERROR_LINE_OFF_DETAIL", indexes = {
+        @Index(columnList = "PID"),
+        @Index(columnList = "SERIAL_NUMBER, WORK_ORDER_NO")
+})
+@Api("异常下线明细表")
+public class SxQmsErrorLineOffDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1947057567129975791L;
+    @Column(name = "PID")
+    @ApiParam("异常下线ID")
+    public Long pid;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam("原材料物料编码")
+    private String itemPartNo;
+
+    @Column(name = "ITEM_PART_NAME")
+    @ApiParam("原材料物料名称")
+    private String itemPartName;
+
+    @Column(
+            name = "QTY",
+            columnDefinition = "decimal(18,8)"
+    )
+    @ColumnDefault("0")
+    @ApiParam(value = "原材料物料数量", example = "0")
+    private Double qty;
+
+    @Column(name = "SYSTEM_SYNC_STATUS")
+    @ColumnDefault("2")
+    @ApiParam(value = "系统同步标志")
+    public Integer systemSyncStatus = 2;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsEvaluationManage.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsEvaluationManage.java
new file mode 100644
index 0000000..e78b74c
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsEvaluationManage.java
@@ -0,0 +1,148 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/12/4 1:28 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_EVALUATION_MANAGE", indexes = {
+        @Index(columnList = "APPLY_NO"),
+        @Index(columnList = "DEPARTMENT_CODE"),
+        @Index(columnList = "PRODUCT_TYPE"),
+        @Index(columnList = "CAUSE_TYPE"),
+        @Index(columnList = "VENDOR_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "RELATE_NO"),
+        @Index(columnList = "APPLY_USER"),
+        @Index(columnList = "EVALUATION_USER"),
+        @Index(columnList = "APPLY_DATE_TIME"),
+        @Index(columnList = "EVALUATION_DATE_TIME"),
+        @Index(columnList = "CHECK_DATE_TIME")
+})
+@Api("评价管理表")
+public class SxQmsEvaluationManage extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 7715068443625877987L;
+
+    @Column(name = "APPLY_NO")
+    @ApiParam("申请编号")
+    private String applyNo;
+
+    @Column(name = "DEPARTMENT_CODE")
+    @ApiParam("部门代码")
+    private String departmentCode;
+
+    @Column(name = "PRODUCT_TYPE")
+    @ApiParam("产品分类")
+    private Integer productType;
+
+    @Column(name = "BU_PRODUCT_TYPE")
+    @ApiParam("BU产品分类")
+    private String buProductType;
+
+    @Column(name = "CAUSE_TYPE")
+    @ApiParam("原因分类")
+    private Integer causeType;
+
+    @Column(name = "BU_CAUSE_TYPE")
+    @ApiParam("BU原因分类")
+    private String buCauseType;
+
+    @Column(name = "APPLY_USER")
+    @ApiParam("申请人")
+    private String applyUser;
+
+    @Lob
+    @Column(name = "APPLY_CONTENT")
+    @ApiParam("申请内容")
+    private String applyContent;
+
+    @Column(name = "APPLY_DATE_TIME")
+    @ApiParam(value = "申请日期")
+    private String applyDatetime;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "SAMPLE_PRE_DATE_TIME")
+    @ApiParam(value = "样品预交日期")
+    private String samplePreDatetime;
+
+    @Column(name = "SAMPLE_REAL_DATE_TIME")
+    @ApiParam(value = "样品实交日期")
+    private String sampleRealDatetime;
+
+    @Column(name = "EVALUATION_USER")
+    @ApiParam(value = "评价人")
+    private String evaluationUser;
+
+    @Column(name = "EVALUATION_DATE_TIME")
+    @ApiParam(value = "评价时间")
+    private String evaluationDatetime;
+
+    @Lob
+    @Column(name = "EVALUATION_CONTENT")
+    @ApiParam("评价结果")
+    private String evaluationContent;
+
+    @Column(name = "RELATE_NO")
+    @ApiParam(value = "关联编号")
+    private String relateNo;
+
+    @Column(name = "CHECK_DATE_TIME")
+    @ApiParam(value = "结果输出时间")
+    private String checkDatetime;
+
+    @Lob
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name = "UPLOAD_DATE_TIME")
+    @ApiParam("上传时间")
+    private String uploadDatetime;
+
+    @Column(name = "FILE_ID")
+    @ApiParam("文件ID")
+    private Long fileId;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件源名")
+    private String fileOriginName;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsFile.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsFile.java
new file mode 100644
index 0000000..a8cc742
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsFile.java
@@ -0,0 +1,70 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/12/4 1:28 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_FILE")
+@Api("文件表")
+public class SxQmsFile extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -5558031402910862600L;
+
+    @Column(name = "FILE_NAME")
+    @ApiParam("文件名称")
+    private String fileName;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Column(name = "GROUP_NAME")
+    @ApiParam("组名")
+    private String groupName;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件原名")
+    private String fileOriginName;
+
+    @Column(name = "FILE_SIZE")
+    @ApiParam("文件大小")
+    private String fileSize;
+
+    @Column(name = "FILE_TYPE")
+    @ApiParam("文件类型名称")
+    private String fileType;
+
+    @Column(name = "SYNC_TAG")
+    @ApiParam("同步标记")
+    private Integer syncTag = 0;
+
+    @Column(name = "FILE_MODULE_TYPE")
+    @ApiParam("所属模块")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.FILE_MODULE_TYPE.class, refForeignKey = "value", value = "description", hidden = true)
+    private Integer fileModuleType;
+
+    @Column(name = "MODULE_ID")
+    @ApiParam("模块ID")
+    private Long moduleId;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsImprovementExperience.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsImprovementExperience.java
new file mode 100644
index 0000000..47585e6
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsImprovementExperience.java
@@ -0,0 +1,72 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-02-21 15:43
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_IMPROVEMENT_EXPERIENCE")
+@Api("改善经验库表")
+public class SxQmsImprovementExperience extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -3362434680574391652L;
+
+    @Column(name = "IMPROVE_TYPE")
+    @ApiParam(value = "改善类别")
+    private Integer improveType;
+
+    @Lob
+    @Column(name = "PROBLEM_DESC")
+    @ApiParam(value = "问题描述")
+    private String problemDesc;
+
+    @Lob
+    @Column(name = "SOLUTION")
+    @ApiParam(value = "解决方案")
+    private String solution;
+
+    @Column(name = "REMARK")
+    @ApiParam(value = "备注")
+    private String remark;
+
+    @Column(name = "MACHINE_CODE")
+    @ApiParam(value = "机种编码")
+    private String machineCode;
+
+    @Column(name = "MACHINE_NAME")
+    @ApiParam(value = "机种名称")
+    private String machineName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "产线")
+    private String workCenterCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编码")
+    public String partNo;
+
+    @ApiParam("分类1")
+    @Column(name = "CATEGORY_CODE1")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CATEGORY_CODE1.class, refForeignKey = "value", value = "description", hidden = true)
+    private String categoryCode1;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsInspectionMethodChangeManagement.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsInspectionMethodChangeManagement.java
new file mode 100644
index 0000000..1609cca
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsInspectionMethodChangeManagement.java
@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.*;
+
+/**
+ * @description: 检验方式变更管理表
+ * @author: jiaqi.hou
+ * @date: 2022/04/26
+ */
+@Data
+@Entity
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_INSPECTION_METHOD_CHANGE_MANAGEMENT", indexes = {@Index(columnList = "PART_NO,PART_NAME,VENDOR_NO,VENDOR_NAME,IS_STRICTER,IS_CONFIRM")})
+@Api("检验方式变更管理表")
+public class SxQmsInspectionMethodChangeManagement extends BaseBean {
+    @Column(name = "PART_NO")
+    @ApiParam("物料代码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商代码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "IS_STRICTER")
+    @ApiParam("是否加严检")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.IS_STRICTER.class, refForeignKey = "value", value = "description")
+    private Integer isStricter;
+
+    @Column(name = "IS_CONFIRM")
+    @ApiParam("是否确认检")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.IS_CONFIRM.class, refForeignKey = "value", value = "description")
+    private Integer isConfirm;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsKnowhow.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsKnowhow.java
new file mode 100644
index 0000000..26997a1
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsKnowhow.java
@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_KNOWHOW")
+@Api("KNOWHOW集")
+public class SxQmsKnowhow extends BaseBean {
+
+    @Column(name = "MACHINE_CODE")
+    @ApiParam("机种编码")
+    private String machineCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "PROBLEM_DESC")
+    @ApiParam("问题描述")
+    private String problemDesc;
+
+    @Column(name = "TEMPORARY_ACTION")
+    @ApiParam("现行对策")
+    private String temporaryAction;
+
+    @Column(name = "NEW_PRODUCTS_DESC")
+    @ApiParam("新品推进")
+    private String newProductsDesc;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsLimitColorCfg.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsLimitColorCfg.java
new file mode 100644
index 0000000..d4ac82a
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsLimitColorCfg.java
@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/12/4 1:28 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_LIMIT_COLOR_CFG", indexes = {
+        @Index(columnList = "MODULE")
+})
+@Api("上下限颜色配置表")
+public class SxQmsLimitColorCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -2136605955136620660L;
+
+    @Column(name = "MODULE")
+    @ApiParam("功能模块")
+    private Integer module;
+
+    @Column(name = "UP_LIMIT")
+    @ApiParam("上限值")
+    private String upLimit;
+
+    @Column(name = "DOWN_LIMIT")
+    @ApiParam("下限值")
+    private String downLimit;
+
+    @Column(name = "COLOR_CODE")
+    @ApiParam("颜色代码")
+    private String colorCode;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMachine.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMachine.java
new file mode 100644
index 0000000..c4ee1a7
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMachine.java
@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description :机种信息
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2022-04-03 20:37
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="SX_QMS_MACHINE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Api(value="机种信息",description = "机种信息")
+public class SxQmsMachine extends BaseBean{
+
+    @Column(name = "MACHINE_CODE")
+    @ApiParam(value = "机种编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String machineCode;
+
+    @Column(name = "MACHINE_NAME")
+    @ApiParam(value = "机种名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String machineName;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsManagementTestMonitoring.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsManagementTestMonitoring.java
new file mode 100644
index 0000000..f9fa762
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsManagementTestMonitoring.java
@@ -0,0 +1,161 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description : 管理试验监控
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2022/5/30 14:52
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_MANAGEMENT_TEST_MONITORING")
+@Api("管理试验监控")
+public class SxQmsManagementTestMonitoring extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6577142664968319927L;
+
+    @Column(name = "MONITORING_TYPE")
+    @ApiParam("监控类型")
+    private Integer monitoringType;
+
+    @Column(name = "PRODUCT_TYPE")
+    @ApiParam("产品类型")
+    private String productType;
+
+    @Column(name = "PRODUCT_TYPE_NAME")
+    @ApiParam("产品类型名称")
+    private String productTypeName;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "TO_LAND")
+    @ApiParam("仕向地")
+    private String toLand;
+
+    @Column(name = "VOLTAGE_FREQUENCY")
+    @ApiParam("电压频率")
+    private String voltageFrequency;
+
+    @Column(name = "COUNT")
+    @ApiParam("台数")
+    private Integer count;
+
+    @Column(name = "TEST_CYCLE")
+    @ApiParam("试验周期")
+    private String testCycle;
+
+    @Column(name = "PART_PRODUCE_TYPE")
+    @ApiParam("部品区分")
+    private Integer partProduceType;
+
+    @Transient
+    @ApiParam("部品区分描述")
+    private String partProduceTypeStr;
+
+    @Column(name = "TEST_TYPE_DISTINGUISH")
+    @ApiParam("试验类型区分")
+    private Integer testTypeDistinguish;
+
+    @Transient
+    @ApiParam("试验类型区分描述")
+    private String testTypeDistinguishStr;
+
+    @Column(name = "PLAN")
+    @ApiParam("计划")
+    private String plan;
+
+    @Column(name = "RESULT")
+    @ApiParam("实绩")
+    private String result;
+
+    @Column(name = "REPORT_DATE_TIME")
+    @ApiParam("报告日期")
+    private String reportDatetime;
+
+    @Column(name = "CHECK_DATE_TIME")
+    @ApiParam("送检日期")
+    private String checkDatetime;
+
+    @Transient
+    @ApiParam("送检日期起始")
+    private String checkDatetimeStart;
+
+    @Transient
+    @ApiParam("送检日期结束")
+    private String checkDatetimeEnd;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.MANAGEMENT_TEST_MONITORING_STATUS.class)
+    private Integer status;
+
+    @Transient
+    @ApiParam("状态描述")
+    private String statusStr;
+
+    @Lob
+    @Column(name = "MANUFACTURER_REPORT_ATTACHMENT")
+    @ApiParam("厂家报表附件")
+    private String manufacturerReportAttachment;
+
+    @Lob
+    @Column(name = "SELF_CHECK_REPORT_ATTACHMENT")
+    @ApiParam("自检报表附件")
+    private String selfCheckReportAttachment;
+
+    @Transient
+    @ApiParam("计划开始时间")
+    private String planBegin;
+
+    @Transient
+    @ApiParam("计划结束时间")
+    private String planEnd;
+
+    @Transient
+    @ApiParam("实绩开始时间")
+    private String resultBegin;
+
+    @Transient
+    @ApiParam("实绩结束时间")
+    private String resultEnd;
+
+    @Transient
+    @ApiParam("颜色")
+    private String color;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsManagementTestMonitoringRecord.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsManagementTestMonitoringRecord.java
new file mode 100644
index 0000000..8b162a0
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsManagementTestMonitoringRecord.java
@@ -0,0 +1,121 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description : 管理试验监控记录
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2022/5/30 14:52
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_MANAGEMENT_TEST_MONITORING_RECORD")
+@Api("管理试验监控记录")
+public class SxQmsManagementTestMonitoringRecord extends BaseBean implements Serializable {
+
+
+    @Column(name = "MONITORING_TYPE")
+    @ApiParam("监控类型")
+    private Integer monitoringType;
+
+    @Column(name = "PRODUCT_TYPE")
+    @ApiParam("产品类型")
+    private String productType;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "TO_LAND")
+    @ApiParam("仕向地")
+    private String toLand;
+
+    @Column(name = "VOLTAGE_FREQUENCY")
+    @ApiParam("电压频率")
+    private String voltageFrequency;
+
+    @Column(name = "COUNT")
+    @ApiParam("台数")
+    private String count;
+
+    @Column(name = "TEST_CYCLE")
+    @ApiParam("试验周期")
+    private String testCycle;
+
+    @Column(name = "PART_PRODUCE_TYPE")
+    @ApiParam("部品区分")
+    private Integer partProduceType;
+
+    @Column(name = "TEST_TYPE_DISTINGUISH")
+    @ApiParam("试验类型区分")
+    private Integer testTypeDistinguish;
+
+    @Column(name = "PLAN")
+    @ApiParam("计划")
+    private String plan;
+
+    @Column(name = "RESULT")
+    @ApiParam("实绩")
+    private String result;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+    @Lob
+    @Column(name = "MANUFACTURER_REPORT_ATTACHMENT")
+    @ApiParam("厂家报表附件")
+    private String manufacturerReportAttachment;
+
+    @Lob
+    @Column(name = "SELF_CHECK_REPORT_ATTACHMENT")
+    @ApiParam("自检报表附件")
+    private String selfCheckReportAttachment;
+
+    @Transient
+    @ApiParam("计划开始时间")
+    private String planBegin;
+
+    @Transient
+    @ApiParam("计划结束时间")
+    private String planEnd;
+
+    @Transient
+    @ApiParam("实绩开始时间")
+    private String resultBegin;
+
+    @Transient
+    @ApiParam("实绩结束时间")
+    private String resultEnd;
+
+    @Transient
+    @ApiParam("颜色")
+    private String color;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMiddleCheckDetails.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMiddleCheckDetails.java
new file mode 100644
index 0000000..a4fb818
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMiddleCheckDetails.java
@@ -0,0 +1,103 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.annotation.EntityColumn;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description :
+ * @Author : FutureSoldiers
+ * @Create : 2022/10/26 11:25
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_MIDDLE_CHECK_DETAILS",indexes = {@Index(columnList = "ORDER_NO")})
+@Api("中间检查明细表")
+public class SxQmsMiddleCheckDetails  extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    private String orderNo;
+    @Column(name = "TASK_DESC")
+    @AnnoOutputColumn(name = "任务描述")
+    @ApiParam("任务描述")
+    private String taskDesc;
+
+    @Column(name = "TASK_NO")
+    @AnnoOutputColumn(name = "任务编码")
+    @ApiParam("任务编码")
+    private String taskNo;
+
+
+    @Column(name = "TASK_NAME")
+    @AnnoOutputColumn(name = "任务名称")
+    @ApiParam("任务名称")
+    private String taskName;
+
+
+    @EntityColumn(isRequired = true,isPrimary = true)
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检测类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CHECK_JUDGE_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer checkType;
+
+    @Column(name = "STANDARD_VALUE")
+    @ApiParam("标准值")
+    private String standardValue;
+
+    @Column(name = "MAX_VALUE")
+    @ApiParam("最大值")
+    private Double maxValue;
+
+    @Column(name = "MIN_VALUE")
+    @ApiParam("最小值")
+    private Double minValue;
+
+    @Column(name = "IS_NECESSARY",columnDefinition = "int(11) default 1")
+    @ApiParam("是否必检")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isNecessary;
+
+    @Column(name = "CHECK_SEQ")
+    @ApiParam("检验顺序")
+    private Integer checkSeq;
+
+    @Column(name = "PROJECT_TYPE")
+    @ApiParam("项目分类")
+    private String projectType;
+
+    @Column(name = "CHECK_ITEM")
+    @ApiParam("检查项")
+    private String checkItem;
+
+    @Column(name = "CHECK_ITEM_DESC")
+    @ApiParam("检查项内容")
+    private String checkItemDesc;
+
+    @Column(name = "CHECK_STANDARD_DESC")
+    @ApiParam("检测标准描述")
+    private String checkStandardDesc;
+
+    @Column(name = "CHECK_TOOL")
+    @ApiParam("检查器具")
+    private String checkTool;
+
+
+
+
+
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMiddleCheckMaster.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMiddleCheckMaster.java
new file mode 100644
index 0000000..a39e42e
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMiddleCheckMaster.java
@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Author : FutureSoldiers
+ * @Create : 2022/10/26 11:18
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_MIDDLE_CHECK_MASTER",indexes = {@Index(columnList = "ORDER_NO")})
+@Api("中间检查主表")
+public class SxQmsMiddleCheckMaster  extends BaseBean implements Serializable {
+
+
+    @Column(name = "TASK_DESC")
+    @AnnoOutputColumn(name = "任务描述", refForeignKey = "value", value = "description")
+    @ApiParam("任务描述")
+    private String taskDesc;
+
+    @Column(name = "TASK_NO")
+    @AnnoOutputColumn(name = "任务编码", refForeignKey = "value", value = "description")
+    @ApiParam("任务编码")
+    private String taskNo;
+
+
+    @Column(name = "TASK_NAME")
+    @AnnoOutputColumn(name = "任务名称", refForeignKey = "value", value = "description")
+    @ApiParam("任务名称")
+    private String taskName;
+
+    @Column(name = "FILE_PATH")
+    @ApiParam("文件路径")
+    private String filePath;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    private String orderNo;
+
+
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name = "FILE_ORIGINAL_NAME")
+    @ApiParam("文件名称")
+    private String fileOriginalName;
+
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMiddleCheckTask.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMiddleCheckTask.java
new file mode 100644
index 0000000..9df997b
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMiddleCheckTask.java
@@ -0,0 +1,102 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description :
+ * @Author : FutureSoldiers
+ * @Create : 2022/10/25 16:39
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_MIDDLE_CHECK_TASK",indexes = {@Index(columnList = "ORDER_NO")})
+@Api("中间检查任务表")
+public class SxQmsMiddleCheckTask  extends BaseBean {
+
+    @Column(name = "TASK_NO")
+    @ApiParam("任务编码")
+    private String taskNo;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    private String orderNo;
+
+    @Column(name = "TASK_DESC")
+    @AnnoOutputColumn(name = "任务描述")
+    @ApiParam("任务描述")
+    private String taskDesc;
+
+    @Column(name = "TASK_NAME")
+    @AnnoOutputColumn(name = "任务名称")
+    @ApiParam("任务名称")
+    private String taskName;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+//    @Column(name = "INSPECTION_NAME")
+//    @ApiParam("巡查项名称")
+//    private String inspectionName;
+
+//    @Column(name = "AREA_CODE")
+//    @ApiParam("区域编码")
+//    private String areaCode;
+
+    /*@Column(name = "AREA_NAME")
+    @ApiParam("区域名称")
+    private String areaName;*/
+
+//    @Column(name = "WORK_CENTER")
+//    @ApiParam("生产线编码")
+//    private String workCenter;
+//
+//    @Column(name = "WORK_CENTER_NAME")
+//    @ApiParam("生产线名称")
+//    private String workCenterName;
+
+    @Column(name = "ORDER_STATUS")
+    @ApiParam("单据状态")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PROJECT_INSPECTION_TASK_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer orderStatus;
+
+    @Column(name = "ORDER_RESULT")
+    @ApiParam("单据结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QMS_OQC_CHECK_DETAIL_RESULT.class, refForeignKey = "value", value = "description")
+    private Integer orderResult;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name = "FILE_ORIGINAL_NAME")
+    @ApiParam("文件名称")
+    private String fileOriginalName;
+
+    @Column(name = "FILE_PATH")
+    @ApiParam("文件路径")
+    private String filePath;
+
+    @Column(name = "DUTY_DIFF")
+    @ApiParam("责任区分 QmsEnumUtil.EP_QMS_OQC_CHECK_DUTY_DIFF  10-制造、20-部品、30技术、40-其他，每个客诉单分析可选择多条原因区分项")
+    private String dutyDiff;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMiddleCheckTaskRecord.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMiddleCheckTaskRecord.java
new file mode 100644
index 0000000..9782b7c
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMiddleCheckTaskRecord.java
@@ -0,0 +1,120 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description :
+ * @Author : FutureSoldiers
+ * @Create : 2022/10/25 16:54
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_MIDDLE_CHECK_TASK_RECORD",indexes = {@Index(columnList = "ORDER_NO")})
+@Api("中间检查检测记录表")
+public class SxQmsMiddleCheckTaskRecord extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    private String orderNo;
+
+    @Column(name = "TASK_NO")
+    @AnnoOutputColumn(name = "任务编码")
+    @ApiParam("任务编码")
+    private String taskNo;
+
+
+    @Column(name = "RECORD_RESULT")
+    @ApiParam("结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QMS_OQC_CHECK_DETAIL_RESULT.class, refForeignKey = "value", value = "description")
+    private Integer recordResult;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检测类型")
+    private Integer checkType;
+
+    @Column(name = "ACTUAL_VALUE")
+    @ApiParam("实测值")
+    private String actualValue;
+
+    /**
+     * 比值类型 可能为字符串
+     **/
+    @Column(name = "STANDARD_VALUE")
+    @ApiParam("标准值")
+    private String standardValue;
+
+    @Column(name = "MAX_VALUE")
+    @ApiParam("最大值")
+    private Double maxValue;
+
+    @Column(name = "MIN_VALUE")
+    @ApiParam("最小值")
+    private Double minValue;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name = "IS_NECESSARY")
+    @ApiParam("是否必检")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isNecessary;
+
+    @Column(name = "PROJECT_TYPE")
+    @ApiParam("项目分类")
+    private String projectType;
+
+    @Column(name = "CHECK_ITEM")
+    @ApiParam("检查项")
+    private String checkItem;
+
+    @Column(name = "CHECK_SEQ")
+    @ApiParam("检验顺序")
+    private Integer checkSeq;
+
+    @Column(name = "CHECK_ITEM_DESC")
+    @ApiParam("检查项内容")
+    private String checkItemDesc;
+
+    @Column(name = "CHECK_STANDARD_DESC")
+    @ApiParam("检测标准描述")
+    private String checkStandardDesc;
+
+    @Column(name = "CHECK_TOOL")
+    @ApiParam("检查器具")
+    private String checkTool;
+
+
+
+    @Transient
+    @ApiParam("单据状态")
+    private Integer orderStatus;
+
+    @Transient
+    @ApiParam("总结果")
+    private Integer taskRecordResult;
+
+    @Transient
+    @ApiParam(value = "开始时间")
+    private String createDatetimeStart;
+
+    @Transient
+    @ApiParam(value = "结束时间")
+    private String createDatetimeEnd;
+
+}
+
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsModuleExcelManage.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsModuleExcelManage.java
new file mode 100644
index 0000000..a381362
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsModuleExcelManage.java
@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/7/30 9:30 AM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_MODULE_EXCEL_MANAGE", indexes = {
+        @Index(columnList = "MODULE_CODE"),
+        @Index(columnList = "MODULE_NAME")
+})
+@Api("模块EXCEL管理表")
+public class SxQmsModuleExcelManage extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -7408420967872044535L;
+
+    @Column(name = "MODULE_CODE")
+    @ApiParam("模块代码")
+    private String moduleCode;
+
+    @Column(name = "MODULE_NAME")
+    @ApiParam("模块名称")
+    private String moduleName;
+
+    @Column(name = "FILE_ID")
+    @ApiParam("文件id")
+    private Long fileId;
+
+    @Transient
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsModuleFileImportLot.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsModuleFileImportLot.java
new file mode 100644
index 0000000..41bddd7
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsModuleFileImportLot.java
@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/7/30 9:30 AM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_MODULE_FILE_IMPORT_LOT", indexes = {
+        @Index(columnList = "LOT_NO"),
+        @Index(columnList = "MODULE")
+})
+@Api("模块文件导入批次表")
+public class SxQmsModuleFileImportLot extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6337301955352888766L;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("批次号")
+    private String lotNo;
+
+    @Column(name = "MODULE")
+    @ApiParam("模块")
+    private String module;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMonitorManage.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMonitorManage.java
new file mode 100644
index 0000000..396ebbf
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMonitorManage.java
@@ -0,0 +1,151 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/12/4 1:28 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_MONITOR_MANAGE", indexes = {
+        @Index(columnList = "MODULE"),
+        @Index(columnList = "MANAGE_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "VENDOR_NO"),
+        @Index(columnList = "PRODUCT_TYPE"),
+        @Index(columnList = "MACHINE_CODE"),
+        @Index(columnList = "CLASSIFY"),
+        @Index(columnList = "LEVEL"),
+        @Index(columnList = "CHECK_DIFF"),
+        @Index(columnList = "CATEGORY"),
+        @Index(columnList = "PROJECT_NAME")
+})
+@Api("RoHS检测/管理试验监控 管理表")
+public class SxQmsMonitorManage extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6293666166432566762L;
+
+    @Column(name = "MODULE")
+    @ApiParam(value = "模块")
+    private Integer module;
+
+    @Column(name = "MANAGE_NO")
+    @ApiParam("编号")
+    private String manageNo;
+
+    @Column(name = "CHECK_DATE")
+    @ApiParam("检测时间 不进行计算,仅显示,可编辑")
+    private String checkDate;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "PRODUCT_TYPE")
+    @ApiParam("产品分类")
+    private Integer productType;
+
+    @Column(name = "PRODUCT_TYPE_STR")
+    @ApiParam("BU产品分类")
+    private String productTypeStr;
+
+    @Column(name = "MACHINE_CODE")
+    @ApiParam("机种编码")
+    private String machineCode;
+
+    @Column(name = "MACHINE_NAME")
+    @ApiParam(value = "机种名称")
+    private String machineName;
+
+    @Column(name = "CLASSIFY")
+    @ApiParam(value = "分类")
+    private Integer classify;
+
+    @Column(name = "LEVEL")
+    @ApiParam(value = "等级")
+    private Integer level;
+
+    @Column(name = "CHECK_FREQUENCY")
+    @ApiParam(value = "检测频度")
+    private Integer checkFrequency;
+
+    @Column(name = "CHECK_DATE_TIME")
+    @ApiParam(value = "计划检测日期")
+    private String checkDatetime;
+
+    @Column(name = "CHECKED_DATE_TIME")
+    @ApiParam(value = "检测确认日期")
+    private String checkedDatetime;
+
+    @Column(name = "CHECKED_USER")
+    @ApiParam(value = "检测确认人")
+    private String checkedUser;
+
+    @Column(name = "CHECK_DIFF")
+    @ApiParam("检查区分")
+    private String checkDiff;
+
+    @Column(name = "CATEGORY")
+    @ApiParam("类别")
+    private String category;
+
+    @Column(name = "PROJECT_NAME")
+    @ApiParam("管理试验项目")
+    private String projectName;
+
+    @Column(name = "PHTHALATES_CHECK")
+    @ApiParam(value = "邻苯是否检测")
+    private Integer phthalatesCheck;
+
+    @Column(name = "PHTHALATES_LEVEL")
+    @ApiParam("邻苯等级")
+    private Integer phthalatesLevel;
+
+    @Column(name = "PHTHALATES_CHECK_FREQUENCY")
+    @ApiParam("邻苯检测频度")
+    private Integer phthalatesCheckFrequency;
+
+    @Column(name = "PHTHALATES_ACTUAL_CHECK_DATE")
+    @ApiParam("邻苯实际检测日期")
+    private String phthalatesActualCheckDate;
+
+    @Column(name = "PHTHALATES_CHECKED_USER")
+    @ApiParam(value = "邻苯检测确认人")
+    private String phthalatesCheckedUser;
+
+    @Column(name = "PHTHALATES_EXPECTED_CHECK_DATE")
+    @ApiParam(value = "邻苯预计检测日期")
+    private String phthalatesExpectedCheckDate;
+
+//    @Column(name = "PHTHALATES_CHECK_REMIND")
+//    @ApiParam(value = "邻苯检测提醒")
+//    private Integer phthalatesCheckRemind;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMonitorManageRecord.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMonitorManageRecord.java
new file mode 100644
index 0000000..c71f928
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsMonitorManageRecord.java
@@ -0,0 +1,181 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/12/4 1:28 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_MONITOR_MANAGE_RECORD", indexes = {
+        @Index(columnList = "MANAGE_NO")
+})
+@Api("RoHS检测记录表")
+public class SxQmsMonitorManageRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 9063204896109148540L;
+
+    @Column(name = "MODULE")
+    @ApiParam(value = "模块")
+    private Integer module;
+
+    @Column(name = "MANAGE_NO")
+    @ApiParam("编号")
+    private String manageNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "PRODUCT_TYPE")
+    @ApiParam("产品分类")
+    private Integer productType;
+
+    @Column(name = "PRODUCT_TYPE_STR")
+    @ApiParam("BU产品分类")
+    private String productTypeStr;
+
+    @Column(name = "MACHINE_CODE")
+    @ApiParam("机种编码")
+    private String machineCode;
+
+    @Column(name = "MACHINE_NAME")
+    @ApiParam(value = "机种名称")
+    private String machineName;
+
+    @Column(name = "CLASSIFY")
+    @ApiParam(value = "分类")
+    private Integer classify;
+
+    @Column(name = "LEVEL")
+    @ApiParam(value = "等级")
+    private Integer level;
+
+    @Column(name = "CHECK_FREQUENCY")
+    @ApiParam(value = "检测频度")
+    private Integer checkFrequency;
+
+    @Column(name = "CHECK_DATE_TIME")
+    @ApiParam(value = "计划检测日期")
+    private String checkDatetime;
+
+    @Column(name = "CHECK_STATUS")
+    @ApiParam(value = "检测确认状态")
+    private Integer checkStatus;
+
+    @Column(name = "CHECKED_DATE_TIME")
+    @ApiParam(value = "检测确认日期")
+    private String checkedDatetime;
+
+    @Column(name = "CHECKED_FRE_DATE_TIME")
+    @ApiParam(value = "检测确认计划日期")
+    private String checkedFreDatetime;
+
+    @Column(name = "CHECKED_USER")
+    @ApiParam(value = "检测确认人")
+    private String checkedUser;
+
+    @Column(name = "CHECK_DIFF")
+    @ApiParam("检查区分")
+    private String checkDiff;
+
+    @Column(name = "CATEGORY")
+    @ApiParam("类别")
+    private String category;
+
+    @Column(name = "PROJECT_NAME")
+    @ApiParam("管理试验项目")
+    private String projectName;
+
+    @Column(name = "CHECK_REMIND")
+    @ApiParam(value = "检测提醒")
+    private Integer checkRemind;
+
+    @Column(name = "CHECK_REMIND_COLOR")
+    @ApiParam(value = "检测提醒颜色")
+    private String checkRemindColor;
+
+    /**
+     * 10-普通检查 20-邻苯检测
+     */
+    @Column(name = "ACTION_TYPE")
+    @ApiParam("检测类型")
+    private Integer actionType;
+
+    @Column(name = "LAST_CHECK_DATE_TIME")
+    @ApiParam(value = "上次预计检测日期")
+    private String lastCheckDatetime;
+
+    @Column(name = "LAST_CHECKED_DATE_TIME")
+    @ApiParam(value = "上次实际检测日期")
+    private String lastCheckedDatetime;
+
+    @Column(name = "REMARK")
+    @ApiParam(value = "备注")
+    private String remark;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam(value = "检测确认结果 10-合格；20-不合格")
+    private Integer checkResult;
+
+//    @Column(name = "PHTHALATES_CHECKED_USER")
+//    @ApiParam(value = "邻苯检测确认人")
+//    private String phthalatesCheckedUser;
+
+//    @Column(name = "DODP_LAST_EXPECTED_CHECK_DATE")
+//    @ApiParam(value = "邻苯上次计划时间")
+//    private String dODPLastExpectedCheckDate;
+
+//    @Column(name = "DODP_EXPECTED_CHECK_DATE")
+//    @ApiParam(value = "邻苯预测检测日期")
+//    private String dODPExpectedCheckDate;
+
+//    @Column(name = "DODP_CHECK_REMIND")
+//    @ApiParam(value = "邻苯检测提醒")
+//    private Integer dODPCheckRemind;
+
+
+//    @Column(name = "DODP_CHECK")
+//    @ApiParam(value = "邻苯是否检测")
+//    private Integer dODPCheck;
+
+//    @Column(name = "DODP_LEVEL")
+//    @ApiParam("邻苯等级")
+//    private String dODPLevel;
+
+//    @Column(name = "DODP_CHECK_FREQUENCY")
+//    @ApiParam("邻苯检测频度")
+//    private Integer dODPCheckFrequency;
+
+//    @Column(name = "DODP_ACTUAL_CHECK_DATE")
+//    @ApiParam("邻苯实际检测日期")
+//    private String dODPActualCheckDate;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOnSiteOrder.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOnSiteOrder.java
new file mode 100644
index 0000000..6142f77
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOnSiteOrder.java
@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: Dominic
+ * @Date: 2022-05-27 10:05:05
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SX_QMS_ON_SITE_ORDER", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "WORK_ORDER_NO")
+})
+@Api("巡检单")
+public class SxQmsOnSiteOrder extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8025823591185213040L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "单号")
+    private String orderNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "生产线")
+    public String workCenterCode;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam(value = "生产工单号")
+    public String workOrderNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编码")
+    public String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam(value = "物料名称")
+    public String partNameRdd;
+
+    @Column(name = "ORDER_STATUS")
+    @ApiParam(value = "单据状态")
+    public Integer orderStatus;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOnSiteOrderDetail.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOnSiteOrderDetail.java
new file mode 100644
index 0000000..a4f623d
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOnSiteOrderDetail.java
@@ -0,0 +1,195 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: Dominic
+ * @Date: 2022-05-27 10:05:05
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SX_QMS_ON_SITE_ORDER_DETAIL", indexes = {
+        @Index(columnList = "ORDER_NO")
+})
+@Api("巡检单明细数据")
+public class SxQmsOnSiteOrderDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 931280233569614903L;
+
+    @Column(name = "SYSTEM_SYNC_STATUS")
+    @ColumnDefault("2")
+    @ApiParam(value = "系统同步标志")
+    public Integer systemSyncStatus = 2;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "单号")
+    private String orderNo;
+
+    @Column(name = "PROJECT_SORT_NO")
+    @ApiParam(value = "项目分类编号")
+    public String projectSortNo;
+
+    @Column(name = "PROJECT_CODE")
+    @ApiParam(value = "项目代码")
+    public String projectCode;
+
+    @Column(name = "PROJECT_NAME")
+    @ApiParam(value = "项目名称")
+    public String projectName;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam(value = "检测类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PROCEDURE_CHECK_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer checkType;
+
+    @Column(name = "STANDARD_VALUE")
+    @ApiParam(value = "标准值")
+    public String standardValue;
+
+    @Column(name = "MIN_VALUE")
+    @ApiParam(value = "下限值")
+    public String minValue;
+
+    @Column(name = "MAX_VALUE")
+    @ApiParam(value = "上限值")
+    public String maxValue;
+
+    @Column(name = "CHECK_VALUE")
+    @ApiParam(value = "点检值")
+    public String checkValue;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam(value = "点检结果")
+    public String checkResult;
+
+    @Column(name = "SPOT_CHECK_USER")
+    @ApiParam(value = "点检人员")
+    public String spotCheckUser;
+
+    @Column(name = "SPOT_CHECK_TIME")
+    @ApiParam(value = "点检时间")
+    public String spotCheckTime;
+
+    @Column(name = "MAINTAIN_STRATEGY")
+    @ApiParam(value = "维护策略")
+    public String maintainStrategy;
+
+    @Column(name = "MAINTAIN_STRATEGY_USER")
+    @ApiParam(value = "维护人")
+    public String maintainStrategyUser;
+
+    @Column(name = "OPERATE_USER")
+    @ApiParam(value = "编辑人员")
+    public String operateUser;
+
+    @Column(name = "OPERATE_TIME")
+    @ApiParam(value = "编辑时间")
+    public String operateTime;
+
+    @Column(name = "MEMO")
+    @ApiParam(value = "备注")
+    public String memo;
+
+    @Transient
+    @ApiParam(value = "生产线")
+    public String workCenterCode;
+
+    @Transient
+    @ApiParam(value = "生产工单号")
+    public String workOrderNo;
+
+    @Transient
+    @ApiParam(value = "物料编码")
+    public String partNo;
+
+    @Transient
+    @ApiParam("点检开始时间")
+    public String spotCheckTimeStart;
+
+    @Transient
+    @ApiParam("点检结束时间")
+    public String spotCheckTimeEnd;
+
+    @Transient
+    @ApiParam(value = "单据状态")
+    public Integer orderStatus;
+
+    @Transient
+    @ApiParam(value = "修改人")
+    public String modifyUser;
+
+    @Transient
+    @ApiParam(value = "修改时间")
+    public String modifyDatetime;
+
+    @Transient
+    @ApiParam("点检结果名称")
+    private String checkResultName;
+
+    @Transient
+    @ApiParam(value = "单据状态名称")
+    public String orderStatusName;
+
+    @Transient
+    @ApiParam(value = "项目分类名称")
+    public String projectSortName;
+
+    @Transient
+    @ApiParam(value = "颜色")
+    private String color;
+
+    @Transient
+    @ApiParam(value = "排序优先级")
+    private Integer sort;
+
+    public SxQmsOnSiteOrderDetail() {
+    }
+
+    public SxQmsOnSiteOrderDetail(Long id, String workCenterCode, String workOrderNo, String partNo, String projectSortNo, String projectCode,
+                                  String projectName, String orderNo, String createDatetime, String memo, String checkResult, String spotCheckUser,
+                                  String spotCheckTime, String maintainStrategy, String operateUser, String operateTime,
+                                  Integer orderStatus, String modifyUser, String modifyDatetime, Integer checkType,
+                                  String standardValue, String minValue, String maxValue, String checkValue) {
+        this.id = id;
+        this.workCenterCode = workCenterCode;
+        this.workOrderNo = workOrderNo;
+        this.partNo = partNo;
+        this.projectSortNo = projectSortNo;
+        this.projectCode = projectCode;
+        this.projectName = projectName;
+        this.orderNo = orderNo;
+        this.createDatetime = createDatetime;
+        this.memo = memo;
+        this.checkResult = checkResult;
+        this.spotCheckUser = spotCheckUser;
+        this.spotCheckTime = spotCheckTime;
+        this.maintainStrategy = maintainStrategy;
+        this.operateUser = operateUser;
+        this.operateTime = operateTime;
+        this.orderStatus = orderStatus;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.checkType = checkType;
+        this.standardValue = standardValue;
+        this.minValue = minValue;
+        this.maxValue = maxValue;
+        this.checkValue = checkValue;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcCheck.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcCheck.java
new file mode 100644
index 0000000..8f06845
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcCheck.java
@@ -0,0 +1,160 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/12/4 1:28 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_OQC_CHECK", indexes = {
+        @Index(columnList = "OQC_NO"),
+        @Index(columnList = "WORK_CENTER_CODE"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "WORK_ORDER_NO"),
+        @Index(columnList = "WORK_TIME"),
+        @Index(columnList = "CHECK_TIME"),
+        @Index(columnList = "WORK_TIME,PART_NO"),
+        @Index(columnList = "CHECK_TIME,PART_NO"),
+        @Index(columnList = "CHECK_TIME,WORK_CENTER_CODE"),
+        @Index(columnList = "CHECK_TIME,CHECK_RESULT"),
+        @Index(columnList = "CHECK_TIME,WORK_CENTER_CODE,CHECK_RESULT"),
+        @Index(columnList = "WORK_ORDER_NO,SHIFT_CODE,WORK_TIME"),
+        @Index(columnList = "WORK_ORDER_NO,SHIFT_CODE,WORK_TIME,PACKAGE_NO")
+})
+@Api("出货检验单据主表")
+public class SxQmsOqcCheck extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -7607852127968032134L;
+
+    @Column(name = "OQC_NO")
+    @ApiParam("单据号")
+    private String oqcNo;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @Column(name = "WORK_ORDER_TYPE")
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @Column(
+            name = "QTY",
+            columnDefinition = "decimal(18,8)"
+    )
+    @ColumnDefault("0")
+    @ApiParam("计划数量")
+    private Double qty;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装条码")
+    private String packageNo;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "SN_TYPE")
+    @ApiParam("扫描条码类型:产品条码=10,包装条码=20")
+    private String snType;
+
+    @Column(name = "OQC_TYPE")
+    @ApiParam("检测方式")
+    private Integer oqcType;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(
+            name = "OQC_Qty",
+            columnDefinition = "decimal(18,8)"
+    )
+    @ColumnDefault("0")
+    @ApiParam("检测数量")
+    private Double oqcQty;
+
+    @Column(name = "WORK_TIME")
+    @ApiParam("生产日期")
+    private String workTime;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @Column(name = "DUTY_DIFF")
+    @ApiParam("原因区分")
+    private String dutyDiff;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @Column(name = "CHECK_USER")
+    @ApiParam("检验人")
+    private String checkUser;
+
+    @Column(name = "CHECK_TIME")
+    @ApiParam("检验时间")
+    private String checkTime;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    //----BU-----
+    @Column(name = "SPOT_CHECK_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam("抽检数量")
+    private Double spotCheckQty;
+
+    @Column(name = "OQC_NO_TYPE")
+    @ApiParam("检验单类型")
+    private Integer oqcNoType;
+
+    @Column(name = "CATEGORY_CODE3")
+    @ApiParam("产品类别")
+    private String categoryCode3;
+
+    @Column(name = "BADNESS_TYPE_CODE")
+    @ApiParam("不良类型代码")
+    private String badnessTypeCode;
+
+    @Column(name = "BADNESS_CLASSIFY_CODE")
+    @ApiParam("不良分类代码")
+    private String badnessClassifyCode;
+
+    @Column(name = "BADNESS_CLASSIFY_DETAIL_CODE")
+    @ApiParam("不良分类明细代码")
+    private String badnessClassifyDetailCode;
+
+    @Column(name = "BADNESS_CLASSIFY_DETAIL_NAME")
+    @ApiParam("不良分类明细名称")
+    private String badnessClassifyDetailName;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcCheckDetail.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcCheckDetail.java
new file mode 100644
index 0000000..765b9da
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcCheckDetail.java
@@ -0,0 +1,170 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/12/4 1:28 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_OQC_CHECK_DETAIL", indexes = {
+        @Index(columnList = "OQC_NO"),
+        @Index(columnList = "WORK_CENTER_CODE"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "WORK_TIME"),
+        @Index(columnList = "CHECK_TIME"),
+        @Index(columnList = "WORK_ORDER_NO"),
+        @Index(columnList = "WORK_ORDER_TYPE"),
+        @Index(columnList = "CHECK_TIME,PART_NO"),
+        @Index(columnList = "CHECK_TIME,WORK_CENTER_CODE"),
+        @Index(columnList = "WORK_TIME,PART_NO")
+})
+@Api("出货检验单据检测项明细表")
+public class SxQmsOqcCheckDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 812228919953610057L;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @Column(name = "WORK_ORDER_TYPE")
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @Column(name = "WORK_TIME")
+    @ApiParam("生产日期")
+    private String workTime;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @Column(
+            name = "SEQ",
+            columnDefinition = "decimal(18,8)"
+    )
+    @ColumnDefault("0")
+    @ApiParam("检验顺序")
+    private Double seq;
+
+    @Column(name = "OQC_NO")
+    @ApiParam("检验单号")
+    private String oqcNo;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装条码")
+    private String packageNo;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "PID")
+    @ApiParam("检验项目ID")
+    public Long pid;
+
+    @Column(name = "PROJECT_CODE")
+    @ApiParam("项目分类")
+    private String projectCode;
+
+    @Column(name = "CHECK_CONTENT")
+    @ApiParam("检查内容")
+    private String checkContent;
+
+    @Lob
+    @Column(name = "CHECK_ITEM")
+    @ApiParam("检查项目")
+    private String checkItem;
+
+    @Lob
+    @Column(name = "STANDARD")
+    @ApiParam("判定基准")
+    private String standard;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("判断方式")
+    private Integer checkType;
+
+    @Column(name = "STANDARD_VALUE")
+    @ApiParam("标准值")
+    private String standardValue;
+
+    @Column(name = "UP_LIMIT")
+    @ApiParam("上限值")
+    private String upLimit;
+
+    @Column(name = "DOWN_LIMT")
+    @ApiParam("下限值")
+    private String downLimit;
+
+    @Column(name = "CHECK_TOOL")
+    @ApiParam("检查器具")
+    private String checkTool;
+
+    @Column(name = "IS_NECESSARY")
+    @ApiParam("是否必检")
+    private Integer isNecessary;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name = "CHECK_VALUE")
+    @ApiParam("实际值")
+    private String checkValue;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @Column(name = "CHECK_USER")
+    @ApiParam("检验人")
+    private String checkUser;
+
+    @Column(name = "ITEM_CHECK_TIME")
+    @ApiParam("项目检验时间")
+    private String itemCheckTime;
+
+    @Column(name = "CHECK_TIME")
+    @ApiParam("单据检验时间")
+    private String checkTime;
+
+    @Column(name = "CONFIRM_USER")
+    @ApiParam("确认人")
+    private String confirmUser;
+
+    @Column(name = "CONFIRM_TIME")
+    @ApiParam("确认时间")
+    private String confirmTime;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcCheckPackageDetail.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcCheckPackageDetail.java
new file mode 100644
index 0000000..ec011f3
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcCheckPackageDetail.java
@@ -0,0 +1,97 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/12/4 1:28 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_OQC_CHECK_PACKAGE_DETAIL", indexes = {
+        @Index(columnList = "WORK_ORDER_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "OQC_NO"),
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PACKAGE_NO"),
+        @Index(columnList = "WORK_ORDER_NO, WORK_TIME"),
+        @Index(columnList = "WORK_ORDER_NO, WORK_TIME, SHIFT_CODE")
+})
+@Api("出货检验单据条码关联表")
+public class SxQmsOqcCheckPackageDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8372144807733785843L;
+
+    @Column(name = "OQC_NO")
+    @ApiParam("检验单号")
+    private String oqcNo;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "WORK_TIME")
+    @ApiParam("生产日期")
+    private String workTime;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @Column(name = "NOTE_CHECK_RESULT")
+    @ApiParam("停止指示书检验结果")
+    private Integer noteCheckResult;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name = "OQC_TYPE")
+    @ApiParam("检测方式")
+    private Integer oqcType;
+
+    @Column(name = "SYSTEM_SYNC_STATUS")
+    @ColumnDefault("2")
+    @ApiParam("系统同步标志")
+    public Integer systemSyncStatus = 2;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcCheckPackageDetailTravel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcCheckPackageDetailTravel.java
new file mode 100644
index 0000000..853ac31
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcCheckPackageDetailTravel.java
@@ -0,0 +1,88 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/12/4 1:28 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_OQC_CHECK_PACKAGE_DETAIL_TRAVEL", indexes = {
+        @Index(columnList = "WORK_ORDER_NO"),
+        @Index(columnList = "OQC_NO"),
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PACKAGE_NO")
+})
+@Api("出货检验单据条码关联履历表")
+public class SxQmsOqcCheckPackageDetailTravel extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -1684000769713743331L;
+
+    @Column(name = "OQC_NO")
+    @ApiParam("检验单号")
+    private String oqcNo;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @Column(name = "LAST_CHECK_RESULT")
+    @ApiParam("最终结果")
+    private Integer lastCheckResult;
+
+    @Column(name = "NOTE_CHECK_RESULT")
+    @ApiParam("停止指示书检验结果")
+    private Integer noteCheckResult;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name = "OQC_TYPE")
+    @ApiParam("检测方式")
+    private Integer oqcType;
+
+    @Column(name = "PID")
+    @ApiParam("出货检验单据条码关联表ID")
+    public Long pid;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcCheckPackageIf.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcCheckPackageIf.java
new file mode 100644
index 0000000..a52a329
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcCheckPackageIf.java
@@ -0,0 +1,102 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/12/4 1:28 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_OQC_CHECK_PACKAGE_IF", indexes = {
+        @Index(columnList = "WORK_ORDER_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "OQC_NO"),
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PACKAGE_NO"),
+        @Index(columnList = "WORK_ORDER_NO, WORK_TIME"),
+        @Index(columnList = "WORK_ORDER_NO, WORK_TIME, SHIFT_CODE"),
+        @Index(columnList = "WORK_ORDER_NO, SERIAL_NUMBER")
+})
+@Api("出货检验单据条码关联中间表")
+public class SxQmsOqcCheckPackageIf extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -7840456371114066101L;
+
+    @Column(name = "OQC_NO")
+    @ApiParam("检验单号")
+    private String oqcNo;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "WORK_TIME")
+    @ApiParam("生产日期")
+    private String workTime;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @Column(name = "LAST_CHECK_RESULT")
+    @ApiParam("最终结果")
+    private Integer lastCheckResult;
+
+    @Column(name = "NOTE_CHECK_RESULT")
+    @ApiParam("停止指示书检验结果")
+    private Integer noteCheckResult;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name = "OQC_TYPE")
+    @ApiParam("检测方式")
+    private Integer oqcType;
+
+    @Column(name = "SYSTEM_SYNC_STATUS")
+    @ColumnDefault("2")
+    @ApiParam("系统同步标志")
+    public Integer systemSyncStatus = 2;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcLastCheckIf.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcLastCheckIf.java
new file mode 100644
index 0000000..d86cbfd
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcLastCheckIf.java
@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author yumingxing
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SX_QMS_OQC_LAST_CHECK_IF")
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("出货检验批次同步表")
+public class SxQmsOqcLastCheckIf extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6026207342702290416L;
+
+    @Column(name = "WORK_TIME")
+    @ApiParam("批次代码")
+    private String workTime;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @Column(name = "PART_TYPE")
+    @ApiParam("物料分类 10=成品 20=组件")
+    private String partType;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam("检验结果 10:合格,20:不合格")
+    private Integer checkResult;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态 1:wms处理完成,2:默认")
+    private Integer syncStatus;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcRuleNote.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcRuleNote.java
new file mode 100644
index 0000000..be420ee
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcRuleNote.java
@@ -0,0 +1,65 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/12/4 1:28 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_OQC_RULE_NOTE", indexes = {
+        @Index(columnList = "PART_NO")
+})
+@Api("出货检验式样书表")
+public class SxQmsOqcRuleNote extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4676564294981232898L;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "CATEGORY_CODE")
+    @ApiParam("机种分类")
+    private String categoryCode;
+
+    @Column(name = "COMPLATE_DATE")
+    @ApiParam("作成日期")
+    private String complateDate;
+
+    @Column(name = "UPLOAD_DATE_TIME")
+    @ApiParam("上传时间")
+    private String uploadDatetime;
+
+    @Column(name = "FILE_ID")
+    @ApiParam("文件ID")
+    private Long fileId;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件源名")
+    private String fileOriginName;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("批次号")
+    private String lotNo;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcRuleNoteDetail.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcRuleNoteDetail.java
new file mode 100644
index 0000000..395d8a6
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcRuleNoteDetail.java
@@ -0,0 +1,104 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/12/4 1:28 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_OQC_RULE_NOTE_DETAIL", indexes = {
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "OQC_NO_TYPE, PART_NO"),
+        @Index(columnList = "OQC_NO_TYPE, CATEGORY_CODE3")
+})
+@Api("出货检验式样书明细表")
+public class SxQmsOqcRuleNoteDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3593060807538687545L;
+
+    @Column(
+            name = "SEQ",
+            columnDefinition = "decimal(18,8)"
+    )
+    @ColumnDefault("0")
+    @ApiParam("检验顺序")
+    private Double seq;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PROJECT_CODE")
+    @ApiParam("项目分类")
+    private String projectCode;
+
+    @Column(name = "CHECK_CONTENT")
+    @ApiParam("检查内容")
+    private String checkContent;
+
+    @Lob
+    @Column(name = "CHECK_ITEM")
+    @ApiParam("检查项目")
+    private String checkItem;
+
+    @Lob
+    @Column(name = "STANDARD")
+    @ApiParam("判定基准")
+    private String standard;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("判断方式")
+    private Integer checkType;
+
+    @Column(name = "STANDARD_VALUE")
+    @ApiParam("标准值")
+    private String standardValue;
+
+    @Column(name = "UP_LIMIT")
+    @ApiParam("上限值")
+    private String upLimit;
+
+    @Column(name = "DOWN_LIMT")
+    @ApiParam("下限值")
+    private String downLimit;
+
+    @Column(name = "CHECK_TOOL")
+    @ApiParam("检查器具")
+    private String checkTool;
+
+    @Column(name = "IS_NECESSARY")
+    @ApiParam("是否必检")
+    private Integer isNecessary;
+
+    //--------BU-----------------
+    @Column(name = "CATEGORY_CODE3")
+    @ApiParam("产品类别")
+    private String categoryCode3;
+
+    @Column(name = "OQC_NO_TYPE")
+    @ApiParam("检验单据类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.OQC_CHECK_TYPE.class, refForeignKey = "value", value = "description", hidden = true)
+    private Integer oqcNoType;
+
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcRuleNoteDetailTravel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcRuleNoteDetailTravel.java
new file mode 100644
index 0000000..da24187
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOqcRuleNoteDetailTravel.java
@@ -0,0 +1,103 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/12/4 1:28 下午
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_OQC_RULE_NOTE_DETAIL_TRAVEL", indexes = {
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "OQC_NO_TYPE, PART_NO"),
+        @Index(columnList = "OQC_NO_TYPE, CATEGORY_CODE3")
+})
+@Api("出货检验项目履历表")
+public class SxQmsOqcRuleNoteDetailTravel extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4708995612407160370L;
+    @Column(
+            name = "SEQ",
+            columnDefinition = "decimal(18,8)"
+    )
+    @ColumnDefault("0")
+    @ApiParam("检验顺序")
+    private Double seq;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PROJECT_CODE")
+    @ApiParam("项目分类")
+    private String projectCode;
+
+    @Column(name = "CHECK_CONTENT")
+    @ApiParam("检查内容")
+    private String checkContent;
+
+    @Lob
+    @Column(name = "CHECK_ITEM")
+    @ApiParam("检查项目")
+    private String checkItem;
+
+    @Lob
+    @Column(name = "STANDARD")
+    @ApiParam("判定基准")
+    private String standard;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("判断方式")
+    private Integer checkType;
+
+    @Column(name = "STANDARD_VALUE")
+    @ApiParam("标准值")
+    private String standardValue;
+
+    @Column(name = "UP_LIMIT")
+    @ApiParam("上限值")
+    private String upLimit;
+
+    @Column(name = "DOWN_LIMT")
+    @ApiParam("下限值")
+    private String downLimit;
+
+    @Column(name = "CHECK_TOOL")
+    @ApiParam("检查器具")
+    private String checkTool;
+
+    @Column(name = "IS_NECESSARY")
+    @ApiParam("是否必检")
+    private Integer isNecessary;
+
+    //--------BU-----------------
+    @Column(name = "CATEGORY_CODE3")
+    @ApiParam("产品类别")
+    private String categoryCode3;
+
+    @Column(name = "OQC_NO_TYPE")
+    @ApiParam("检验单据类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.OQC_CHECK_TYPE.class, refForeignKey = "value", value = "description", hidden = true)
+    private Integer oqcNoType;
+
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOutPutStatisticsOqc.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOutPutStatisticsOqc.java
new file mode 100644
index 0000000..483abc2
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsOutPutStatisticsOqc.java
@@ -0,0 +1,120 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate: 2019\11\15 10:12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_OUT_PUT_STATISTICS_OQC", indexes = {
+        @Index(columnList = "WORK_ORDER_NO,SHIFT_CODE,WORK_TIME"),
+        @Index(columnList = "WORK_ORDER_NO"),
+        @Index(columnList = "WORK_ORDER_TYPE"),
+        @Index(columnList = "WORK_CENTER_CODE"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "SHIFT_CODE"),
+        @Index(columnList = "WORK_TIME"),
+        @Index(columnList = "CHECK_RESULT"),
+        @Index(columnList = "PID")
+})
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("产量统计出货检验表")
+public class SxQmsOutPutStatisticsOqc extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3984479671043884695L;
+
+    @Column(name = "SYSTEM_SYNC_STATUS")
+    @ColumnDefault("2")
+    @ApiParam(value = "系统同步标志")
+    public Integer systemSyncStatus = 2;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线代码")
+    private String workCenterCode;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "WORK_TIME")
+    @ApiParam("作业时间")
+    private String workTime;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @Column(name = "WORK_ORDER_TYPE")
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+ 
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "PLAN_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam("工单计划数量")
+    private Double planQty;
+
+    @Column(name = "CHECK_LIMIT", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam("检测范围")
+    private Double checkLimit;
+
+    @Column(name = "CHECK_NO")
+    @ApiParam("总检测单号")
+    private String checkNo;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam("总检测结果")
+    private Integer checkResult;
+
+    @Column(name = "CHECK_USER")
+    @ApiParam("检测人员")
+    private String checkUser;
+
+    @Column(name = "CONFIRM_TIME")
+    @ApiParam("确认时间")
+    private String confirmTime;
+
+    @Column(name = "SPOT_CHECK_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam("抽检数量")
+    private Double spotCheckQty;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name = "PID")
+    @ApiParam("产量统计ID")
+    public Long pid;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsPart.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsPart.java
new file mode 100644
index 0000000..81f8b63
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsPart.java
@@ -0,0 +1,170 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * 文件描述
+ * qms物料信息
+ *
+ * @author puxiao.liao
+ * @date 2021年02月11日 9:59
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_PART",indexes = {@Index(columnList = "PART_NO")})
+@Api("QMS物料信息")
+public class SxQmsPart extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNameRdd;
+
+    @Column(name = "PART_TYPE")
+    @ApiParam("物料类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT,dataSrc = "WMS_PART_TYPE")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description")
+    private Integer partType;
+
+    @Column(name = "PART_EXT_MAINTAINED",columnDefinition = "int(11) default 2")
+    @ApiParam("是否维护品质属性")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer partExtMaintained;
+
+    @Column(name = "PRODUCT_TYPE")
+    @ApiParam("产品分类")
+    private String productType;
+
+
+    @ApiParam("机种编码")
+    @Column(name = "MACHINE_CODE")
+    private String machineCode;
+
+    @Column(name = "PRODUCT_STAGE")
+    @ApiParam("产品阶段")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PRODUCT_STAGE_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer productStage;
+
+    @Column(name = "PART_PRODUCT_TYPE")
+    @ApiParam("部品分类")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PART_PRODUCT_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer partProductType;
+
+    @Column(name = "NOTE_STATUS")
+    @ApiParam("式样书状态")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.NOTE_STATUS_TYPE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "NOTE_STATUS_TYPE")
+    private Integer noteStatus;
+
+    @Column(name = "IS_OQC")
+    @ApiParam("是否出货检")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true)
+    private Integer isOqc;
+
+    @Column(
+            name = "COLOR_CODE"
+    )
+    @ApiParam("颜色代码")
+    private String colorCode;
+    @Column(
+            name = "COLOR_NAME"
+    )
+    @ApiParam("颜色名称")
+    private String colorName;
+
+    @Column(
+            name = "PPT_CODE"
+    )
+    @ApiParam("产品类型代码")
+    private String pptCode;
+
+    @Column(
+            name = "CATEGORY_CODE1"
+    )
+    @ApiParam("分类1")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CATEGORY_CODE1.class, refForeignKey = "value", value = "description", hidden = true)
+    private String categoryCode1;
+    @Column(
+            name = "CATEGORY_CODE2"
+    )
+    @ApiParam("分类2")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CATEGORY_CODE2.class, refForeignKey = "value", value = "description", hidden = true)
+    private String categoryCode2;
+    @Column(
+            name = "CATEGORY_CODE3"
+    )
+    @ApiParam("分类3")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CATEGORY_CODE3.class, refForeignKey = "value", value = "description", hidden = true)
+    private String categoryCode3;
+
+    @Column(name = "GOODS_CODE")
+    @ApiParam("商品码")
+    private String goodsCode;
+
+    @Column(name = "SALES_TO")
+    @ApiParam("销售向")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.SALES_TO.class, refForeignKey = "value", value = "description", hidden = true)
+    private String salesTo;
+
+    @Column(name = "CAREER")
+    @ApiParam("事业别")
+    private String career;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检查区分")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.BU_PART_CHECK_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer checkType;
+
+    @Column(name = "TO_LAND")
+    @ApiParam("仕向地")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.SALES_TO.class, refForeignKey = "value", value = "description", hidden = true)
+    private String toLand;
+
+    @ApiParam("产品分类名称")
+    @Transient
+    private String productTypeName;
+
+    @ApiParam("部品分类名称")
+    @Transient
+    private String partProductTypeName;
+
+
+    public Integer getPartExtMaintained() {
+        if (partExtMaintained == null || QmsEnumUtil.TRUE_OR_FALSE.valueOf(partExtMaintained) == null) {
+            return QmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+        }
+        return partExtMaintained;
+    }
+
+    @Transient
+    @ApiParam("是否维护品质属性，查询参数")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer partExtMaintainedParam;
+
+    @Transient
+    @ApiParam("事业别名称")
+    private String careerName;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsPartExt.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsPartExt.java
new file mode 100644
index 0000000..2475265
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsPartExt.java
@@ -0,0 +1,149 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * 文件描述
+ * qms物料信息
+ *
+ * @author puxiao.liao
+ * @date 2021年02月11日 9:59
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_PART_EXT", indexes = {
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "IS_OQC"),
+        @Index(columnList = "PART_NO, IS_OQC")
+})
+@Api("QMS物料品质属性")
+public class SxQmsPartExt extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNameRdd;
+
+    @Column(name = "IQC")
+    @ApiParam("是否免检")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true)
+    private Integer iqc;
+
+    @Column(name = "IQC_COUNT",columnDefinition =  "int default 0")
+    @ApiParam("免检达成批次")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer iqcCount;
+
+    @Column(name = "IQC_PASS_COUNT",columnDefinition =  "int default 0")
+    @ApiParam("已免检达成批次")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer iqcPassCount;
+
+
+    public Integer getIqcPassCount(){
+        if(this.iqcPassCount == null) {
+            return 0;
+        }
+        return this.iqcPassCount;
+    }
+    /**
+     * 取产线信息表
+     */
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("生产线编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.ext.qms.pojo.bean.WmsWorkCenter",
+            searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode")
+    private String workCenterCode;
+
+    @ApiParam("机种编码")
+    @Column(name = "MACHINE_CODE")
+    private String machineCode;
+
+    @Column(name = "PART_TYPE")
+    @ApiParam("部品分类")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PART_PRODUCT_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer partType;
+
+    /**
+     * 取字典信息
+     */
+    @Column(name = "PRODUCT_TYPE")
+    @ApiParam("产品分类")
+/*
+    @AnnoOutputColumn(refClass = SysDictionary.class,refForeignKey = "PRODUCT_TYPE_DICTIONARY")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            isRequire = 2, dataSrc = "/qms/qms-enum/qms-enum/query?enumType=PRODUCT_TYPE_DICTIONARY", listColumnName = "enumValue", explicitColumnName = "enumValueDesc")
+*/
+    @AnnoOutputColumn(refClass = QmsEnumUtil.EP_PRODUCT_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer productType;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检查区分")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PART_CHECK_TYPE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "PART_CHECK_TYPE")
+    private Integer checkType;
+
+    @Column(name = "PRODUCT_STAGE")
+    @ApiParam("产品阶段")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PRODUCT_STAGE_TYPE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "PRODUCT_STAGE_TYPE")
+    private Integer productStage;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "SEND_ADDRESS")
+    @ApiParam("仕向地")
+    private String sendAddress;
+
+    @Column(name = "PURCHASER")
+    @ApiParam("购入方")
+    private String purchaser;
+
+
+    @Column(name = "NOTE_STATUS")
+    @ApiParam("式样书状态")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.NOTE_STATUS_TYPE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "NOTE_STATUS_TYPE")
+    private Integer noteStatus;
+
+
+    @Column(name = "IS_OQC")
+    @ApiParam("是否出货检")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true)
+    private Integer isOqc;
+
+    @Transient
+    @ApiParam("机种名称")
+    private String machineName;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsPartWorkCenter.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsPartWorkCenter.java
new file mode 100644
index 0000000..0a23f30
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsPartWorkCenter.java
@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 物料产线信息
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/17 14:31
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_PART_WORK_CENTER", indexes = {
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "WORK_CENTER_CODE")
+})
+@Api("QMS物料产线信息")
+public class SxQmsPartWorkCenter extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam("产线名称")
+    private String workCenterName;
+
+    public SxQmsPartWorkCenter (){}
+
+    public SxQmsPartWorkCenter(String partNo,
+                               String partName,
+                               String workCenterCode,
+                               String workCenterName,
+                               String organizeCode) {
+        this.partNo = partNo;
+        this.partName = partName;
+        this.workCenterCode = workCenterCode;
+        this.workCenterName = workCenterName;
+        this.organizeCode = organizeCode;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProcedureProject.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProcedureProject.java
new file mode 100644
index 0000000..aa29762
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProcedureProject.java
@@ -0,0 +1,69 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: Dominic
+ * @Date: 2022-05-27 10:53:53
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SX_QMS_PROCEDURE_PROJECT")
+@Api("质量巡检项目")
+public class SxQmsProcedureProject extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6743916346649297107L;
+
+    @Column(name = "PROJECT_SORT_NO")
+    @ApiParam(value = "项目分类代码")
+    private String projectSortNo;
+
+    @Column(name = "PROJECT_CODE")
+    @ApiParam(value = "项目代码")
+    public String projectCode;
+
+    @Column(name = "PROJECT_NAME")
+    @ApiParam(value = "项目名称")
+    public String projectName;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam(value = "巡检类型")
+    public Integer checkType;
+
+    @Transient
+    @ApiParam(value = "巡检类型描述")
+    public String checkTypeStr;
+
+    @Column(name = "STANDARD_VALUE")
+    @ApiParam(value = "标准值")
+    public String standardValue;
+
+    @Column(name = "MIN_VALUE")
+    @ApiParam(value = "下限值")
+    public String minValue;
+
+    @Column(name = "MAX_VALUE")
+    @ApiParam(value = "上限值")
+    public String maxValue;
+
+    @Column(name = "MEMO")
+    @ApiParam(value = "备注")
+    public String memo;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProductClassification.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProductClassification.java
new file mode 100644
index 0000000..74207d7
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProductClassification.java
@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.*;
+
+/**
+ * @description: 产品分类表
+ * @author: jiaqi.hou
+ * @date: 2022/04/25
+ */
+@Data
+@Entity
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_PRODUCT_CLASSIFICATION", indexes = {@Index(columnList = "PRODUCT_CODE,PRODUCT_NAME")})
+@Api("产品分类表")
+public class SxQmsProductClassification extends BaseBean {
+    @Column(name = "PRODUCT_CODE")
+    @ApiParam("产品代码")
+    private String productCode;
+
+    @Column(name = "PRODUCT_NAME")
+    @ApiParam("产品名称")
+    private String productName;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProductStopOrder.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProductStopOrder.java
new file mode 100644
index 0000000..e18c6c8
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProductStopOrder.java
@@ -0,0 +1,126 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_PRODUCT_STOP_ORDER")
+@Api("生产停止指令书")
+public class SxQmsProductStopOrder extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    private String orderNo;
+
+    @Column(name = "MANAGE_NO")
+    @ApiParam("管理NO")
+    private String manageNo;
+
+    @Column(name = "STANDARD")
+    @ApiParam("基准")
+    private String standard;
+
+    @Column(name = "PIECE_NAME")
+    @ApiParam("件名")
+    private String pieceName;
+
+    @Column(name = "REASON")
+    @ApiParam("理由")
+    private String reason;
+
+    @Column(name = "SUM_QTY")
+    @ApiParam("在库部品数量")
+    private Integer sumQty;
+
+    @Column(name = "ORDER_STATUS")
+    @ApiParam("状态")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.STOP_ORDER_STATUS.class)
+    private Integer orderStatus;
+
+    @Column(name = "DEAL_OPTION")
+    @ApiParam("在库部处置方法")
+    private String dealOption;
+
+    @Column(name = "HELF_PRODUCT_QTY")
+    @ApiParam("半成品数量")
+    private Double helfProductQty;
+
+    @Column(name = "HELF_DEAL_OPTION")
+    @ApiParam("半成品处置方法")
+    private String helfDealOption;
+
+    @Column(name = "PRODUCT_QTY")
+    @ApiParam("在库成品数量")
+    private Double productQty;
+
+    @Column(name = "PRODUCT_DEAL_OPTION")
+    @ApiParam("在库成品处置方法")
+    private String productDealOption;
+
+    @Column(name = "VENDOR_QTY")
+    @ApiParam("厂家库存数量")
+    private Double vendorQty;
+
+    @Column(name = "VENDOR_DEAL_OPTION")
+    @ApiParam("厂家库存处置方法")
+    private String vendorDealOption;
+
+    @Column(name = "IS_APPEND_CHANGE")
+    @ApiParam("是否追加变更")
+    private Integer isAppendChange;
+
+    @Column(name = "CHANGE_CONTENT_TYPE")
+    @ApiParam("变更内容")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PRODUCT_STOP_CHANGE_CONTENT.class)
+    private Integer changeContentType;
+
+    @Column(name = "REF_ORDER_NO")
+    @ApiParam("关联单号")
+    private String refOrderNo;
+
+    @Column(name = "PUBLISH_DATE")
+    @ApiParam("发行日期")
+    private String publishDate;
+
+    @Column(name = "MACHINE_CODE")
+    @ApiParam("机种编码")
+    private String machineCode;
+
+    @Column(name = "RELIEVE_DATE")
+    @ApiParam("解除日期")
+    private String relieveDate;
+
+    @Column(name = "RELIEVE_REASON")
+    @ApiParam("解除理由")
+    private String relieveReason;
+
+    @Column(name = "RELIEVE_USER_NAME")
+    @ApiParam("解除人")
+    private String relieveUserName;
+
+    @Column(name = "RELIEVE_TIME")
+    @ApiParam("解除时间")
+    private String relieveTime;
+
+    @Transient
+    @ApiParam("查询参数，起始发行日期")
+    private String publishDateStart;
+
+    @Transient
+    @ApiParam("查询参数，结束发行日期")
+    private String publishDateEnd;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProjectInspectionDetails.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProjectInspectionDetails.java
new file mode 100644
index 0000000..b8f9b27
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProjectInspectionDetails.java
@@ -0,0 +1,67 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.annotation.EntityColumn;
+import cn.estsh.i3plus.pojo.qms.annotation.ExcelColumn;
+import cn.estsh.i3plus.pojo.qms.annotation.ExcelTable;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_PROJECT_INSPECTION_DETAILS",indexes = {@Index(columnList = "INSPECTION_NO")})
+@Api("工程巡查任务维护明细")
+@ExcelTable(onlyReadLabel = false)
+public class SxQmsProjectInspectionDetails extends BaseBean {
+
+    @EntityColumn(isRequired = true,isPrimary = true)
+    @Column(name = "INSPECTION_NO")
+    @ApiParam("巡检单号")
+    private String inspectionNo;
+
+    @EntityColumn(isRequired = true,isPrimary = true)
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ExcelColumn(customLogicGet = true,customLogicGetCommon = true)
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @EntityColumn(isRequired = true,isPrimary = true)
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检测类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CHECK_JUDGE_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer checkType;
+
+    @Column(name = "STANDARD_VALUE")
+    @ApiParam("标准值")
+    private String standardValue;
+
+    @Column(name = "MAX_VALUE")
+    @ApiParam("最大值")
+    private Double maxValue;
+
+    @Column(name = "MIN_VALUE")
+    @ApiParam("最小值")
+    private Double minValue;
+
+    @Column(name = "IS_NECESSARY",columnDefinition = "int(11) default 1")
+    @ApiParam("是否必检")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isNecessary;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProjectInspectionMaster.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProjectInspectionMaster.java
new file mode 100644
index 0000000..88639a0
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProjectInspectionMaster.java
@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.annotation.EntityColumn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_PROJECT_INSPECTION_MASTER",indexes = {@Index(columnList = "INSPECTION_NO")})
+@Api("工程巡查任务维护")
+public class SxQmsProjectInspectionMaster extends BaseBean {
+
+    @EntityColumn(isPrimary = true)
+    @Column(name = "INSPECTION_NO")
+    @ApiParam("巡检项编码")
+    private String inspectionNo;
+
+    @EntityColumn(isRequired = true)
+    @Column(name = "INSPECTION_NAME")
+    @ApiParam("巡检项名称")
+    private String inspectionName;
+
+    @EntityColumn()
+    @Column(name = "INSPECTION_DESC")
+    @ApiParam("巡检项描述")
+    private String inspectionDesc;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name = "FILE_ORIGINAL_NAME")
+    @ApiParam("原始文件名称")
+    private String fileOriginalName;
+
+    @Column(name = "FILE_PATH")
+    @ApiParam("文件路径")
+    private String filePath;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProjectInspectionSnRecord.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProjectInspectionSnRecord.java
new file mode 100644
index 0000000..b01443d
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProjectInspectionSnRecord.java
@@ -0,0 +1,151 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_PROJECT_INSPECTION_SN_RECORD",indexes = {@Index(columnList = "INSPECTION_NO")})
+@Api("工程巡检条码检测记录")
+public class SxQmsProjectInspectionSnRecord extends BaseBean {
+
+    @Column(name = "TASK_NO")
+    @ApiParam("任务编码")
+    private String taskNo;
+
+    @Column(name = "INSPECTION_NO")
+    @ApiParam("巡查项单号")
+    private String inspectionNo;
+
+    @Column(name = "INSPECTION_NAME")
+    @ApiParam("巡查项名称")
+    private String inspectionName;
+
+    @Column(name = "SN")
+    @ApiParam("包装条码")
+    private String sn;
+
+    @Column(name = "WORK_CENTER")
+    @ApiParam("生产线编码")
+    private String workCenter;
+
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam("生产线名称")
+    private String workCenterName;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "DATE_CODE")
+    @ApiParam("生产日期")
+    private String dateCode;
+
+    @Column(name = "RECORD_RESULT")
+    @ApiParam("结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QMS_OQC_CHECK_DETAIL_RESULT.class, refForeignKey = "value", value = "description")
+    private Integer recordResult;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检测类型")
+    private Integer checkType;
+
+    @Column(name = "ACTUAL_VALUE")
+    @ApiParam("实测值")
+    private String actualValue;
+
+    /**比值类型 可能为字符串**/
+    @Column(name = "STANDARD_VALUE")
+    @ApiParam("标准值")
+    private String standardValue;
+
+    @Column(name = "MAX_VALUE")
+    @ApiParam("最大值")
+    private Double maxValue;
+
+    @Column(name = "MIN_VALUE")
+    @ApiParam("最小值")
+    private Double minValue;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name = "IS_NECESSARY")
+    @ApiParam("是否必检")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isNecessary;
+
+    @Transient
+    @ApiParam("单据状态")
+    private Integer orderStatus;
+
+    @Transient
+    @ApiParam("总结果")
+    private Integer taskRecordResult;
+
+    @Transient
+    @ApiParam(value = "开始时间")
+    private String createDatetimeStart;
+
+    @Transient
+    @ApiParam(value = "结束时间")
+    private String createDatetimeEnd;
+
+
+
+    public SxQmsProjectInspectionSnRecord(){}
+
+    public SxQmsProjectInspectionSnRecord(
+           String inspectionNo,
+           String taskNo,
+           String sn,
+           Integer taskRecordResult,
+           Integer orderStatus,
+           String partNo,
+           String partNameRdd,
+           Integer checkType,
+           String actualValue,
+           Integer recordResult,
+           String createDatetime,
+           String createUser
+    ){
+        this.inspectionNo = inspectionNo;
+        this.taskNo = taskNo;
+        this.sn = sn;
+        this.taskRecordResult = taskRecordResult;
+        this.orderStatus = orderStatus;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.checkType = checkType;
+        this.actualValue = actualValue;
+        this.recordResult = recordResult;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProjectInspectionTask.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProjectInspectionTask.java
new file mode 100644
index 0000000..a69c751
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProjectInspectionTask.java
@@ -0,0 +1,86 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_PROJECT_INSPECTION_TASK",indexes = {@Index(columnList = "INSPECTION_NO")})
+@Api("工程巡查任务主表")
+public class SxQmsProjectInspectionTask extends BaseBean {
+
+    @Column(name = "TASK_NO")
+    @ApiParam("任务编码")
+    private String taskNo;
+
+    @Column(name = "INSPECTION_NO")
+    @ApiParam("巡查项单号")
+    private String inspectionNo;
+
+    @Column(name = "INSPECTION_NAME")
+    @ApiParam("巡查项名称")
+    private String inspectionName;
+
+    @Column(name = "AREA_CODE")
+    @ApiParam("区域编码")
+    private String areaCode;
+
+    /*@Column(name = "AREA_NAME")
+    @ApiParam("区域名称")
+    private String areaName;*/
+
+    @Column(name = "WORK_CENTER")
+    @ApiParam("生产线编码")
+    private String workCenter;
+
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam("生产线名称")
+    private String workCenterName;
+
+    @Column(name = "ORDER_STATUS")
+    @ApiParam("单据状态")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PROJECT_INSPECTION_TASK_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer orderStatus;
+
+    @Column(name = "ORDER_RESULT")
+    @ApiParam("单据结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QMS_OQC_CHECK_DETAIL_RESULT.class, refForeignKey = "value", value = "description")
+    private Integer orderResult;
+
+    @Column(name = "TASK_DESC")
+    @ApiParam("任务描述")
+    private String taskDesc;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name = "FILE_ORIGINAL_NAME")
+    @ApiParam("原始文件名称")
+    private String fileOriginalName;
+
+    @Column(name = "FILE_PATH")
+    @ApiParam("文件路径")
+    private String filePath;
+
+    @Transient
+    @ApiParam(value = "开始时间")
+    private String createDatetimeStart;
+
+    @Transient
+    @ApiParam(value = "结束时间")
+    private String createDatetimeEnd;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProjectSort.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProjectSort.java
new file mode 100644
index 0000000..49478d0
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProjectSort.java
@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: xiangming.liao
+ * @Date: 2021/01/14 20:03
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SX_QMS_PROJECT_SORT")
+@Api("质量巡检项目分类")
+public class SxQmsProjectSort extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6446419118892163872L;
+
+    @Column(name = "PROJECT_SORT_NO")
+    @ApiParam(value = "项目分类代码")
+    private String projectSortNo;
+
+    @Column(name = "PROJECT_SORT_NAME")
+    @ApiParam(value = "项目分类名称")
+    public String projectSortName;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProjectType.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProjectType.java
new file mode 100644
index 0000000..ef2d136
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsProjectType.java
@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * 文件描述
+ * 出货检验项目类型 & 受检项目类型
+ *
+ * @author puxiao.liao
+ * @date 2021年02月11日 9:59
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_PROJECT_TYPE", indexes = {
+        @Index(columnList = "PROJECT_CODE, MODULE")
+})
+@Api("检验项目类型")
+public class SxQmsProjectType extends BaseBean {
+
+    @Column(name = "PROJECT_CODE")
+    @ApiParam("项目类型编码")
+    private String projectCode;
+
+    @Column(name = "PROJECT_NAME")
+    @ApiParam("项目类型名称")
+    private String projectName;
+
+    @Column(name = "MODULE")
+    @ApiParam("所属模块")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PROJECT_TYPE_MODULE.class, refForeignKey = "value", value = "description")
+    private Integer module;
+}
+
+
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQCDetails.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQCDetails.java
new file mode 100644
index 0000000..d43df24
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQCDetails.java
@@ -0,0 +1,238 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 质检单明细信息
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2022-03-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_QC_DETAILS",indexes = {@Index(columnList = "ORDER_NO,PART_NO,VENDOR_NO")})
+@Api("质检单明细信息")
+public class SxQmsQCDetails extends BaseBean {
+    private static final long serialVersionUID = 7442224593652923072L;
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    private String item;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
+    @ColumnDefault("0")
+    @ApiParam(value = "数量", example = "0")
+    private Double qty;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    private String unit;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("订单号")
+    private String orderNo;
+
+    /**
+     * 状态:N=正常,C=行取消
+     */
+    @Column(name = "ITEM_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.QC_ITEM_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer itemStatus;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+
+    @Column(name = "FACT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
+    @ColumnDefault("0")
+    @ApiParam(value = "实检数量", example = "0")
+    private Double factQty;
+
+    @Column(name = "PASS_QTY", columnDefinition = "decimal(18,8)", nullable = false)
+    @ColumnDefault("0")
+    @ApiParam(value = "合格数量", example = "0")
+    private Double passQty;
+
+    @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
+    @ColumnDefault("0")
+    @ApiParam(value = "不合格数量", example = "0")
+    private Double rejectQty;
+
+    @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)", nullable = false)
+    @ColumnDefault("0")
+    @ApiParam(value = "收货数量", example = "0")
+    private Double rcQty;
+
+    @Version
+    @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
+    @ApiParam(value = "乐观锁", example = "1")
+    private transient Integer lockVersion;
+
+    /************报表查询字段*****************/
+    @Column(name = "PART_TYPE")
+    @ApiParam("部品分类")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PART_PRODUCT_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer partType;
+
+
+    @Column(name = "PRODUCT_TYPE")
+    @ApiParam("产品分类")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.EP_PRODUCT_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer productType;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("生产线编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.ext.qms.pojo.bean.WmsWorkCenter",
+            searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode")
+    private String workCenterCode;
+
+
+    @Column(name = "PART_CHECK_TYPE")
+    @ApiParam("检查区分")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PART_CHECK_TYPE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "PART_CHECK_TYPE")
+    private Integer partCheckType;
+
+
+    @Column(name = "VENDOR_DESC")
+    @ApiParam(value = "供应商全称")
+    private String vendorDesc;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编号")
+    public String vendorNo;
+
+    @Transient
+    @ApiParam(value = "单据状态")
+    private Integer orderStatus;
+
+
+    @Transient
+    @ApiParam(value = "开始时间")
+    private String createDatetimeStart;
+
+    @Transient
+    @ApiParam(value = "结束时间")
+    private String createDatetimeEnd;
+
+
+    @Transient
+    @ApiParam(value = "关联单号")
+    private String refSrc;
+
+    private Integer qcStatus;
+
+    @ApiParam(value = "单据数量")
+    private Double poQty;
+    public SxQmsQCDetails() {
+    }
+
+
+    public SxQmsQCDetails(String orderNo,
+                          String vendorNo,
+                          String vendorDesc,
+                          String partNo,
+                          String partNameRdd,
+                          Double qty,
+                          String refSrc,
+                          Double poQty,
+                          Integer qcStatus,
+                          Integer orderStatus,
+                          Integer partType,
+                          Integer partCheckType) {
+        this.orderNo = orderNo;
+        this.vendorNo = vendorNo;
+        this.vendorDesc = vendorDesc;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.refSrc = refSrc;
+        this.poQty = poQty;
+        this.qcStatus = qcStatus;
+        this.orderStatus = orderStatus;
+        this.partType=partType;
+        this.partCheckType = partCheckType;
+    }
+
+    //qc_master.orderNo,qc_master.vendorNo,qc_master.vendorDesc,qc_detail.partNo,
+    // qc_detail.partNameRdd,qc_detail.qty,qc_master.refSrc,qc_master.poQty,
+    // qc_master.qcStatus,qc_master.orderStatus,qc_detail.partType,qc_detail.partCheckType
+
+    public SxQmsQCDetails(String organizeCode, String partNo, String partNameRdd, String item,
+                          Double qty, String unit, String orderNo,
+                          Integer itemStatus, String remark, Double factQty,
+                          Double passQty, Double rejectQty,
+                          Integer orderStatus, String vendorNo, String vendorDesc,
+                          String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.item = item;
+        this.qty = qty;
+        this.unit = unit;
+        this.orderNo = orderNo;
+        this.itemStatus = itemStatus;
+        this.remark = remark;
+        this.factQty = factQty;
+        this.passQty = passQty;
+        this.rejectQty = rejectQty;
+        this.orderStatus = orderStatus;
+        this.vendorNo = vendorNo;
+        this.vendorDesc = vendorDesc;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
+
+    public SxQmsQCDetails(String partNo, String partNameRdd, String item,
+                          Double qty, String unit, String orderNo,
+                          Integer itemStatus, String remark, Double factQty,
+                          Double passQty, Double rejectQty,
+                          Integer orderStatus, String vendorNo, String vendorDesc) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.item = item;
+        this.qty = qty;
+        this.unit = unit;
+        this.orderNo = orderNo;
+        this.itemStatus = itemStatus;
+        this.remark = remark;
+        this.factQty = factQty;
+        this.passQty = passQty;
+        this.rejectQty = rejectQty;
+        this.orderStatus = orderStatus;
+        this.vendorNo = vendorNo;
+        this.vendorDesc = vendorDesc;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQCMaster.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQCMaster.java
new file mode 100644
index 0000000..57c1350
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQCMaster.java
@@ -0,0 +1,439 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * 收货校验结果
+ *
+ * @author puxiao.liao
+ * @date 2022年03月06日 17:21
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_QC_MASTER",indexes =
+        {@Index(columnList = "ORDER_NO"),
+                @Index(columnList = "VENDOR_NO"),
+                @Index(columnList = "DATE_CODE"),}
+        )
+@Api("收货校验单")
+public class SxQmsQCMaster extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    private String orderNo;
+
+    @Column(name = "PO_QTY")
+    @ApiParam("PO数量")
+    private Double poQty;
+
+    @Column(name = "REF_SRC")
+    @ApiParam("关联单号")
+    private String refSrc;
+
+    @Column(name = "ERP_SRC_NO")
+    @ApiParam("ERP单号")
+    public String erpSrcNo;
+
+    @Column(name = "QTY")
+    @ApiParam("质检数量")
+    private Integer qty;
+
+    @Column(name = "CUST_NAME")
+    @ApiParam(value = "客户简称")
+    private String custName;
+
+    @Column(name = "CUST_NO")
+    @ApiParam("客户编号")
+    public String custNo;
+
+    @Column(name = "VENDOR_DESC")
+    @ApiParam(value = "供应商全称")
+    private String vendorDesc;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编号")
+    public String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam(value = "供应商名称")
+    private String vendorName;
+
+    @Column(name = "GLOBAL_VENDOR_NAME")
+    @ApiParam(value = "全球供应商名称")
+    private String globalVendorName;
+
+    @Column(name = "IS_TASK")
+    @ApiParam(value = "是否生产任务", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "IS_GENERAL_TASK")
+    public Integer isTask;
+
+    @Column(name = "IS_PART")
+    @ApiParam(value = "是否散件", example = "2")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
+    public Integer isPart;
+
+    /**
+     * 业务类型:IQC=进料检验,IPQC=在线检验,
+     * FQC=成品检验,OQC=出货检验
+     */
+    @Column(name = "ORDER_TYPE")
+    @ApiParam(value = "业务类型", example = "0")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_INFO_TYPE.class, refForeignKey = "value", value = "description")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "QC_INFO_TYPE")
+    public Integer orderType;
+
+    @Column(name = "QC_MODE")
+    @ApiParam("结果类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_MODE_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer qcMode;
+
+    @Column(name = "ORDER_STATUS")
+    @ApiParam("单据状态")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_INFO_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer orderStatus;
+
+    @Column(name = "QC_STATUS")
+    @ApiParam("检测结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer qcStatus;
+
+    @Column(name = "VERSION")
+    @ApiParam(value = "版本", example = "1")
+    public Integer version;
+
+    @Column(name = "REF_TYPE")
+    @ApiParam("关联单号类型")
+    public String refType;
+
+    @Column(name = "SUGGESTION")
+    @ApiParam("处理意见")
+    private String suggestion;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Column(name = "COST_TIME")
+    @ApiParam("质检用时")
+    private Integer costTime;
+
+    @Column(name = "QC_START_DATE_TIME")
+    @ApiParam("质检开始时间")
+    private String qcStartDateTime;
+
+    @Column(name = "QC_END_DATE_TIME")
+    @ApiParam("质检结束时间")
+    private String qcEndDateTime;
+
+    @Column(name = "CHECK_DATE")
+    @ApiParam("检查日期")
+    private String checkDate;
+
+    @Column(name = "DATE_CODE")
+    @ApiParam("生产日期")
+    private String dateCode;
+
+    @Column(name = "RC_DATE")
+    @ApiParam("收货日期")
+    private String rcDate;
+
+    @Column(name = "QUALITY_USER")
+    @ApiParam("品质担当")
+    private String qualityUser;
+
+
+    @ApiParam("同步状态")
+    @Column(name = "IS_SYNC",columnDefinition = "int default 2")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.IF_SYNC_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer isSync;
+
+    @ApiParam("出厂报告URL")
+    @Column(name = "REPORT_URL")
+    private Integer reportUrl;
+
+    @ApiParam("出厂报告")
+    @Column(name = "REPORT_FILE_NAME")
+    private Integer reportFileName;
+
+
+    @ApiParam("错误信息")
+    @Column(name = "SYNC_ERROR_MSG")
+    private String syncErrorMsg;
+
+    @Transient
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Transient
+    @ApiParam("机种编码")
+    private String machineCode;
+
+    @Transient
+    @ApiParam(value = "收货数量", example = "0")
+    private Double rcQty;
+
+    @ApiParam("检验类型")
+    @Column(name = "TEST_TYPE")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TEST_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer testType;
+
+    @Column(name = "ITEM_TYPE")
+    @ApiParam("单据类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ITEM_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer itemType;
+
+    @Column(name = "SOURCE_ORDER_NO")
+    @ApiParam("源单号")
+    private String sourceOrderNo;
+
+    @Transient
+    @ApiParam("事业别")
+    private String career;
+
+    @Transient
+    @ApiParam(value = "合格数量", example = "0")
+    private Integer passQty;
+
+    @Transient
+    @ApiParam(value = "不合格数量", example = "0")
+    private Integer failQty;
+
+    @Transient
+    @ApiParam(value = "特采数量", example = "0")
+    private Integer specialQty;
+
+    @Transient
+    @ApiParam(value = "已质检数量", example = "0")
+    private Integer qcQty;
+
+    @Transient
+    @ApiParam("部品分类")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PART_PRODUCT_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer partType;
+
+    @Transient
+    @ApiParam("产品分类")
+    private String productType;
+
+    @ApiParam(value = "同一PO单截至目前的收货数量", example = "0")
+    @Column(name = "PO_RC_QTY", columnDefinition = "decimal(18,8)", nullable = false)
+    @ColumnDefault("0")
+    private Double poRcQty;
+
+    @ApiParam(value = "模块")
+    @Column(name = "MODULE")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.SX_QMS_RC_RULE_NOTE_MODULE.class, refForeignKey = "value", value = "description")
+    private Integer module;
+
+    @ApiParam(value = "标识是ODM受入还是部品受入QMS创建的质检单 -- YES = ODM")
+    @Column(name = "IS_QC")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.IS_EXISTS.class, refForeignKey = "value", value = "description")
+    private Integer isQc;
+
+    @Column(name = "QC_STATUS_RESULT")
+    @ApiParam("检测总结果 ODM用")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer qcStatusResult;
+
+    @Column(name = "IS_ABNORMAL_HANDLE")
+    @ApiParam("是否异常处置")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isAbnormalHandle;
+
+    @Column(name = "IQC")
+    @ApiParam("是否免检")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true)
+    @ColumnDefault(value = "2")
+    private Integer iqc;
+
+    @ApiParam("条码")
+    @Transient
+    private String sn;
+
+    @ApiParam("检验项目")
+    @Transient
+    private String checkItem;
+
+    @ApiParam("判定基准")
+    @Transient
+    private String standardOfCriterion;
+
+    @ApiParam("上限值")
+    @Transient
+    private String upLimit;
+
+    @ApiParam("下限值")
+    @Transient
+    private String downLimit;
+
+    @ApiParam("测定器具")
+    @Transient
+    private String checkTool;
+
+    @ApiParam("实测1")
+    @Transient
+    private String actualValue1;
+
+    @ApiParam("判定结果")
+    @Transient
+    private Integer checkResult;
+
+    @ApiParam("标准值")
+    @Transient
+    private String standard;
+
+    @ApiParam("值类型")
+    @Transient
+    private Integer checkType;
+
+    @Column(name = "SYNC_USER")
+    @ApiParam("同步用户")
+    public String syncUser;
+
+    @Column(name = "SYNC_DATE_TIME")
+    @ApiParam("同步日期")
+    public String syncDatetime;
+
+    public SxQmsQCMaster() {}
+
+    public SxQmsQCMaster(String orderNo, Integer costTime) {
+        this.orderNo = orderNo;
+        this.costTime = costTime;
+    }
+    public SxQmsQCMaster(String vendorNo, String vendorDesc, Integer qty) {
+        this.vendorNo = vendorNo;
+        this.vendorDesc = vendorDesc;
+        this.qty = qty;
+    }
+
+    public SxQmsQCMaster(Integer orderStatus, Integer qcStatus, String career) {
+        this.orderStatus = orderStatus;
+        this.qcStatus = qcStatus;
+        this.career = career;
+    }
+
+    public SxQmsQCMaster(String orderNo, String partNo, String partNameRdd, String vendorName, Integer orderStatus, String qcStartDateTime, String createDatetime) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.vendorName = vendorName;
+        this.orderStatus = orderStatus;
+        this.qcStartDateTime = qcStartDateTime;
+        this.createDatetime = createDatetime;
+    }
+
+    public SxQmsQCMaster(String vendorName, Integer qcStatus, String createDatetime, Integer orderStatus) {
+        this.vendorName = vendorName;
+        this.createDatetime = createDatetime;
+        this.qcStatus = qcStatus;
+        this.orderStatus = orderStatus;
+    }
+
+    public SxQmsQCMaster(String checkDate, String orderNo, String refSrc, String vendorNo, String vendorDesc, Integer testType,
+                         Integer qcStatus, String rcDate, String dateCode, String partNo, String partNameRdd, String productType, Double rcQty) {
+        this.checkDate = checkDate;
+        this.orderNo = orderNo;
+        this.refSrc = refSrc;
+        this.vendorNo = vendorNo;
+        this.vendorDesc = vendorDesc;
+        this.testType = testType;
+        this.qcStatus = qcStatus;
+        this.rcDate = rcDate;
+        this.dateCode = dateCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.productType = productType;
+        this.rcQty = rcQty;
+    }
+
+    public SxQmsQCMaster(String vendorNo, String partNo, String checkDate) {
+        this.vendorNo = vendorNo;
+        this.partNo = partNo;
+        this.checkDate = checkDate;
+    }
+
+    public SxQmsQCMaster(Integer qcStatus, Integer qcMode, Integer orderStatus) {
+        this.qcStatus = qcStatus;
+        this.qcMode = qcMode;
+        this.orderStatus = orderStatus;
+    }
+
+    public SxQmsQCMaster(String orderNo, Integer qcStatus, Integer qcMode, Integer orderStatus) {
+        this.orderNo = orderNo;
+        this.qcStatus = qcStatus;
+        this.qcMode = qcMode;
+        this.orderStatus = orderStatus;
+    }
+
+    public SxQmsQCMaster(String orderNo, String partNo, String partNameRdd, String rcDate, double qty, Integer qcStatusResult) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.rcDate = rcDate;
+        this.qty = (int) qty;
+        this.qcStatusResult = qcStatusResult;
+    }
+
+    public SxQmsQCMaster(String orderNo, String partNo, String partNameRdd, String rcDate, double qty, Integer qcStatusResult, Integer iqc, String modifyUser) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.rcDate = rcDate;
+        this.qty = (int) qty;
+        this.qcStatusResult = qcStatusResult;
+        this.iqc = iqc;
+        this.modifyUser = modifyUser;
+    }
+
+    public SxQmsQCMaster(String orderNo, String refSrc, String partNo, String partNameRdd, String vendorNo, String vendorName,
+                         String sn, Integer itemType, String rcDate, String modifyUser, Integer qcStatus, String qcEndDateTime,
+                         String checkItem, String standardOfCriterion, String upLimit, String downLimit, String checkTool, String actualValue1,
+                         Integer checkResult, String remark, String standard, Integer checkType) {
+        this.orderNo = orderNo;
+        this.refSrc = refSrc;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.sn = sn;
+        this.itemType = itemType;
+        this.rcDate = rcDate;
+        this.modifyUser = modifyUser;
+        this.qcStatus = qcStatus;
+        this.qcEndDateTime = qcEndDateTime;
+        this.checkItem = checkItem;
+        this.standardOfCriterion = standardOfCriterion;
+        this.upLimit = upLimit;
+        this.downLimit = downLimit;
+        this.checkTool = checkTool;
+        this.actualValue1 = actualValue1;
+        this.checkResult = checkResult;
+        this.remark = remark;
+        this.standard = standard;
+        this.checkType = checkType;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQCSn.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQCSn.java
new file mode 100644
index 0000000..aa64623
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQCSn.java
@@ -0,0 +1,134 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.util.List;
+
+/**
+ * @Description : 质检单条码信息
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-19 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_QC_SN",indexes = {@Index(columnList = "ORDER_NO,SN")})
+@Api("收货条码检测记录")
+public class SxQmsQCSn extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name="ITEM")
+    @ApiParam("行号")
+    public String item;
+
+    /**
+     * 状态:1=创建,10=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    public Integer itemStatus;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    public String remark;
+
+    @Column(name="PASS_QTY", nullable = false)
+    @ApiParam("合格数量")
+    @ColumnDefault("0")
+    public double passQty;
+
+    @Column(name="REJECT_QTY", nullable = false)
+    @ApiParam("不合格数量")
+    @ColumnDefault("0")
+    public double rejectQty;
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name="SN")
+    @ApiParam("条码")
+    public String sn;
+
+    @Column(name = "QC_USER")
+    @ApiParam("检验员")
+    public String qcUser;
+
+    @Column(name = "QC_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00")
+    public String qcTime;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    public String vendorNo;
+
+    @Column(name = "DATE_CODE")
+    @ApiParam("供应商批次")
+    public String dateCode;
+
+    @Column(name = "QC_STATUS", columnDefinition = "int default 0")
+    @ApiParam("处理结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_SN_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer qcStatus;
+
+
+    @Column(name="SPECIAL_ORDER_NO")
+    @ApiParam("特采单号")
+    public String specialOrderNo;
+
+
+    @ApiParam(value = "抽检数量")
+    private Double checkQty;
+
+    @Transient
+    @ApiParam("检测数量")
+    private Double actQty;
+
+    @Transient
+    @ApiParam("单号集合")
+    private List<String> orderNoLst;
+
+    @Transient
+    @ApiParam("ERP单号")
+    public String erpSrcNo;
+
+
+
+
+
+    public SxQmsQCSn() {
+    }
+
+    public SxQmsQCSn(String orderNo, double passQty) {
+        this.orderNo = orderNo;
+        this.passQty = passQty;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQCTransDetails.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQCTransDetails.java
new file mode 100644
index 0000000..3054d96
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQCTransDetails.java
@@ -0,0 +1,273 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_QC_TRANS_DETAILS",indexes = {@Index(columnList = "ORDER_NO")})
+@Api("收货检测记录结果值")
+public class SxQmsQCTransDetails extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    private String orderNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "PROJECT_CODE")
+    @ApiParam("项目类型")
+    private String projectCode;
+
+    @Column(name = "PROJECT_NAME")
+    @ApiParam("项目类型")
+    private String projectName;
+
+    @Column(name = "CHECK_CONTENT")
+    @ApiParam("项目规格")
+    private String checkContent;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检测类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CHECK_JUDGE_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer checkType;
+
+    @Column(name = "STANDARD_VALUE")
+    @ApiParam("标准值")
+    private String standardValue;
+
+    @Column(name = "STANDARD",columnDefinition = "longtext")
+    @ApiParam("判定基准")
+    private String standard;
+
+    @Column(name = "ACTUAL_VALUE1")
+    @ApiParam("实1")
+    private String actualValue1;
+
+    @Column(name = "ACTUAL_VALUE2")
+    @ApiParam("实2")
+    private String actualValue2;
+
+    @Column(name = "ACTUAL_VALUE3")
+    @ApiParam("实3")
+    private String actualValue3;
+
+    @Column(name = "ACTUAL_VALUE4")
+    @ApiParam("实4")
+    private String actualValue4;
+
+    @Column(name = "ACTUAL_VALUE5")
+    @ApiParam("实5")
+    private String actualValue5;
+
+    @Column(name = "ACTUAL_VALUE6")
+    @ApiParam("实6")
+    private String actualValue6;
+
+    @Column(name = "ACTUAL_VALUE7")
+    @ApiParam("实7")
+    private String actualValue7;
+
+    @Column(name = "ACTUAL_VALUE8")
+    @ApiParam("实8")
+    private String actualValue8;
+
+    @Column(name = "ACTUAL_VALUE9")
+    @ApiParam("实9")
+    private String actualValue9;
+
+    @Column(name = "ACTUAL_VALUE10")
+    @ApiParam("实10")
+    private String actualValue10;
+
+    @Column(name = "UP_LIMIT")
+    @ApiParam("最大值")
+    private String upLimit;
+
+    @Column(name = "DOWN_LIMIT")
+    @ApiParam("最小值")
+    private String downLimit;
+
+    @Column(name = "CHECK_TOOL")
+    @ApiParam("测定器")
+    private String checkTool;
+
+    @Column(name = "UPLOAD_DATE_TIME")
+    @ApiParam("上传时间")
+    private String uploadDateTime;
+
+    @Column(name = "FILE_ID")
+    @ApiParam("文件ID")
+    private String fileId;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件源名")
+    private String fileOriginName;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("批次号")
+    private String lotNo;
+
+    @Column(name = "OUT_PROJECT")
+    @ApiParam("外协工程")
+    private String outProject;
+
+    @Column(name = "OUT_FACTORY")
+    @ApiParam("外协出厂")
+    private String outFactory;
+
+    @Column(name = "SPECIAL_DESC")
+    @ApiParam("特记事项")
+    private String specialDesc;
+
+    @Column(name = "DEFECT_LEVEL")
+    @ApiParam("缺陷等级")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.DEFECT_LEVEL.class, refForeignKey = "value", value = "description")
+    private Integer defectLevel;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+
+    @Transient
+    @ApiParam("结果类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_MODE_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer qcMode;
+
+    @ApiParam("检测结果")
+    @Column(name = "QC_STATUS")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QMS_OQC_CHECK_DETAIL_RESULT.class, refForeignKey = "value", value = "description")
+    private Integer qcStatus;
+
+    @Transient
+    @ApiParam("检测结果描述")
+    private String qcStatusDesc;
+
+
+
+    @Transient
+    @ApiParam(value = "开始时间")
+    private String createDatetimeStart;
+
+    @Transient
+    @ApiParam(value = "结束时间")
+    private String createDatetimeEnd;
+
+    @Transient
+    @ApiParam(value = "报表统计周期：day-按日统计显示，week-按周统计显示，month-按月")
+    private String region;
+
+    @Transient
+    @ApiParam(value = "生产日期")
+    private String dateCode;
+
+    @Transient
+    @Column(name = "CHECK_DATE")
+    @ApiParam(value = "检查日期")
+    private String checkDate;
+
+    @ApiParam(value = "关联单号")
+    @Column(name = "REF_SRC")
+    private String refSrc;
+
+    @Transient
+    @ApiParam(value = "数量")
+    private String qty;
+
+    @Transient
+    @ApiParam("部品分类")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PART_PRODUCT_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer partType;
+
+    @Transient
+    @ApiParam("产品分类")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.EP_PRODUCT_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer productType;
+
+    @Transient
+    @ApiParam("生产线编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.ext.qms.pojo.bean.WmsWorkCenter",
+            searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode")
+    private String workCenterCode;
+
+    @Transient
+    @ApiParam("检查区分")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PART_CHECK_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer partCheckType;
+
+    @ApiParam("抽检条码")
+    private String sn;
+
+    @ApiParam("抽检数")
+    private Double actQty;
+
+    @ApiParam("单据类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ITEM_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer itemType;
+
+    @ApiParam("控制区域")
+    private String controlArea;
+
+    @ApiParam("上下限预警区域")
+    private String theWarningArea;
+
+    @ApiParam(value = "模块")
+    @Column(name = "MODULE")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.SX_QMS_RC_RULE_NOTE_MODULE.class, refForeignKey = "value", value = "description")
+    private Integer module;
+
+    @Column(name = "CHECK_ITEM")
+    @ApiParam("检验项目")
+    private String checkItem;
+
+    @Column(name = "STANDARD_OF_CRITERION",columnDefinition = "longtext")
+    @ApiParam("BU判定基准")
+    private String standardOfCriterion;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @Transient
+    @ApiParam("序号")
+    private Integer seq;
+
+    @Transient
+    @ApiParam("供应商全称")
+    private String vendorDesc;
+
+    @Transient
+    @ApiParam("预警底色")
+    private String isSendEmil;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQCTransDetailsSum.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQCTransDetailsSum.java
new file mode 100644
index 0000000..c5836d0
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQCTransDetailsSum.java
@@ -0,0 +1,122 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.util.StringJoiner;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_QC_TRANS_DETAILS_SUM",indexes = {
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "VENDOR_NO"),
+        @Index(columnList = "DATE_CODE"),
+        @Index(columnList = "QC_DATE"),
+})
+@Api("收货检测记录结果值汇总")
+public class SxQmsQCTransDetailsSum extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "PROJECT_CODE")
+    @ApiParam("项目类型")
+    private String projectCode;
+
+    @Column(name = "PROJECT_NAME")
+    @ApiParam("项目类型")
+    private String projectName;
+
+
+    @ApiParam("检测结果")
+    @Column(name = "QC_STATUS")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer qcStatus;
+
+
+    @Column(name = "QTY",columnDefinition = "int default 0")
+    @ApiParam("数量")
+    private Integer qty;
+
+    @Column(name = "DATE_CODE")
+    @ApiParam("批次")
+    private String dateCode;
+
+    @Column(name = "QC_DATE")
+    @ApiParam("质检日期")
+    private String qcDate;
+
+    @Transient
+    @ApiParam(value = "报表统计周期：day-按日统计显示，week-按周统计显示，month-按月")
+    private String region;
+
+    @Transient
+    @ApiParam(value = "质检开始时间")
+    private String createDatetimeStart;
+
+    @Transient
+    @ApiParam(value = "质检结束时间")
+    private String createDatetimeEnd;
+
+
+    public SxQmsQCTransDetailsSum(){}
+
+    public SxQmsQCTransDetailsSum(String organizeCode,
+                                  String partNo,
+                                  String partNameRdd,
+                                  String vendorNo,
+                                  String vendorName,
+                                  String dateCode,
+                                  String qcDate,
+                                  String projectCode,
+                                  String projectName,
+                                  Integer checkResult,
+                                  Integer qty) {
+        this.organizeCode =organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd= partNameRdd;
+        this.vendorNo= vendorNo;
+        this.vendorName= vendorName;
+        this.dateCode= dateCode;
+        this.qcDate= qcDate;
+        this.projectCode= projectCode;
+        this.projectName= projectName;
+        this.qcStatus= checkResult;
+        this.qty = qty;
+    }
+
+    public String groupByColumn() {
+        String key = new StringJoiner(":")
+                .add(this.getVendorNo())
+                .add(this.getPartNo())
+                .add(this.getProjectCode())
+                .add(this.getQcDate())
+                .add(String.valueOf(this.getQcStatus())).toString();
+        return key;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQCTransSn.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQCTransSn.java
new file mode 100644
index 0000000..dfb10b5
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQCTransSn.java
@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_QC_TRANS_SN",indexes = {@Index(columnList = "ORDER_NO")})
+@Api("收货条码检测记录")
+public class SxQmsQCTransSn extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    private String orderNo;
+
+    @Column(name = "SN")
+    @ApiParam("包装条码")
+    private String sn;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "ACT_QTY")
+    @ApiParam("检测数量")
+    private Double actQty;
+
+    @Column(name = "QTY")
+    @ApiParam("条码数量")
+    private Double qty;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQualityAbnormalQIRecord.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQualityAbnormalQIRecord.java
new file mode 100644
index 0000000..4fcb94c
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQualityAbnormalQIRecord.java
@@ -0,0 +1,65 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-04-20 13:28
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_QUALITY_ABNORMAL_QI_RECORD",indexes = {@Index(columnList = "MEETING_NO")})
+@Api("品质异常QI记录")
+public class SxQmsQualityAbnormalQIRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 7022790811341802100L;
+
+    @Column(name = "MEETING_NO")
+    @ApiParam("会议编号")
+    private String meetingNo;
+
+    @Column(name = "RECORD_CONTENTS")
+    @Lob
+    @ApiParam("记录内容")
+    private String recordContents;
+
+    @Column(name = "DISPOSE_METHOD")
+    @Lob
+    @ApiParam("处置对策")
+    private String disposeMethod;
+
+    @Column(name = "UNDERTAKE")
+    @ApiParam("担当")
+    private String undertake;
+
+    @Column(name = "EXECUTE_DATE")
+    @ApiParam("实施日")
+    private String executeDate;
+
+    @Column(name = "COMPLETE_DATE")
+    @ApiParam("完了日")
+    private String completeDate;
+
+    @Column(name = "PROGRESS_TRACKING")
+    @ApiParam("进度跟踪")
+    private String progressTracking;
+
+    @Column(name = "CONTINUE_REVIEW_CONFIRM")
+    @ApiParam("继续检讨确认")
+    private String continueReviewConfirm;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQualityAbnormalQIRecordDetail.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQualityAbnormalQIRecordDetail.java
new file mode 100644
index 0000000..18a8628
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsQualityAbnormalQIRecordDetail.java
@@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-04-20 13:28
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_QUALITY_ABNORMAL_QI_RECORD_DETAIL",indexes = {@Index(columnList = "MEETING_NO")})
+@Api("品质异常QI记录详细")
+public class SxQmsQualityAbnormalQIRecordDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -5961264843313444067L;
+
+    @Column(name = "MEETING_NO")
+    @ApiParam("会议编号")
+    private String meetingNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "DUTY_DIFF")
+    @ApiParam("责任区分")
+    private Integer dutyDiff;
+
+    @Column(name = "QTY")
+    @ApiParam("生产数量")
+    private Integer qty;
+
+    @Column(name = "DEFECT_QTY")
+    @ApiParam("不良数量")
+    private Integer defectQty;
+
+    @Column(name = "DEFECT_RATE")
+    @ApiParam("不良率")
+    private String defectRate;
+
+    @Transient
+    @ApiParam("责任区分")
+    private String dutyDiffName;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsRcInspectionFree.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsRcInspectionFree.java
new file mode 100644
index 0000000..3d20eeb
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsRcInspectionFree.java
@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_RC_INSPECTION_FREE",indexes = {@Index(columnList = "PART_NO")})
+@Api("物料免检清单")
+public class SxQmsRcInspectionFree extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "QC_SAME_BATCH_COUNT", columnDefinition = "int default 0")
+    @ApiParam("已质检批次")
+    private Integer qcSameBatchCount;
+
+
+    @Column(name = "STATUS",columnDefinition = "int default 2")
+    @ApiParam("生效/失效")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.INSPECTION_FREE_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer status;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsRcRuleNote.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsRcRuleNote.java
new file mode 100644
index 0000000..512a5c8
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsRcRuleNote.java
@@ -0,0 +1,144 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * 受入检验
+ * 零部件校验规格书
+ *
+ * @author songlian.shi
+ * @date 2021年02月11日 17:04
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_RC_RULE_NOTE",indexes = {@Index(columnList = "PART_NO")})
+@Api("零部件校验规格书(受入检验)")
+public class SxQmsRcRuleNote extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "MACHINE_CODE")
+    @ApiParam(value = "机种编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
+            isRequire = 2, dataSrc = "/qms/qms-enum/qms-enum/query?enumType=MACHINE_CODE_DICTIONARY", listColumnName = "enumValue", explicitColumnName = "enumValueDesc")
+    private String machineCode;
+
+    @Column(name = "MACHINE_NAME")
+    @ApiParam(value = "机种名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String machineName;
+
+    @Column(name = "COMPLATE_DATE")
+    @ApiParam("作成日期")
+    private String complateDate;
+
+    @Column(name = "PICTRUE_NO")
+    @ApiParam("图号")
+    private String pictrueNo;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "OUT_QTY")
+    @ApiParam("出模数")
+    private Integer outQty;
+
+    @Column(name = "STATUS",columnDefinition = "int default 10")
+    @ApiParam(value = "式样书状态",name = "式样书状态")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.NOTE_STATUS_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer status;
+
+    @Column(name = "UPLOAD_DATE_TIME")
+    @ApiParam("上传时间")
+    private String uploadDateTime;
+
+    @Column(name = "FILE_ID")
+    @ApiParam("文件ID")
+    private Long fileId;
+
+    @Column(name = "FILE_ORIGIN_NAME",columnDefinition = "longtext")
+    @ApiParam("文件源名")
+    private String fileOriginName;
+
+    @Column(name = "FILE_URL",columnDefinition = "longtext")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("批次号")
+    private String lotNo;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+
+    @Transient
+    @ApiParam("目标物料编码")
+    private String targetPartNo;
+
+
+    @Transient
+    @ApiParam("目标物料名称")
+    private String targetPartNameRdd;
+
+    @Transient
+    @ApiParam("目标供应商编码")
+    private String targetVerdorNo;
+
+    @Transient
+    @ApiParam("目标供应商编码名称")
+    private String targetVerdorName;
+
+    @ApiParam(value = "抽检数量")
+    @Column(name = "CHECK_QTY")
+    private Integer checkQty;
+
+    @ApiParam(value = "模块")
+    @Column(name = "MODULE",columnDefinition = "int default 0")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.SX_QMS_RC_RULE_NOTE_MODULE.class, refForeignKey = "value", value = "description")
+    private Integer module;
+
+    @Transient
+    @ApiParam("修改前的物料号")
+    private String oldPartNo;
+
+    @Transient
+    @ApiParam("修改前的物料名称")
+    private String oldPartName;
+
+    @Transient
+    @ApiParam("修改前的供应商编号")
+    private String oldVendorNo;
+
+    @Transient
+    @ApiParam("修改前的供应商名称")
+    private String oldVendorName;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsRcRuleNoteDetail.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsRcRuleNoteDetail.java
new file mode 100644
index 0000000..4f25ed4
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsRcRuleNoteDetail.java
@@ -0,0 +1,339 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * 受入检验
+ * 零部件校验规格书明细
+ *
+ * @author songlian.shi
+ * @date 2021年02月11日 17:07
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_RC_RULE_NOTE_DETAIL",indexes = {@Index(columnList = "PART_NO")})
+@Api("零部件校验规格书明细(受入检验)")
+public class SxQmsRcRuleNoteDetail extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "PROJECT_CODE")
+    @ApiParam("项目类型编码")
+    private String projectCode;
+
+    @Column(name = "PROJECT_NAME")
+    @ApiParam("项目类型名称")
+    private String projectName;
+
+    @Column(name = "CHECK_CONTENT")
+    @ApiParam("项目规格")
+    private String checkContent;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检测类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.BU_CHECK_JUDGE_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer checkType;
+
+/*
+    @Column(name = "STANDARD_VALUE")
+    @ApiParam("标准值")
+    private String standardValue;
+*/
+
+    @Column(name = "STANDARD")
+    @ApiParam("标准值")
+    private String standard;
+
+    @Column(name = "UP_LIMIT")
+    @ApiParam("最大值")
+    private String upLimit;
+
+    @Column(name = "DOWN_LIMIT")
+    @ApiParam("最小值")
+    private String downLimit;
+
+    @Column(name = "CHECK_TOOL")
+    @ApiParam("测定器具")
+    private String checkTool;
+
+    @Column(name = "ACT_QTY")
+    @ApiParam("抽检数")
+    private Integer actQty;
+
+    @Column(name = "ACT_QTY_DESC")
+    @ApiParam("抽检数描述")
+    private String actQtyDesc;
+
+    @Column(name = "OUT_PROJECT")
+    @ApiParam("外协工程")
+    private String outProject;
+
+    @Column(name = "OUT_FACTORY")
+    @ApiParam("外协出厂")
+    private String outFactory;
+
+    @Column(name = "SPECIAL_DESC")
+    @ApiParam("特记事项")
+    private String specialDesc;
+
+    @Column(name = "DEFECT_LEVEL")
+    @ApiParam("缺陷等级")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.DEFECT_LEVEL.class, refForeignKey = "value", value = "description")
+    private Integer defectLevel;
+
+    @ApiParam("控制区域")
+    @Transient
+    private String controlArea;
+
+    @Column(name = "ITEM_TYPE")
+    @ApiParam("单据类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ITEM_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer itemType;
+
+    @ApiParam("上下限预警区域")
+    @Transient
+    private String theWarningArea;
+
+    @ApiParam("订单号")
+    @Transient
+    private String orderNo;
+
+    @ApiParam("区分检验作业和零部件受检项目页面")
+    @Transient
+    @AnnoOutputColumn(refClass = QmsEnumUtil.SX_QMS_RC_RULE_NOTE_PAGE.class, refForeignKey = "value", value = "description")
+    private Integer page;
+
+    @ApiParam(value = "模块")
+    @Column(name = "MODULE")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.SX_QMS_RC_RULE_NOTE_MODULE.class, refForeignKey = "value", value = "description")
+    private Integer module;
+
+    @Column(name = "STANDARD_OF_CRITERION",columnDefinition = "longtext")
+    @ApiParam("判定基准")
+    private String standardOfCriterion;
+
+    @Column(name = "CHECK_ITEM")
+    @ApiParam("检验项目")
+    private String checkItem;
+
+    @Column(
+            name = "CHECK_SERIAL",
+            columnDefinition = "decimal(18,8)"
+    )
+    @ApiParam("检验序列号")
+    private Double checkSerial;
+
+    @Transient
+    @ApiParam("OK/NG")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer qcStatus;
+
+    private Integer counting;
+
+    @Transient
+    @ApiParam("检测值1")
+    private int count1;
+
+    @Transient
+    @ApiParam("检测值2")
+    private int count2;
+
+    @Transient
+    @ApiParam("检测值3")
+    private int count3;
+
+    @Transient
+    @ApiParam("检测值4")
+    private int count4;
+
+    @Transient
+    @ApiParam("检测值5")
+    private int count5;
+
+    @Transient
+    @ApiParam("检测值6")
+    private int count6;
+
+    @Transient
+    @ApiParam("检测值7")
+    private int count7;
+
+    @ApiParam("检测值8")
+    private int count8;
+
+    @Transient
+    @ApiParam("检测值9")
+    private int count9;
+
+    @Transient
+    @ApiParam("检测值10")
+    private int count10;
+
+    @Transient
+    @ApiParam("检测值11")
+    private int count11;
+
+    @Transient
+    @ApiParam("检测值12")
+    private int count12;
+
+    @ApiParam("检测值13")
+    private int count13;
+
+    @Transient
+    @ApiParam("检测值14")
+    private int count14;
+
+    @Transient
+    @ApiParam("检测值15")
+    private int count15;
+
+    @Transient
+    @ApiParam("检测值16")
+    private int count16;
+
+    @Transient
+    @ApiParam("检测值17")
+    private int count17;
+
+    @Transient
+    @ApiParam("检测值18")
+    private int count18;
+
+    @Transient
+    @ApiParam("检测值19")
+    private int count19;
+
+    @Transient
+    @ApiParam("检测值20")
+    private int count20;
+
+    @Transient
+    @ApiParam("检测值21")
+    private int count21;
+
+    @Transient
+    @ApiParam("检测值22")
+    private int count22;
+
+    @Transient
+    @ApiParam("检测值23")
+    private int count23;
+
+    @Transient
+    @ApiParam("检测值24")
+    private int count24;
+
+    @Transient
+    @ApiParam("检测值25")
+    private int count25;
+
+    @Transient
+    @ApiParam("检测值26")
+    private int count26;
+
+    @Transient
+    @ApiParam("检测值27")
+    private int count27;
+
+    @Transient
+    @ApiParam("检测值28")
+    private int count28;
+
+    @Transient
+    @ApiParam("检测值29")
+    private int count29;
+
+    @Transient
+    @ApiParam("检测值30")
+    private int count30;
+
+    @Transient
+    @ApiParam("检测值31")
+    private int count31;
+
+    @Transient
+    @ApiParam("检查区分")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_MODE_TYPE.class, refForeignKey = "value", value = "description")
+    private String qcMode;
+
+    @Transient
+    @ApiParam("批次")
+    private String dateCode;
+
+    @Transient
+    @ApiParam("质检日期")
+    private String qcDate;
+
+    @Transient
+    @ApiParam(value = "开始时间")
+    private String createDatetimeStart;
+
+    @Transient
+    @ApiParam(value = "结束时间")
+    private String createDatetimeEnd;
+
+    @Transient
+    @ApiParam(value = "报表统计周期：day-按日统计显示，week-按周统计显示，month-按月")
+    private String region;
+
+
+
+    public SxQmsRcRuleNoteDetail() {
+
+    }
+
+    public SxQmsRcRuleNoteDetail(String partNo, String partNameRdd, String vendorNo, String vendorName, Integer qcStatus, String qcMode, String projectCode) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.qcStatus = qcStatus;
+        this.qcMode = qcMode;
+        this.projectCode = projectCode;
+    }
+
+    public SxQmsRcRuleNoteDetail(String partNo,
+                                 String partNameRdd,
+                                 String vendorNo,
+                                 String vendorName,
+                                 String projectCode,
+                                 String projectName,
+                                 Integer qcStatus) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.projectCode = projectCode;
+        this.projectName = projectName;
+        this.qcStatus = qcStatus;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsRecheckInstruction.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsRecheckInstruction.java
new file mode 100644
index 0000000..c62e7d3
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsRecheckInstruction.java
@@ -0,0 +1,106 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-02-15 11:14
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_RECHECK_INSTRUCTION",indexes = {
+        @Index(columnList = "RECHECK_INSTRUCTION_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "PART_NAME_RDD"),
+        @Index(columnList = "MACHINE_CODE")})
+@Api("再检指示书表")
+public class SxQmsRecheckInstruction extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3577017917154837015L;
+
+    @Column(name = "RECHECK_INSTRUCTION_NO")
+    @ApiParam("再检指示单号")
+    private String recheckInstructionNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "MACHINE_CODE")
+    @ApiParam("机种编码")
+    private String machineCode;
+
+    @Column(name = "BELOW_STANDARD_CONTENT")
+    @ApiParam("不合格内容")
+    private String belowStandardContent;
+
+    @Column(name = "RECHECK_METHOD")
+    @ApiParam("再检方法")
+    private String recheckMethod;
+
+    @Column(name = "RECHECK_PLACE")
+    @ApiParam("再检场所")
+    private String recheckPlace;
+
+    @Column(name = "DISPOSAL_METHODS1")
+    @ApiParam("处置方法1")
+    private String disposalMethods1;
+
+    @Column(name = "DISPOSAL_METHODS2")
+    @ApiParam("处置方法2")
+    private String disposalMethods2;
+
+    @Column(name = "DISPOSAL_METHODS3")
+    @ApiParam("处置方法3")
+    private String disposalMethods3;
+
+    @Column(name = "OTHER_NONCONFORMING_ITEMS1")
+    @ApiParam("其他不符合1")
+    private String otherNonconformingItems1;
+
+    @Column(name = "OTHER_NONCONFORMING_ITEMS2")
+    @ApiParam("其他不符合2")
+    private String otherNonconformingItems2;
+
+    @Column(name = "OTHER_NONCONFORMING_ITEMS3")
+    @ApiParam("其他不符合3")
+    private String otherNonconformingItems3;
+
+    @Column(name = "SPOT_CHECK_RESULTS1")
+    @ApiParam("抽检结果1")
+    private String spotCheckResults1;
+
+    @Column(name = "SPOT_CHECK_RESULTS2")
+    @ApiParam("抽检结果2")
+    private String spotCheckResults2;
+
+    @Column(name = "INSTRUCTION_STATUS")
+    @ApiParam("单据状态 10-已创建,20-已完成")
+    private Integer instructionStatus;
+
+    @Column(name = "CONFIRM_STATUS")
+    @ApiParam("出货停止指令书确认")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PASS_OR_NO_PASS.class, refForeignKey = "value", value = "description")
+    private Integer confirmStatus;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsRulesOfDocumentGeneration.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsRulesOfDocumentGeneration.java
new file mode 100644
index 0000000..607c98e
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsRulesOfDocumentGeneration.java
@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @description: ODM/OEM单据生成规则
+ * @author: jiaqi.hou
+ * @date: 2022/07/12
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_RULES_OF_DOCUMENT_GENERATION",indexes = {@Index(columnList = "VENDOR_NO,PART_NO")})
+@Api("ODM/OEM单据生成规则")
+public class SxQmsRulesOfDocumentGeneration extends BaseBean {
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNameRdd;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "UP_LIMIT")
+    @ApiParam("上限值")
+    private Integer upLimit;
+
+    @Column(name = "DOWN_LIMIT")
+    @ApiParam("下限值")
+    private Integer downLimit;
+
+    @Column(name = "CREATE_QTY")
+    @ApiParam("生成数量")
+    private Integer createQty;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsShipStopOrder.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsShipStopOrder.java
new file mode 100644
index 0000000..9e23479
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsShipStopOrder.java
@@ -0,0 +1,144 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_SHIP_STOP_ORDER")
+@Api("出货停止指令书")
+public class SxQmsShipStopOrder extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    private String orderNo;
+
+    @Column(name = "MANAGE_NO")
+    @ApiParam("管理NO")
+    private String manageNo;
+
+    @Column(name = "CAUSE_TYPE")
+    @ApiParam("异常区分")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ABNORMAL_SOURCE.class)
+    private Integer causeType;
+
+    @Column(name = "DEAL_OPTION")
+    @ApiParam("应急处理")
+    private String dealOption;
+
+    @Column(name = "REF_ORDER_NO")
+    @ApiParam("关联单号")
+    private String refOrderNo;
+
+    @Column(name = "REF_OQC_NO")
+    @ApiParam("出货检验单号")
+    private String refOqcNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "MACHINE_CODE")
+    @ApiParam("机种编码")
+    private String machineCode;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "PUBLISH_DATE")
+    @ApiParam("发行日期")
+    private String publishDate;
+
+    @Column(name = "FILE_NAME")
+    @ApiParam("件名")
+    private String fileName;
+
+    @Column(name = "ABNORMAL_CONTENT")
+    @ApiParam("异常内容")
+    private String abnormalContent;
+
+    @Column(name = "ORDER_STATUS")
+    @ApiParam("状态")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.STOP_ORDER_STATUS.class)
+    private Integer orderStatus;
+
+    @Column(name = "RELIEVE_DATE")
+    @ApiParam("解除日期")
+    private String relieveDate;
+
+    @Column(name = "DEAL_CONTEN")
+    @ApiParam("处置内容")
+    private String dealConten;
+
+    @Column(name = "RELIEVE_USER_NAME")
+    @ApiParam("解除人")
+    private String relieveUserName;
+
+    @Column(name = "RELIEVE_TIME")
+    @ApiParam("解除时间")
+    private String relieveTime;
+
+    @Column(name = "RELIEVE_RANGE")
+    @ApiParam("解除对象范围")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.SHIP_STOP_RELIEVE_RANGE.class)
+    private Integer relieveRange;
+
+    @Column(name = "RE_CHECK_MODE")
+    @ApiParam("再检方式")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.SHIP_STOP_RE_CHECK_MODE.class)
+    private Integer reCheckMode;
+
+    @Column(name = "RE_CHECK_RESULTS")
+    @ApiParam("再检结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QMS_OQC_CHECK_RESULT.class)
+    private Integer reCheckResults;
+
+    @Column(name = "STOP_TYPE")
+    @ApiParam("停止类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.STOP_TYPE.class)
+    private Integer stopType;
+
+    @Column(name = "CONFIRM_STATUS")
+    @ApiParam("出货停止指令书确认")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PASS_OR_NO_PASS.class, refForeignKey = "value", value = "description")
+    private Integer confirmStatus;
+
+    @Transient
+    @ApiParam("查询参数，生产线编码")
+    private String workCenterCode;
+
+    @Transient
+    @ApiParam("查询参数，产品分类")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.EP_PRODUCT_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer productType;
+
+    @Transient
+    @ApiParam("发行开始日期")
+    private String publishDateStart;
+
+    @Transient
+    @ApiParam("发行结束日期")
+    private String publishDateEnd;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsShipStopOrderDetail.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsShipStopOrderDetail.java
new file mode 100644
index 0000000..c37638a
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsShipStopOrderDetail.java
@@ -0,0 +1,80 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_SHIP_STOP_ORDER_DETAIL")
+@Api("出货停止指令书明细")
+public class SxQmsShipStopOrderDetail extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("出货停止指令书单号")
+    private String orderNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "MACHINE_CODE")
+    @ApiParam("机种编码")
+    private String machineCode;
+
+    @Column(name = "START_SERIAL_SN")
+    @ApiParam("开始产品条码")
+    private String startSerialSn;
+
+    @Column(name = "END_SERIAL_SN")
+    @ApiParam("结束产品条码")
+    private String endSerialSn;
+
+    @Column(name = "REF_OQC_NO")
+    @ApiParam("出货检验单号")
+    private String refOqcNo;
+
+    @Column(name = "RE_CHECK_RESULTS")
+    @ApiParam("再检结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QMS_OQC_CHECK_RESULT.class)
+    private Integer reCheckResults;
+
+    @Column(name = "DEAL_CONTEN")
+    @ApiParam("处置内容")
+    private String dealConten;
+
+    @Column(name = "RELIEVE_MACHINE_CODE")
+    @ApiParam("解除机种")
+    private String relieveMachineCode;
+
+    @Column(name = "RELIEVE_START_SERIAL_SN")
+    @ApiParam("解除开始产品条码")
+    private String relieveStartSerialSn;
+
+    @Column(name = "RELIEVE_END_SERIAL_SN")
+    @ApiParam("解除结束产品条码")
+    private String relieveEndSerialSn;
+
+    public SxQmsShipStopOrderDetail() {}
+
+    public SxQmsShipStopOrderDetail(String startSerialSn, String endSerialSn) {
+        this.startSerialSn = startSerialSn;
+        this.endSerialSn = endSerialSn;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsShipStopOrderSn.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsShipStopOrderSn.java
new file mode 100644
index 0000000..99b6d38
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsShipStopOrderSn.java
@@ -0,0 +1,111 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_SHIP_STOP_ORDER_SN")
+@Api("出货停止指令书条码")
+public class SxQmsShipStopOrderSn extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("出货停止指令书单号")
+    private String orderNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name = "MACHINE_CODE")
+    @ApiParam("机种编码")
+    private String machineCode;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @Column(name = "NOTE_CHECK_RESULT")
+    @ApiParam("停止指示书检验结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QMS_OQC_CHECK_RESULT.class, refForeignKey = "value", value = "description")
+    private Integer noteCheckResult;
+
+    @Column(name = "SN_STATUS",columnDefinition = "int(11) default 10")
+    @ApiParam("条码状态")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.STOP_SN_STATUS.class)
+    private Integer snStatus;
+
+    @Column(name = "RELIEVE_DATE")
+    @ApiParam("解除日期")
+    private String relieveDate;
+
+    @Column(name = "DEAL_CONTEN")
+    @ApiParam("处置内容")
+    private String dealConten;
+
+    @Column(name = "RELIEVE_RANGE")
+    @ApiParam("解除对象范围")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.SHIP_STOP_RELIEVE_RANGE.class)
+    private Integer relieveRange;
+
+    @Column(name = "RE_CHECK_MODE")
+    @ApiParam("再检方式")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.SHIP_STOP_RE_CHECK_MODE.class)
+    private Integer reCheckMode;
+
+    @Column(name = "RE_CHECK_RESULTS")
+    @ApiParam("再检结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QMS_OQC_CHECK_RESULT.class)
+    private Integer reCheckResults;
+
+    @Transient
+    @ApiParam("查询参数，产品开始条码")
+    private String serialNumberStart;
+
+    @Transient
+    @ApiParam("查询参数，产品结束条码")
+    private String serialNumberEnd;
+
+    public SxQmsShipStopOrderSn(String orderNo, String partNo, String partNameRdd, String machineCode, String serialNumber, Integer noteCheckResult) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.machineCode = machineCode;
+        this.serialNumber = serialNumber;
+        this.noteCheckResult = noteCheckResult;
+    }
+
+    public SxQmsShipStopOrderSn(String orderNo, String partNo, String partNameRdd, String machineCode, String serialNumber, Integer noteCheckResult, String packageNo) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.machineCode = machineCode;
+        this.serialNumber = serialNumber;
+        this.noteCheckResult = noteCheckResult;
+        this.packageNo = packageNo;
+    }
+
+    public SxQmsShipStopOrderSn() {
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsVendorPartRel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsVendorPartRel.java
new file mode 100644
index 0000000..cfa3d13
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsVendorPartRel.java
@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@Table(name = "SX_QMS_VENDOR_PART_REL")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Api(value = "供应商物料关系")
+public class SxQmsVendorPartRel extends BaseBean {
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    @Transient
+    private String vendorName;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @ApiParam("物料名称")
+    @Transient
+    private String partName;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsVqeAbnormalDetail.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsVqeAbnormalDetail.java
new file mode 100644
index 0000000..3238f04
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsVqeAbnormalDetail.java
@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_VQE_ABNORMAL_DETAIL",indexes = {@Index(columnList = "ORDER_NO")})
+@Api("供应商业绩异常联络单回复明细")
+public class SxQmsVqeAbnormalDetail extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name="CLASSIFY")
+    @ApiParam("分类")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.VQE_ABNORMAL_CLASSIFY.class)
+    public Integer classify;
+
+    @Column(name="CAUSE_ANALYSIS")
+    @ApiParam("原因分析")
+    public String causeAnalysis;
+
+    @Column(name="TEMPORARY_COUNTERMEASURE")
+    @ApiParam("临时对策")
+    public String temporaryCountermeasure;
+
+    @Column(name = "DEPARTMENT_NAME")
+    @ApiParam("实施部门名称")
+    private String departmentName;
+
+    @Column(name = "DEPARTMENT_CODE")
+    @ApiParam("实施部门代码")
+    private String departmentCode;
+
+    @Column(name = "IMPLEMENT_DATE")
+    @ApiParam("实施日期")
+    private String implementDate;
+
+    @Column(name = "PRINCIPAL")
+    @ApiParam("负责人")
+    private String principal;
+
+    @Column(name = "PERMANENT_COUNTERMEASURE")
+    @ApiParam("永久对策")
+    private String permanentCountermeasure;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsVqeAbnormalMaster.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsVqeAbnormalMaster.java
new file mode 100644
index 0000000..cdb79c7
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsVqeAbnormalMaster.java
@@ -0,0 +1,160 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_VQE_ABNORMAL_MASTER",indexes = {@Index(columnList = "ORDER_NO,PART_NO")})
+@Api("供应商业绩异常联络单")
+public class SxQmsVqeAbnormalMaster extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "YEAR")
+    @ApiParam("评价年份")
+    private Integer year;
+
+    @Column(name = "MONTH")
+    @ApiParam("评价月份")
+    private Integer month;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNameRdd;
+
+    @Column(name = "MONTH_GRADE")
+    @ApiParam("当月等级")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ABCD.class)
+    private Integer monthGrade;
+
+    /**
+     * yyyy-MM-dd 格式
+     */
+    @Column(name = "REPLY_END_DATE")
+    @ApiParam("回复期限日期")
+    private String replyEndDate;
+
+    @Column(name = "RED_YELLOW_WARN")
+    @ApiParam("红黄牌警告")
+    private String redYellowWarn;
+
+    @Column(name = "ISSUE_DATE")
+    @ApiParam("发行日期")
+    private String issueDate;
+
+    @Column(name = "QUALITY_JUDGE")
+    @ApiParam("品质决算判断")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.NEED_OR_NO.class)
+    private Integer qualityJudge;
+
+    @Column(name = "PROJECT_SUPERVISION_JUDGE")
+    @ApiParam("工程监查判断")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.NEED_OR_NO.class)
+    private Integer projectSupervisionJudge;
+
+    @Column(name = "ORDER_STATUS",columnDefinition = "int default 10")
+    @ApiParam("状态")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ABNORMAL_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer orderStatus;
+
+    @Column(name = "REPLY_OVER_TIME",columnDefinition = "int default 2")
+    @ApiParam("是否超时回复")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer replyOverTime;
+
+    @Column(name = "MANAGEMENT_CONFIRM",columnDefinition = "int default 20")
+    @ApiParam("物管确认")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CONFIRM_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer managementConfirm;
+
+    @Column(name = "MANAGEMENT_CONFIRM_DATE_TIME")
+    @ApiParam("物管确认时间")
+    private String managementConfirmDateTime;
+
+    @Column(name = "MANAGEMENT_CONFIRM_IDEA")
+    @ApiParam("物管确认意见")
+    private String managementConfirmIdea;
+
+    @Column(name = "REGULATE_CONFIRM",columnDefinition = "int default 20")
+    @ApiParam("调达确认")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CONFIRM_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer regulateConfirm;
+
+    @Column(name = "REGULATE_CONFIRM_DATE_TIME")
+    @ApiParam("调达确认时间")
+    private String regulateConfirmDateTime;
+
+    @Column(name = "REGULATE_CONFIRM_IDEA")
+    @ApiParam("调达确认意见")
+    private String regulateConfirmIdea;
+
+    @Column(name = "CONTACT_CONFIRM",columnDefinition = "int default 20")
+    @ApiParam("联络单确认")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CONFIRM_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer contactConfirm;
+
+    @Column(name = "CONTACT_CONFIRM_DATE_TIME")
+    @ApiParam("联络单确认时间")
+    private String contactConfirmDateTime;
+
+    @Column(name = "CONTACT_CONFIRM_IDEA")
+    @ApiParam("联络单确认意见")
+    private String contactConfirmIdea;
+
+    @Column(name = "REPLY_CONFIRM",columnDefinition = "int default 20")
+    @ApiParam("回复确认")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.CONFIRM_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer replyConfirm;
+
+    @Column(name = "REPLY_CONFIRM_DATE_TIME")
+    @ApiParam("回复确认时间")
+    private String replyConfirmDateTime;
+
+    @Column(name = "GAME_ACCEPTANCE_CONFIRM")
+    @ApiParam("对策接收确定")
+    private String gameAcceptanceConfirm;
+
+    @Column(name = "IMPROVEMENT_EFFECT_CONFIRM")
+    @ApiParam("对策接收确定")
+    private String improvementEffectConfirm;
+
+    @Transient
+    @ApiParam("开始时间")
+    private String createDatetimeStart;
+
+    @Transient
+    @ApiParam("结束时间")
+    private String createDatetimeEnd;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsVqeArtificialPlusMinus.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsVqeArtificialPlusMinus.java
new file mode 100644
index 0000000..684aa77
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsVqeArtificialPlusMinus.java
@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_VQE_ARTIFICIAL_PLUS_MINUS",indexes = {@Index(columnList = "VENDOR_NO")})
+@Api("供应商Q评价-人工加减分")
+public class SxQmsVqeArtificialPlusMinus extends BaseBean {
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "PLUS_MINUS_ITEM")
+    @ApiParam("加减分项")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.VQE_PLUS_MINUS_ITEM.class)
+    private Integer plusMinusItem;
+
+    @Column(name = "MINUS_SCORE")
+    @ApiParam("扣减分数")
+    private Integer minusScore;
+
+    @Column(name = "HAPPEN_DATE")
+    @ApiParam("发生日期")
+    private String happenDate;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+    @Transient
+    @ApiParam("查询参数，起始发生日期")
+    private String happenDateStart;
+
+    @Transient
+    @ApiParam("查询参数，截止发生日期")
+    private String happenDateEnd;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsVqeDefectGradeScore.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsVqeDefectGradeScore.java
new file mode 100644
index 0000000..86af332
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsVqeDefectGradeScore.java
@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.annotation.EntityColumn;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_VQE_DEFECT_GRADE_SCORE",indexes = {@Index(columnList = "PLUS_MINUS_FORM")})
+@Api("供应商Q评价-缺陷等级及分数")
+public class SxQmsVqeDefectGradeScore extends BaseBean {
+
+    @Column(name = "PLUS_MINUS_FORM")
+    @ApiParam("加减分形式")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.VQE_PLUS_MINUS_FORM.class)
+    @EntityColumn(isPrimary = true)
+    private Integer plusMinusForm;
+
+    @Column(name = "DEFECT_GRADE")
+    @ApiParam("缺陷等级")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.VQE_DEFECT_GRADE.class)
+    @EntityColumn(isPrimary = true)
+    private Integer defectGrade;
+
+    @Column(name = "EVALUATION_GRADE")
+    @ApiParam("评价等级")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.VQE_EVALUATION_GRADE.class)
+    @EntityColumn(isRequired = true)
+    private Integer evaluationGrade;
+
+    @Column(name = "MINUS_SCORE")
+    @ApiParam("扣减分数")
+    @EntityColumn(isRequired = true)
+    private Integer minusScore;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsVqePlusMinusForm.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsVqePlusMinusForm.java
new file mode 100644
index 0000000..2835e36
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsVqePlusMinusForm.java
@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.annotation.EntityColumn;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SX_QMS_VQE_PLUS_MINUS_FORM",indexes = {@Index(columnList = "PLUS_MINUS_FORM")})
+@Api("供应商Q评价-加减分形式")
+public class SxQmsVqePlusMinusForm extends BaseBean {
+
+    @Column(name = "PLUS_MINUS_FORM")
+    @ApiParam("加减分形式")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.VQE_PLUS_MINUS_FORM.class)
+    @EntityColumn(isPrimary = true)
+    private Integer plusMinusForm;
+
+    @Column(name = "MAX_SCORE")
+    @ApiParam("最大分数")
+    @EntityColumn(isRequired = true)
+    private Integer maxScore;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsWorkCenter.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsWorkCenter.java
new file mode 100644
index 0000000..973a41d
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/bean/SxQmsWorkCenter.java
@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.qms.bean;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description :生产线信息
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-15 14:56
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="SX_QMS_WORK_CENTER")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Api(value="",description = "生产线信息")
+public class SxQmsWorkCenter extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "生产线代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String workCenterCode;
+
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam(value = "生产线名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String workCenterName;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/EpOutPutStatisticsModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/EpOutPutStatisticsModel.java
new file mode 100644
index 0000000..07f14ad
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/EpOutPutStatisticsModel.java
@@ -0,0 +1,87 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate: 2019\11\15 10:12
+ * @Modify:
+ **/
+@Data
+@Api("产量统计MODEL")
+public class EpOutPutStatisticsModel implements Serializable {
+
+    private static final long serialVersionUID = -1545535307751062460L;
+
+    @ApiParam("产线代码")
+    private String workCenterCode;
+
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @ApiParam("作业时间")
+    private String workTime;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @ApiParam("结束时间")
+    private String endTime;
+
+    @ApiParam("工单开始时间")
+    private String orderStartTime;
+
+    @ApiParam("产量")
+    private Double qty;
+
+    @ApiParam("工单计划数量")
+    private Double planQty;
+
+    @ApiParam("备注")
+    private String remark;
+
+    @ApiParam("工单完工数量")
+    private Double completeQty;
+
+    @ApiParam("工单修改时间")
+    private String modifyDatetime;
+
+    @ApiParam("工单状态")
+    private Integer workOrderStatus;
+
+    public EpOutPutStatisticsModel(String workCenterCode, String shiftCode, String workTime, String workOrderNo, String partNo, String partNameRdd, String startTime, String endTime, String orderStartTime, Double qty, Double planQty, String remark, Double completeQty, String modifyDatetime, Integer workOrderStatus) {
+        this.workCenterCode = workCenterCode;
+        this.shiftCode = shiftCode;
+        this.workTime = workTime;
+        this.workOrderNo = workOrderNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.startTime = startTime;
+        this.endTime = endTime;
+        this.orderStartTime = orderStartTime;
+        this.qty = qty;
+        this.planQty = planQty;
+        this.remark = remark;
+        this.completeQty = completeQty;
+        this.modifyDatetime = modifyDatetime;
+        this.workOrderStatus = workOrderStatus;
+    }
+
+    public EpOutPutStatisticsModel() {
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/EpQmsBadCellDetailModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/EpQmsBadCellDetailModel.java
new file mode 100644
index 0000000..bf805b2
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/EpQmsBadCellDetailModel.java
@@ -0,0 +1,112 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("EP工程不良统计参数MODEL")
+public class EpQmsBadCellDetailModel implements Serializable {
+
+    private static final long serialVersionUID = 7821704472465740881L;
+
+    @ApiParam("查询维度")
+    private Integer dimension;
+
+    @ApiParam("查询维度")
+    private Integer dimension1;
+
+    @ApiParam("工位维度")
+    private Boolean cellFlag = false;
+
+    @ApiParam("机种编码")
+    private String machineCode;
+
+    @ApiParam("机种编码")
+    private String machineName;
+
+    @ApiParam(value = "物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("原材料物料编码")
+    private String itemPartNo;
+
+    @ApiParam("原材料物料名称")
+    private String itemPartName;
+
+    @ApiParam(value = "生产线代码")
+    private String workCenterCode;
+
+    @ApiParam(value = "工位代码")
+    private String workCellCode;
+
+    @ApiParam("不良时间")
+    private String defectActionTime;
+
+    @ApiParam("不良类型代码")
+    private String defectType;
+
+    @ApiParam("不良类型描述")
+    private String defectTypeName;
+
+    @ApiParam("不良标识代码")
+    private String defectCode;
+
+    @ApiParam("不良标识描述")
+    private String defectName;
+
+    @ApiParam("发生岗位")
+    private String happenStation;
+
+    @ApiParam("维修措施代码")
+    private String repairCode;
+
+    @ApiParam("维修措施名称")
+    private String repairName;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("不良时间起始")
+    private String defectActionTimeStart;
+
+    @ApiParam("不良时间截止")
+    private String defectActionTimeEnd;
+
+    @ApiParam("上年度不良时间起始")
+    private String lastDefectActionTimeStart;
+
+    @ApiParam("上年度良时间截止")
+    private String lastDefectActionTimeEnd;
+
+    public EpQmsBadCellDetailModel() {}
+
+    public EpQmsBadCellDetailModel(String organizeCode, String workCenterCode, String defectActionTimeStart, String defectActionTimeEnd) {
+        this.workCenterCode = workCenterCode;
+        this.organizeCode = organizeCode;
+        this.defectActionTimeStart = defectActionTimeStart;
+        this.defectActionTimeEnd = defectActionTimeEnd;
+    }
+
+    public EpQmsBadCellDetailModel(String organizeCode, String workCenterCode, String defectActionTimeStart, String defectActionTimeEnd, String lastDefectActionTimeStart, String lastDefectActionTimeEnd) {
+        this.workCenterCode = workCenterCode;
+        this.organizeCode = organizeCode;
+        this.defectActionTimeStart = defectActionTimeStart;
+        this.defectActionTimeEnd = defectActionTimeEnd;
+        this.lastDefectActionTimeStart = lastDefectActionTimeStart;
+        this.lastDefectActionTimeEnd = lastDefectActionTimeEnd;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/EpQmsOutPutStatisticsModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/EpQmsOutPutStatisticsModel.java
new file mode 100644
index 0000000..490030f
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/EpQmsOutPutStatisticsModel.java
@@ -0,0 +1,95 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME:
+ * @DESCRIPTION:
+ * @USER: wangjie
+ * @DATE: 2021-12-20 13:01
+ */
+@Data
+@ApiModel("产量MODEL")
+public class EpQmsOutPutStatisticsModel implements Serializable {
+
+    private static final long serialVersionUID = -5319529507303469957L;
+
+    @ApiParam("产线代码")
+    private String workCenterCode;
+
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @ApiParam("作业时间")
+    private String workTime;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @ApiParam("结束时间")
+    private String endTime;
+
+    @ApiParam("工单开始时间")
+    private String orderStartTime;
+
+    @ApiParam("产量")
+    private Double qty;
+
+    @ApiParam("工单计划数量")
+    private Double planQty;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+    @ApiParam("数据:年度作业时间开始")
+    private String curWorkTimeStart;
+
+    @ApiParam("数据:年度作业时间结束")
+    private String curWorkTimeEnd;
+
+    @ApiParam("数据:上个年度作业时间开始")
+    private String lastWorkTimeStart;
+
+    @ApiParam("数据:上个年度作业时间结束")
+    private String lastWorkTimeEnd;
+
+    public EpQmsOutPutStatisticsModel() {}
+
+    public EpQmsOutPutStatisticsModel(String organizeCode, String workCenterCode, String curWorkTimeStart, String curWorkTimeEnd, String lastWorkTimeStart, String lastWorkTimeEnd) {
+        this.organizeCode = organizeCode;
+        this.workCenterCode = workCenterCode;
+        this.curWorkTimeStart = curWorkTimeStart;
+        this.curWorkTimeEnd = curWorkTimeEnd;
+        this.lastWorkTimeStart = lastWorkTimeStart;
+        this.lastWorkTimeEnd = lastWorkTimeEnd;
+    }
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/EpQmsRepirTaskModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/EpQmsRepirTaskModel.java
new file mode 100644
index 0000000..471090a
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/EpQmsRepirTaskModel.java
@@ -0,0 +1,97 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME:
+ * @DESCRIPTION:
+ * @USER: wangjie
+ * @DATE: 2021-12-20 13:01
+ */
+@Data
+@ApiModel("维修作业单MODEL")
+public class EpQmsRepirTaskModel implements Serializable {
+
+    private static final long serialVersionUID = -8616441130447940550L;
+
+    @ApiParam("维修单号")
+    private String repairNo;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam(value = "产线代码")
+    private String workCenterCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("维修数量")
+    private Double repairQty;
+
+    @ApiParam("维修日期")
+    private String repairDate;
+
+    @ApiParam("维修人员")
+    private String repairUser;
+
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @ApiParam("作业时间")
+    private String workTime;
+
+    @ApiParam("不良类型代码")
+    private String defectType;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+    @ApiParam("数据:年度作业时间开始")
+    private String curWorkTimeStart;
+
+    @ApiParam("数据:年度作业时间结束")
+    private String curWorkTimeEnd;
+
+    @ApiParam("数据:上个年度作业时间开始")
+    private String lastWorkTimeStart;
+
+    @ApiParam("数据:上个年度作业时间结束")
+    private String lastWorkTimeEnd;
+
+    public EpQmsRepirTaskModel() {}
+
+    public EpQmsRepirTaskModel(String organizeCode, String workCenterCode, String curWorkTimeStart, String curWorkTimeEnd, String lastWorkTimeStart, String lastWorkTimeEnd) {
+        this.organizeCode = organizeCode;
+        this.workCenterCode = workCenterCode;
+        this.curWorkTimeStart = curWorkTimeStart;
+        this.curWorkTimeEnd = curWorkTimeEnd;
+        this.lastWorkTimeStart = lastWorkTimeStart;
+        this.lastWorkTimeEnd = lastWorkTimeEnd;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/EpRepairTaskModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/EpRepairTaskModel.java
new file mode 100644
index 0000000..1155258
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/EpRepairTaskModel.java
@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.ColumnDefault;
+
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-mes-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-04-18 11:09
+ */
+@Data
+@ApiModel("EP返修任务数据MODEL")
+public class EpRepairTaskModel implements Serializable {
+    private static final long serialVersionUID = -8102029769560013605L;
+
+    @ApiParam("维修单号")
+    private String repairNo;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam(value = "产线代码")
+    private String workCenterCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ColumnDefault("0")
+    @ApiParam("维修数量")
+    private Double repairQty;
+
+    @ApiParam("维修日期")
+    private String repairDate;
+
+    @ApiParam("维修人员")
+    private String repairUser;
+
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @ApiParam("作业时间")
+    private String workTime;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/MesAreaModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/MesAreaModel.java
new file mode 100644
index 0000000..7f3f95a
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/MesAreaModel.java
@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2022/6/1 10:58
+ * @Modify:
+ **/
+@Data
+public class MesAreaModel {
+
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @ApiParam("区域名称")
+    private String areaName;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/MesWorkCenterModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/MesWorkCenterModel.java
new file mode 100644
index 0000000..780ea33
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/MesWorkCenterModel.java
@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2022/6/1 11:03
+ * @Modify:
+ **/
+@Data
+public class MesWorkCenterModel {
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @ApiParam("ERP工作中心")
+    private String erpWorkCenter;
+
+    @ApiParam("工作版本")
+    private String workVer;
+
+    @ApiParam("生产区域代码")
+    private String areaCode;
+
+    @ApiParam("运行状态")
+    private String runningStatus;
+
+    @ApiParam("产能")
+    private Integer productionCapacity;
+
+    @ApiParam("条码生成模式")
+    private Integer generateType;
+
+    // 10=工单作业，20=标准作业
+    @ApiParam("工位监控模式")
+    private Integer monitorType;
+
+    @ApiParam("节拍")
+    private Integer planTakt;
+
+    @ApiParam("序号")
+    private Integer seq;
+
+    @ApiParam("是否需要设备自动报警")
+    private Integer isEquMonitor;
+
+    @ApiParam("是否临时开线")
+    private Integer isTemporary = 2;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/MesWorkOrderModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/MesWorkOrderModel.java
new file mode 100644
index 0000000..8b689a7
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/MesWorkOrderModel.java
@@ -0,0 +1,123 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2022/6/1 11:05
+ * @Modify:
+ **/
+@Data
+public class MesWorkOrderModel {
+
+    @ApiParam(value = "工厂代码")
+    public String organizeCode;
+
+    @ApiParam(value = "系统同步标志")
+    public Integer systemSyncStatus = 2;
+
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
+    @ApiParam("数量")
+    private Double qty;
+
+    @ApiParam("完成数量")
+    private Double completeQty;
+
+    @ApiParam("返修数量")
+    private Double repairQty;
+
+    @ApiParam("报废数量")
+    private Double scrapQty;
+
+    @ApiParam("工单序号")
+    private Double seq;
+
+    @ApiParam("工单状态")
+    private Integer workOrderStatus;
+
+    @ApiParam("是否投料")
+    private Integer isPull = 1;
+
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @ApiParam("下一工单")
+    private String nextOrder;
+
+    @ApiParam("生产计划单号")
+    private String planOrderNo;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("排产日期")
+    private String scheduleDate;
+
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
+
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @ApiParam("结束时间")
+    private String endTime;
+
+    @ApiParam("工单来源")
+    private String workOrderSource;
+
+    @ApiParam("备注")
+    private String memo;
+
+    @ApiParam("班组")
+    private String shiftGroup;
+
+    @ApiParam("审批状态")
+    private Integer approvalStatus;
+
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @ApiParam("客户订单号")
+    private String custOrderNo;
+
+    @ApiParam("首检数量")
+    private Double fiQty;
+
+    @ApiParam("首检完成数量")
+    private Double fiCompleteQty;
+
+    @ApiParam("首检生成数量")
+    private Double fiGenerateQty;
+
+    @ApiParam("父阶物料号")
+    private String parentPartNo;
+
+    @ApiParam("打印状态")
+    private Integer printStatus;
+
+    @ApiParam("排序序号")
+    private String sortSeq;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxAbnormalBusiModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxAbnormalBusiModel.java
new file mode 100644
index 0000000..d3c4bd5
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxAbnormalBusiModel.java
@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 异常联络单关联单信息
+ * @Author: puxiao
+ * @date: 2021-10-08
+ */
+@Data
+@Api("异常联络单关联单信息")
+public class SxAbnormalBusiModel implements Serializable {
+
+    @ApiParam("工厂编号")
+    private String OrganizeCode;
+
+    @ApiParam("单号")
+    private String orderNo;
+
+    @ApiParam("异常场所")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ABNORMAL_SOURCE.class, refForeignKey = "value", value = "description")
+    public Integer busiType;
+
+
+    @ApiParam("创建人")
+    public String createUser;
+
+    @ApiParam("创建时间")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改时间")
+    public String modifyDatetime;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxBatchUploadFileModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxBatchUploadFileModel.java
new file mode 100644
index 0000000..cc206ba
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxBatchUploadFileModel.java
@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("批量上传文件MODEL")
+public class SxBatchUploadFileModel implements Serializable {
+
+    private static final long serialVersionUID = 3606324303318168788L;
+
+    @ApiParam("成功数量")
+    private int successCount;
+
+    @ApiParam("失败数量")
+    private int failureCount;
+
+    @ApiParam("未上传的文件")
+    private List<String> unUploadFileList;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxCustomerComplainDefectModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxCustomerComplainDefectModel.java
new file mode 100644
index 0000000..2422bba
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxCustomerComplainDefectModel.java
@@ -0,0 +1,85 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-04-01 17:09
+ */
+@Data
+@ApiModel("客诉不良年度汇总MODEL")
+public class SxCustomerComplainDefectModel implements Serializable {
+
+    private static final long serialVersionUID = -7325785891694644797L;
+
+    @ApiParam("年份")
+    private String year;
+
+    @ApiParam("项目")
+    private String project;
+
+    @ApiParam("合计")
+    private String total = "0";
+
+    @ApiParam("四月份")
+    private String valueApr = "0";
+
+    @ApiParam("五月份")
+    private String valueMay = "0";
+
+    @ApiParam("六月份")
+    private String valueJun = "0";
+
+    @ApiParam("七月份")
+    private String valueJul = "0";
+
+    @ApiParam("八月份")
+    private String valueAug = "0";
+
+    @ApiParam("九月份")
+    private String valueSep = "0";
+
+    @ApiParam("十月份")
+    private String valueOct = "0";
+
+    @ApiParam("十一月份")
+    private String valueNov = "0";
+
+    @ApiParam("十二月份")
+    private String valueDec = "0";
+
+    @ApiParam("一月份")
+    private String valueJan = "0";
+
+    @ApiParam("二月份")
+    private String valueFeb = "0";
+
+    @ApiParam("三月份")
+    private String valueMar = "0";
+
+    public SxCustomerComplainDefectModel(String year, String project, String valueApr, String valueMay, String valueJun, String valueJul, String valueAug, String valueSep, String valueOct, String valueNov, String valueDec, String valueJan, String valueFeb, String valueMar) {
+        this.year = year;
+        this.project = project;
+        this.valueApr = valueApr;
+        this.valueMay = valueMay;
+        this.valueJun = valueJun;
+        this.valueJul = valueJul;
+        this.valueAug = valueAug;
+        this.valueSep = valueSep;
+        this.valueOct = valueOct;
+        this.valueNov = valueNov;
+        this.valueDec = valueDec;
+        this.valueJan = valueJan;
+        this.valueFeb = valueFeb;
+        this.valueMar = valueMar;
+    }
+
+    public SxCustomerComplainDefectModel() {
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxCustomerComplaintExportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxCustomerComplaintExportModel.java
new file mode 100644
index 0000000..4fe78d7
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxCustomerComplaintExportModel.java
@@ -0,0 +1,509 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-mes-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-02-14 10:15
+ */
+@Data
+@ApiModel("客诉导出信息MODEL")
+public class SxCustomerComplaintExportModel implements Serializable {
+
+    private static final long serialVersionUID = -459781765216077637L;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("创建开始时间")
+    private String createDateTimeStart;
+
+    @ApiParam("创建结束时间")
+    private String createDateTimeEnd;
+
+    @ApiParam("客诉单号")
+    private String complaintNo;
+
+    @ApiParam("客诉类型 10-异常联络，20-速报")
+    private Integer complaintType;
+
+    @ApiParam("客诉类型描述")
+    private String complaintTypeName;
+
+    @ApiParam("异常场所 10-市场不良、20-到货不良、30-受入不良、40-工程不良、50-改判")
+    private Integer abnormalSource;
+
+    @ApiParam("异常场所描述")
+    private String abnormalSourceName;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("机种编码")
+    private String machineCode;
+
+    @ApiParam("产品分类")
+    private Integer productType;
+
+    @ApiParam("产品分类描述")
+    private String productTypeName;
+
+    @ApiParam("生产线编码")
+    private String workCenterCode;
+
+    @ApiParam("客户编码")
+    private String customerNo;
+
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @ApiParam("发行日期")
+    private String publishDate;
+
+    @ApiParam("发行日期开始时间")
+    private String publishDateStart;
+
+    @ApiParam("发行日期结束时间")
+    private String publishDateEnd;
+
+    @ApiParam("预定回达日")
+    private String planArriveDate;
+
+    @ApiParam("预定回达日开始日期")
+    private String planArriveDateStart;
+
+    @ApiParam("预定回达日结束日期")
+    private String planArriveDateEnd;
+
+    @ApiParam("对应日期")
+    private String correspondingDate;
+
+    @ApiParam("对应日期开始日期")
+    private String correspondingDateStart;
+
+    @ApiParam("对应日期结束日期")
+    private String correspondingDateEnd;
+
+    @ApiParam("事业部管理NO")
+    private String departmentNo;
+
+    @ApiParam("问题点描述")
+    private String issueDesc;
+
+    @ApiParam("缺陷等级 10-轻度缺陷，20-中度缺陷，30-重度缺陷")
+    private Integer defectLevel;
+
+    @ApiParam("缺陷等级描述")
+    private String defectLevelName;
+
+    @ApiParam("件数")
+    private Integer qty;
+
+    @ApiParam("发生情况 10-初发，20-再发")
+    private Integer situation;
+
+    @ApiParam("发生情况描述")
+    private String situationName;
+
+    @ApiParam("再发次数")
+    private Integer recurTimes;
+
+    @ApiParam("生产日期")
+    private String produceDate;
+
+    @ApiParam("生产日期开始时间")
+    private String produceDateStart;
+
+    @ApiParam("生产日期结束时间")
+    private String produceDateEnd;
+
+    @ApiParam("客诉单状态 10-已创建、20-已分析、30-已整改、40-已确认")
+    private Integer complaintStatus;
+
+    @ApiParam("客诉单状态描述")
+    private String complaintStatusName;
+
+    @ApiParam("文件URL1")
+    private String fileUrl1;
+
+    @ApiParam("文件原名1")
+    private String fileOriginName1;
+
+    @ApiParam("文件URL2")
+    private String fileUrl2;
+
+    @ApiParam("文件原名1")
+    private String fileOriginName2;
+
+    @ApiParam("责任区分 10-制造、20-部品、30技术、40-其他，每个客诉单分析可选择多条原因区分项")
+    private String dutyDiff;
+
+    @ApiParam("责任区分 10-制造、20-部品、30技术、40-其他，每个客诉单分析可选择多条原因区分项")
+    private Integer dutyDiffNo;
+
+    @ApiParam("责任区分 10-制造、20-部品、30技术、40-其他，每个客诉单分析可选择多条原因区分项")
+    private String dutyDiffName;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("原因项目 10-制造-组立、20-部品-成型、30-组立、40-电装、50-熔接、60-组立、70-技术、80-设计、90-其他。原因区分子项目可多选。")
+    private String reasonProject;
+
+    @ApiParam("原因项目名称 10-制造-组立、20-部品-成型、30-组立、40-电装、50-熔接、60-组立、70-技术、80-设计、90-其他。原因区分子项目可多选。")
+    private String reasonProjectName;
+
+    @ApiParam("费用有无 10-有，20-无")
+    private Integer isCost;
+
+    @ApiParam("费用有无 10-有，20-无")
+    private String isCostName;
+
+    @ApiParam("是否实体返回 10-是，20-否")
+    private Integer isEntityReturn;
+
+    @ApiParam("是否实体返回名称 10-是，20-否")
+    private String isEntityReturnName;
+
+    @ApiParam("工程异常编号")
+    private String abnormalNo;
+
+    @ApiParam("对策前/后")
+    private Integer countermeasureAction;
+
+    @ApiParam("对策前/后 描述")
+    private String countermeasureActionName;
+
+    @ApiParam("临时对策")
+    private String temporaryDisposal;
+
+    @ApiParam("完成品区分")
+    private String finishProductDiff;
+
+    @ApiParam("到达日期")
+    private String arriveDate;
+
+    @ApiParam("再发防止（防止方法）")
+    private String preventionMethod;
+
+    @ApiParam("发生原因")
+    private String occurReason;
+
+    @ApiParam("流出原因")
+    private String outflowReason;
+
+    @ApiParam("对策")
+    private String solution;
+
+    @ApiParam("实际回答日期")
+    private String actualReplyDate;
+
+    @ApiParam("实际回答日期 开始日期")
+    private String actualReplyDateStart;
+
+    @ApiParam("实际回答日期 结束日期")
+    private String actualReplyDateEnd;
+
+    @ApiParam("回复状态")
+    private Integer replyStatus;
+
+    @ApiParam("回复状态名称")
+    private String replyStatusName;
+
+    @ApiParam("发往BD")
+    private Integer shippingBd;
+
+    @ApiParam("发往BD 10-中国语，20-日本语")
+    private String shippingBdName;
+
+    @ApiParam("备注")
+    private String remark;
+
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+//    @ApiParam("文件原名")
+//    private String fileOriginName;
+//
+//    @ApiParam("PDF文件上传时间")
+//    private String pdfFileUploadDatetime;
+
+    @ApiParam("对策确认 10-通过，20-不通过")
+    private Integer countermeasureConfirm;
+
+    @ApiParam("对策确认描述 10-通过，20-不通过")
+    private String countermeasureConfirmName;
+
+    @ApiParam("整改确认 10-通过，20-不通过")
+    private Integer abarbeitungConfirm;
+
+    @ApiParam("整改确认描述 10-通过，20-不通过")
+    private String abarbeitungConfirmName;
+
+
+    public SxCustomerComplaintExportModel() {
+    }
+
+    public SxCustomerComplaintExportModel(String complaintNo, Integer complaintType, Integer abnormalSource, String abnormalSourceName,
+                                          String partNo, String partNameRdd, String customerNo, String customerName, String publishDate,
+                                          String planArriveDate, String departmentNo, String issueDesc, Integer defectLevel, String defectLevelName,
+                                          Integer qty, Integer situation, String situationName, String produceDate, Integer complaintStatus,
+                                          String complaintStatusName, String fileUrl1, String fileUrl2, String dutyDiff, String dutyDiffName,
+                                          String reasonProject, String reasonProjectName, Integer isCost, String isCostName, Integer isEntityReturn,
+                                          String isEntityReturnName, String abnormalNo, Integer countermeasureAction, String countermeasureActionName,
+                                          String temporaryDisposal, String finishProductDiff, String actualReplyDate, Integer replyStatus,
+                                          String replyStatusName, Integer shippingBd, String shippingBdName, String remark, String fileUrl,
+                                          Integer countermeasureConfirm, String countermeasureConfirmName, Integer abarbeitungConfirm,
+                                          String abarbeitungConfirmName, String arriveDate, String preventionMethod, String occurReason,
+                                          String outflowReason, String solution) {
+        this.complaintNo = complaintNo;
+        this.complaintType = complaintType;
+        this.abnormalSource = abnormalSource;
+        this.abnormalSourceName = abnormalSourceName;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.customerNo = customerNo;
+        this.customerName = customerName;
+        this.publishDate = publishDate;
+        this.planArriveDate = planArriveDate;
+        this.departmentNo = departmentNo;
+        this.issueDesc = issueDesc;
+        this.defectLevel = defectLevel;
+        this.defectLevelName = defectLevelName;
+        this.qty = qty;
+        this.situation = situation;
+        this.situationName = situationName;
+        this.produceDate = produceDate;
+        this.complaintStatus = complaintStatus;
+        this.complaintStatusName = complaintStatusName;
+        this.fileUrl1 = fileUrl1;
+        this.fileUrl2 = fileUrl2;
+        this.dutyDiff = dutyDiff;
+        this.dutyDiffName = dutyDiffName;
+        this.reasonProject = reasonProject;
+        this.reasonProjectName = reasonProjectName;
+        this.isCost = isCost;
+        this.isCostName = isCostName;
+        this.isEntityReturn = isEntityReturn;
+        this.isEntityReturnName = isEntityReturnName;
+        this.abnormalNo = abnormalNo;
+        this.countermeasureAction = countermeasureAction;
+        this.countermeasureActionName = countermeasureActionName;
+        this.temporaryDisposal = temporaryDisposal;
+        this.finishProductDiff = finishProductDiff;
+        this.actualReplyDate = actualReplyDate;
+        this.replyStatus = replyStatus;
+        this.replyStatusName = replyStatusName;
+        this.shippingBd = shippingBd;
+        this.shippingBdName = shippingBdName;
+        this.remark = remark;
+        this.fileUrl = fileUrl;
+        this.countermeasureConfirm = countermeasureConfirm;
+        this.countermeasureConfirmName = countermeasureConfirmName;
+        this.abarbeitungConfirm = abarbeitungConfirm;
+        this.abarbeitungConfirmName = abarbeitungConfirmName;
+        this.arriveDate = arriveDate;
+        this.preventionMethod = preventionMethod;
+        this.occurReason = occurReason;
+        this.outflowReason = outflowReason;
+        this.solution = solution;
+    }
+
+    public SxCustomerComplaintExportModel(String complaintNo, Integer complaintType, Integer abnormalSource, String abnormalSourceName,
+                                          String partNo, String partNameRdd, String customerNo, String customerName, String publishDate,
+                                          String planArriveDate, String departmentNo, String issueDesc, Integer defectLevel, String defectLevelName,
+                                          Integer qty, Integer situation, String situationName, String produceDate, Integer complaintStatus,
+                                          String complaintStatusName, String fileUrl1, String fileOriginName1, String fileUrl2, String fileOriginName2, String dutyDiff, String dutyDiffName,
+                                          String reasonProject, String reasonProjectName, Integer isCost, String isCostName, Integer isEntityReturn,
+                                          String isEntityReturnName, String abnormalNo, Integer countermeasureAction, String countermeasureActionName,
+                                          String temporaryDisposal, String finishProductDiff, String actualReplyDate, Integer replyStatus,
+                                          String replyStatusName, Integer shippingBd, String shippingBdName, String remark, String fileUrl,
+                                          Integer countermeasureConfirm, String countermeasureConfirmName, Integer abarbeitungConfirm,
+                                          String abarbeitungConfirmName, String arriveDate, String preventionMethod, String occurReason,
+                                          String outflowReason, String solution, String correspondingDate, Integer productType, String machineCode, String workCenterCode) {
+        this.complaintNo = complaintNo;
+        this.complaintType = complaintType;
+        this.abnormalSource = abnormalSource;
+        this.abnormalSourceName = abnormalSourceName;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.customerNo = customerNo;
+        this.customerName = customerName;
+        this.publishDate = publishDate;
+        this.planArriveDate = planArriveDate;
+        this.departmentNo = departmentNo;
+        this.issueDesc = issueDesc;
+        this.defectLevel = defectLevel;
+        this.defectLevelName = defectLevelName;
+        this.qty = qty;
+        this.situation = situation;
+        this.situationName = situationName;
+        this.produceDate = produceDate;
+        this.complaintStatus = complaintStatus;
+        this.complaintStatusName = complaintStatusName;
+        this.fileUrl1 = fileUrl1;
+        this.fileOriginName1 = fileOriginName1;
+        this.fileOriginName2 = fileOriginName2;
+        this.fileUrl2 = fileUrl2;
+        this.dutyDiff = dutyDiff;
+        this.dutyDiffName = dutyDiffName;
+        this.reasonProject = reasonProject;
+        this.reasonProjectName = reasonProjectName;
+        this.isCost = isCost;
+        this.isCostName = isCostName;
+        this.isEntityReturn = isEntityReturn;
+        this.isEntityReturnName = isEntityReturnName;
+        this.abnormalNo = abnormalNo;
+        this.countermeasureAction = countermeasureAction;
+        this.countermeasureActionName = countermeasureActionName;
+        this.temporaryDisposal = temporaryDisposal;
+        this.finishProductDiff = finishProductDiff;
+        this.actualReplyDate = actualReplyDate;
+        this.replyStatus = replyStatus;
+        this.replyStatusName = replyStatusName;
+        this.shippingBd = shippingBd;
+        this.shippingBdName = shippingBdName;
+        this.remark = remark;
+        this.fileUrl = fileUrl;
+        this.countermeasureConfirm = countermeasureConfirm;
+        this.countermeasureConfirmName = countermeasureConfirmName;
+        this.abarbeitungConfirm = abarbeitungConfirm;
+        this.abarbeitungConfirmName = abarbeitungConfirmName;
+        this.arriveDate = arriveDate;
+        this.preventionMethod = preventionMethod;
+        this.occurReason = occurReason;
+        this.outflowReason = outflowReason;
+        this.solution = solution;
+        this.correspondingDate = correspondingDate;
+        this.productType = productType;
+        this.workCenterCode = workCenterCode;
+        this.machineCode = machineCode;
+    }
+
+    public SxCustomerComplaintExportModel(String complaintNo, Integer complaintType, Integer abnormalSource, String partNo,
+                                          String partNameRdd, String customerNo, String customerName, String publishDate,
+                                          String planArriveDate, String departmentNo, String issueDesc, Integer defectLevel,
+                                          Integer qty, Integer situation, Integer recurTimes, String produceDate,
+                                          Integer complaintStatus, String fileUrl1, String fileUrl2, String dutyDiff,
+                                          String vendorNo, String vendorName, String reasonProject, Integer isCost,
+                                          Integer isEntityReturn, String abnormalNo, Integer countermeasureAction,
+                                          String temporaryDisposal, String finishProductDiff, String actualReplyDate,
+                                          Integer replyStatus, Integer shippingBd, String remark, String fileUrl,
+                                          Integer countermeasureConfirm, Integer abarbeitungConfirm, String arriveDate,
+                                          String preventionMethod, String occurReason, String outflowReason, String solution) {
+        this.complaintNo = complaintNo;
+        this.complaintType = complaintType;
+        this.abnormalSource = abnormalSource;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.customerNo = customerNo;
+        this.customerName = customerName;
+        this.publishDate = publishDate;
+        this.planArriveDate = planArriveDate;
+        this.departmentNo = departmentNo;
+        this.issueDesc = issueDesc;
+        this.defectLevel = defectLevel;
+        this.qty = qty;
+        this.situation = situation;
+        this.produceDate = produceDate;
+        this.complaintStatus = complaintStatus;
+        this.fileUrl1 = fileUrl1;
+        this.fileUrl2 = fileUrl2;
+        this.dutyDiff = dutyDiff;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.reasonProject = reasonProject;
+        this.isCost = isCost;
+        this.isEntityReturn = isEntityReturn;
+        this.abnormalNo = abnormalNo;
+        this.countermeasureAction = countermeasureAction;
+        this.temporaryDisposal = temporaryDisposal;
+        this.finishProductDiff = finishProductDiff;
+        this.actualReplyDate = actualReplyDate;
+        this.replyStatus = replyStatus;
+        this.shippingBd = shippingBd;
+        this.remark = remark;
+        this.fileUrl = fileUrl;
+        this.countermeasureConfirm = countermeasureConfirm;
+        this.abarbeitungConfirm = abarbeitungConfirm;
+        this.recurTimes = recurTimes;
+        this.arriveDate = arriveDate;
+        this.preventionMethod = preventionMethod;
+        this.occurReason = occurReason;
+        this.outflowReason = outflowReason;
+        this.solution = solution;
+    }
+
+    public SxCustomerComplaintExportModel(String complaintNo, Integer complaintType, Integer abnormalSource, String partNo,
+                                          String partNameRdd, String customerNo, String customerName, String publishDate,
+                                          String planArriveDate, String departmentNo, String issueDesc, Integer defectLevel,
+                                          Integer qty, Integer situation, Integer recurTimes, String produceDate,
+                                          Integer complaintStatus, String fileUrl1, String fileOriginName1, String fileUrl2, String fileOriginName2, Integer dutyDiffNo,
+                                          String vendorNo, String vendorName, String reasonProject, Integer isCost,
+                                          Integer isEntityReturn, String abnormalNo, Integer countermeasureAction,
+                                          String temporaryDisposal, String finishProductDiff, String actualReplyDate,
+                                          Integer replyStatus, Integer shippingBd, String remark, String fileUrl,
+                                          Integer countermeasureConfirm, Integer abarbeitungConfirm, String arriveDate,
+                                          String preventionMethod, String occurReason, String outflowReason, String solution,
+                                          String correspondingDate, Integer productType, String machineCode, String workCenterCode) {
+        this.complaintNo = complaintNo;
+        this.complaintType = complaintType;
+        this.abnormalSource = abnormalSource;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.customerNo = customerNo;
+        this.customerName = customerName;
+        this.publishDate = publishDate;
+        this.planArriveDate = planArriveDate;
+        this.departmentNo = departmentNo;
+        this.issueDesc = issueDesc;
+        this.defectLevel = defectLevel;
+        this.qty = qty;
+        this.situation = situation;
+        this.produceDate = produceDate;
+        this.complaintStatus = complaintStatus;
+        this.fileUrl1 = fileUrl1;
+        this.fileUrl2 = fileUrl2;
+        this.dutyDiffNo = dutyDiffNo;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.reasonProject = reasonProject;
+        this.isCost = isCost;
+        this.isEntityReturn = isEntityReturn;
+        this.abnormalNo = abnormalNo;
+        this.countermeasureAction = countermeasureAction;
+        this.temporaryDisposal = temporaryDisposal;
+        this.finishProductDiff = finishProductDiff;
+        this.actualReplyDate = actualReplyDate;
+        this.replyStatus = replyStatus;
+        this.shippingBd = shippingBd;
+        this.remark = remark;
+        this.fileUrl = fileUrl;
+        this.countermeasureConfirm = countermeasureConfirm;
+        this.abarbeitungConfirm = abarbeitungConfirm;
+        this.recurTimes = recurTimes;
+        this.fileOriginName1 = fileOriginName1;
+        this.fileOriginName2 = fileOriginName2;
+        this.arriveDate = arriveDate;
+        this.preventionMethod = preventionMethod;
+        this.occurReason = occurReason;
+        this.outflowReason = outflowReason;
+        this.solution = solution;
+        this.correspondingDate = correspondingDate;
+        this.productType = productType;
+        this.machineCode = machineCode;
+        this.workCenterCode = workCenterCode;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxCustomerComplaintMasterAndAnalyseModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxCustomerComplaintMasterAndAnalyseModel.java
new file mode 100644
index 0000000..854eb49
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxCustomerComplaintMasterAndAnalyseModel.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-03-02 11:25
+ */
+public class SxCustomerComplaintMasterAndAnalyseModel {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxCustomerComplaintMonthStatisticsReportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxCustomerComplaintMonthStatisticsReportModel.java
new file mode 100644
index 0000000..172cb63
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxCustomerComplaintMonthStatisticsReportModel.java
@@ -0,0 +1,79 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("月度统计报表MODEL")
+public class SxCustomerComplaintMonthStatisticsReportModel implements Serializable {
+
+    private static final long serialVersionUID = 5611181409773398953L;
+
+    @ApiParam("展示顺序")
+    private Integer index;
+
+    @ApiParam("首列")
+    private String firstCell;
+
+    @ApiParam("项目")
+    private String projectName;
+
+    @ApiParam("年份")
+    private String year;
+
+    @ApiParam("合计")
+    private String amount;
+
+    @ApiParam("当年4月")
+    private String month4;
+
+    @ApiParam("当年5月")
+    private String month5;
+
+    @ApiParam("当年6月")
+    private String month6;
+
+    @ApiParam("当年7月")
+    private String month7;
+
+    @ApiParam("当年8月")
+    private String month8;
+
+    @ApiParam("当年9月")
+    private String month9;
+
+    @ApiParam("当年10月")
+    private String month10;
+
+    @ApiParam("当年11月")
+    private String month11;
+
+    @ApiParam("当年12月")
+    private String month12;
+
+    @ApiParam("次年1月")
+    private String month1;
+
+    @ApiParam("次年2月")
+    private String month2;
+
+    @ApiParam("次年3月")
+    private String month3;
+
+    public SxCustomerComplaintMonthStatisticsReportModel() {}
+
+    public SxCustomerComplaintMonthStatisticsReportModel(Integer index, String firstCell, String projectName, String year) {
+        this.index = index;
+        this.firstCell = firstCell;
+        this.projectName = projectName;
+        this.year = year;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxDefectModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxDefectModel.java
new file mode 100644
index 0000000..ad4e180
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxDefectModel.java
@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("缺陷信息MODEL")
+public class SxDefectModel implements Serializable {
+
+    private static final long serialVersionUID = -7182135144843839666L;
+
+    @ApiParam("ID")
+    private Long id;
+    @ApiParam("缺陷代码")
+    private String defectCode;
+    @ApiParam("缺陷名称")
+    private String defectName;
+    @ApiParam("缺陷类型")
+    private String defectType;
+    @ApiParam("缺陷类型名称")
+    private String defectTypeName;
+    @ApiParam("缺陷位置")
+    private String defectLocation;
+    @ApiParam("缺陷类型子集")
+    private List<SxDefectModel> mesDefectList;
+
+    public SxDefectModel() {
+    }
+
+    public SxDefectModel(Long id, String defectCode, String defectName, String defectType, String defectTypeName) {
+        this.id = id;
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+        this.defectType = defectType;
+        this.defectTypeName = defectTypeName;
+    }
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxDefectRateTargetModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxDefectRateTargetModel.java
new file mode 100644
index 0000000..7edbab8
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxDefectRateTargetModel.java
@@ -0,0 +1,90 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description :不良率目标表
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@Api("不良率目标表")
+public class SxDefectRateTargetModel implements Serializable {
+
+    private static final long serialVersionUID = 4950407875591740228L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("目标类型")
+    private String targetType;
+
+    @ApiParam("目标类型名称")
+    private String targetTypeName;
+
+    @ApiParam("数据类型")
+    private Integer dataType;
+
+    @ApiParam("数据类型名称")
+    private String dataTypeName;
+
+    @ApiParam("数据值")
+    private String dataValue;
+
+    @ApiParam("目标年月")
+    private String targetTime;
+
+    @ApiParam("目标值")
+    private String targetValue;
+
+    @ApiParam("工厂")
+    public String organizeCode;
+
+    @ApiParam("有效性")
+    private Integer isValid;
+
+    @ApiParam("是否已删除")
+    private Integer isDeleted;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("创建日期开始区间")
+    private String createDatetimeStart;
+
+    @ApiParam("创建日期结束区间")
+    private String createDatetimeEnd;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改日期")
+    public String modifyDatetime;
+
+    @ApiParam("目标年月起始")
+    private String targetTimeStart;
+
+    @ApiParam("目标年月截止")
+    private String targetTimeEnd;
+
+    public SxDefectRateTargetModel() {}
+
+    public SxDefectRateTargetModel(String organizeCode, Integer dataType, String dataValue, String targetType, String targetTimeStart, String targetTimeEnd) {
+        this.organizeCode = organizeCode;
+        this.dataType = dataType;
+        this.dataValue = dataValue;
+        this.targetType = targetType;
+        this.targetTimeStart = targetTimeStart;
+        this.targetTimeEnd = targetTimeEnd;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxDynamicAttributeModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxDynamicAttributeModel.java
new file mode 100644
index 0000000..1134b54
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxDynamicAttributeModel.java
@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("动态属性model")
+public class SxDynamicAttributeModel implements Serializable {
+
+    private static final long serialVersionUID = 6119313400148051654L;
+
+    @ApiParam("字段名称")
+    private String fieldName;
+
+    @ApiParam("字段代码")
+    private String fieldCode;
+
+    public SxDynamicAttributeModel() {}
+
+    public SxDynamicAttributeModel(String fieldName, String fieldCode) {
+        this.fieldName = fieldName;
+        this.fieldCode = fieldCode;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpAOGDefectCountsModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpAOGDefectCountsModel.java
new file mode 100644
index 0000000..4395244
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpAOGDefectCountsModel.java
@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-04-14 13:02
+ */
+@Data
+@ApiModel("EP到货不良统计MODEL")
+public class SxEpAOGDefectCountsModel implements Serializable {
+    private static final long serialVersionUID = -5192887679694641299L;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("生产线名称")
+    private String workCenterName;
+
+    @ApiParam("去年当月数量")
+    private Double lastMonthQty = 0.0;
+
+    @ApiParam("当年当月数量")
+    private Double curMonthQty = 0.0;
+
+    @ApiParam("去年数量")
+    private Double lastYearQty = 0.0;
+
+    @ApiParam("当年数量")
+    private Double curYearQty = 0.0;
+
+    public SxEpAOGDefectCountsModel(String workCenterCode, String workCenterName, Double lastMonthQty, Double curMonthQty, Double lastYearQty, Double curYearQty) {
+        this.workCenterCode = workCenterCode;
+        this.workCenterName = workCenterName;
+        this.lastMonthQty = lastMonthQty;
+        this.curMonthQty = curMonthQty;
+        this.lastYearQty = lastYearQty;
+        this.curYearQty = curYearQty;
+    }
+
+    public SxEpAOGDefectCountsModel() {
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpBarChartStatisticsDetailModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpBarChartStatisticsDetailModel.java
new file mode 100644
index 0000000..bde422b
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpBarChartStatisticsDetailModel.java
@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("EP柱状图不良点描述统计报表明细MODEL")
+public class SxEpBarChartStatisticsDetailModel implements Serializable {
+
+    private static final long serialVersionUID = -2248459442536385249L;
+
+    @ApiParam("项目分类")
+    private String projectCode;
+
+    @ApiParam("项目分类名称")
+    private String projectName;
+
+    @ApiParam("检查项目")
+    private String checkItem;
+
+    @ApiParam("当前年度不良数量")
+    private Integer curYearBadQty;
+
+    @ApiParam("前一年度不良数量")
+    private Integer lastYearBadQty;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpBarChartStatisticsModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpBarChartStatisticsModel.java
new file mode 100644
index 0000000..0edb581
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpBarChartStatisticsModel.java
@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("EP柱状图不良点描述统计报表MODEL")
+public class SxEpBarChartStatisticsModel implements Serializable {
+
+    private static final long serialVersionUID = -758512056848028681L;
+
+    @ApiParam("导出文件名称")
+    private String exportFileName;
+
+    @ApiParam("柱状图:上一年度数据")
+    private List<Integer> lastYearDataList;
+
+    @ApiParam("柱状图:当前年度数据")
+    private List<Integer> curYearDataList;
+
+    @ApiParam("柱状图X轴:不良项目")
+    private List<String> xList;
+
+    @ApiParam("上一年度数据柱状图名称")
+    private String lastYearDataListName;
+
+    @ApiParam("当前年度数据柱状图名称")
+    private String curYearDataListName;
+
+    @ApiParam("table动态列名")
+    private List<SxDynamicAttributeModel> attributeList;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpCDLevelLineChartStatisticsModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpCDLevelLineChartStatisticsModel.java
new file mode 100644
index 0000000..b510b97
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpCDLevelLineChartStatisticsModel.java
@@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("EP 柱状图CD等级统计报表MODEL")
+public class SxEpCDLevelLineChartStatisticsModel implements Serializable {
+
+    private static final long serialVersionUID = 7147828721167817497L;
+
+    @ApiParam("当前年度")
+    private String curYear;
+
+    @ApiParam("上一年度")
+    private String lastYear;
+
+    @ApiParam("导出文件名称")
+    private String exportFileName;
+
+    @ApiParam("上一年度不良实绩")
+    private List<Integer> lastYearDataList;
+
+    @ApiParam("当前年度不良件数")
+    private List<Integer> curYearDataList;
+
+    @ApiParam("当前年度目标")
+    private List<Integer> curYearTargetList;
+
+    @ApiParam("当前年度时间跨度:yyyy-MM")
+    private List<String> curCheckTimeList;
+
+    @ApiParam("上一年度时间跨度:yyyy-MM")
+    private List<String> lastCheckTimeList;
+
+    @ApiParam("折线图X轴:月")
+    private List<String> xList;
+
+    @ApiParam("上一年度实绩折线名称")
+    private String lastYearDataListName;
+
+    @ApiParam("当前年度不良件数折线名称")
+    private String curYearDataListName;
+
+    @ApiParam("当前年度目标折线名称")
+    private String curYearTargetListName;
+
+    @ApiParam("月度统计报表数据")
+    private List<SxMonthStatisticsReportModel> dataList;
+
+    @ApiParam("table动态列名")
+    private List<SxDynamicAttributeModel> attributeList;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpChartStatisticsParamModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpChartStatisticsParamModel.java
new file mode 100644
index 0000000..ba83a67
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpChartStatisticsParamModel.java
@@ -0,0 +1,65 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("EP出货检验不良统计参数MODEL")
+public class SxEpChartStatisticsParamModel implements Serializable {
+
+    private static final long serialVersionUID = 6139646091187186621L;
+
+    @ApiParam("机种编码")
+    private String categoryCode;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("产品分类")
+    private Integer productType;
+
+    @ApiParam("机种编码")
+    private String categoryCodeName;
+
+    @ApiParam("生产线")
+    private String workCenterName;
+
+    @ApiParam("产品分类")
+    private String productTypeName;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("查询:检验时间开始")
+    private String checkTimeStart;
+
+    @ApiParam("查询:检验时间结束")
+    private String checkTimeEnd;
+
+    @ApiParam("查询:上个年度检验时间开始")
+    private String checkTimeStartLast;
+
+    @ApiParam("查询:上个年度检验时间结束")
+    private String checkTimeEndLast;
+
+    @ApiParam("数据:年度检验时间开始")
+    private String curCheckTimeStart;
+
+    @ApiParam("数据:年度检验时间结束")
+    private String curCheckTimeEnd;
+
+    @ApiParam("数据:上个年度检验时间开始")
+    private String lastCheckTimeStart;
+
+    @ApiParam("数据:上个年度检验时间结束")
+    private String lastCheckTimeEnd;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpCustomerComplaintBadDescStatisticsModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpCustomerComplaintBadDescStatisticsModel.java
new file mode 100644
index 0000000..28281dc
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpCustomerComplaintBadDescStatisticsModel.java
@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author yixinwang
+ * @version 1.0
+ * @date 2022/4/18 15:32
+ **/
+@Data
+@ApiModel("EP客诉不良点描述统计报表MODEL")
+public class SxEpCustomerComplaintBadDescStatisticsModel implements Serializable {
+
+    private static final long serialVersionUID = -758512056848028681L;
+
+    @ApiParam("导出文件名称")
+    private String exportFileName;
+
+    @ApiParam("柱状图:上一年度数据")
+    private List<Integer> lastYearDataList;
+
+    @ApiParam("柱状图:当前年度数据")
+    private List<Integer> curYearDataList;
+
+    @ApiParam("柱状图X轴:不良项目")
+    private List<String> xList;
+
+    @ApiParam("上一年度数据柱状图名称")
+    private String lastYearDataListName;
+
+    @ApiParam("当前年度数据柱状图名称")
+    private String curYearDataListName;
+
+    @ApiParam("table动态列名")
+    private List<SxDynamicAttributeModel> attributeList;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpCustomerComplaintBadStatisticsModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpCustomerComplaintBadStatisticsModel.java
new file mode 100644
index 0000000..a825f3e
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpCustomerComplaintBadStatisticsModel.java
@@ -0,0 +1,74 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("EP客诉不良统计报表MODEL")
+public class SxEpCustomerComplaintBadStatisticsModel implements Serializable {
+
+    private static final long serialVersionUID = -7126731717065872996L;
+    @ApiParam("当前年度")
+    private String curYear;
+
+    @ApiParam("上一年度")
+    private String lastYear;
+
+    @ApiParam("导出文件名称")
+    private String exportFileName;
+
+    @ApiParam("上一年度不良实绩")
+    private List<Double> lastYearDataList;
+
+    @ApiParam("当前年度不良决算实际")
+    private List<Double> curYearDataList;
+
+    @ApiParam("当前年度目标")
+    private List<Double> curYearTargetList;
+
+    @ApiParam("当前工程不良目标")
+    private List<Double> projectBadTargetList;
+
+    @ApiParam("当前部品不良目标")
+    private List<Double> componentBadTargetList;
+
+    @ApiParam("当前技术不良目标")
+    private List<Double> technologyBadTargetList;
+
+    @ApiParam("当前其他不良目标")
+    private List<Double> otherBadTargetList;
+
+    @ApiParam("当前年度时间跨度:yyyy-MM")
+    private List<String> curCheckTimeList;
+
+    @ApiParam("上一年度时间跨度:yyyy-MM")
+    private List<String> lastCheckTimeList;
+
+    @ApiParam("折线图X轴:月")
+    private List<String> xList;
+
+    @ApiParam("上一年度实绩折线名称")
+    private String lastYearDataListName;
+
+    @ApiParam("当前年度不良件数折线名称")
+    private String curYearDataListName;
+
+    @ApiParam("当前年度目标折线名称")
+    private String curYearTargetListName;
+
+    @ApiParam("月度统计报表数据")
+    private List<SxMonthStatisticsReportModel> dataList;
+
+    @ApiParam("table动态列名")
+    private List<SxDynamicAttributeModel> attributeList;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpCustomerComplaintBadStatisticsParamModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpCustomerComplaintBadStatisticsParamModel.java
new file mode 100644
index 0000000..c43a4a8
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpCustomerComplaintBadStatisticsParamModel.java
@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("EP客诉不良统计参数MODEL")
+public class SxEpCustomerComplaintBadStatisticsParamModel implements Serializable {
+
+    private static final long serialVersionUID = -7878840936850396713L;
+    @ApiParam("机种编码")
+    private String categoryCode;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("产品分类")
+    private Integer productType;
+
+    @ApiParam("机种编码")
+    private String categoryCodeName;
+
+    @ApiParam("生产线")
+    private String workCenterName;
+
+    @ApiParam("产品分类")
+    private String productTypeName;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("查询:年份")
+    private String year;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpCustomerComplaintBadnessModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpCustomerComplaintBadnessModel.java
new file mode 100644
index 0000000..2d2d5ee
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpCustomerComplaintBadnessModel.java
@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-mes-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-04-18 11:09
+ */
+@Data
+@ApiModel("EP客诉不良点统计MODEL")
+public class SxEpCustomerComplaintBadnessModel implements Serializable {
+    private static final long serialVersionUID = 5257636147893052276L;
+
+    @ApiParam("不良点描述")
+    private String badnessCode;
+
+    @ApiParam("时间")
+    private String modifyDatetime;
+
+    public SxEpCustomerComplaintBadnessModel(String badnessCode, String modifyDatetime) {
+        this.badnessCode = badnessCode;
+        this.modifyDatetime = modifyDatetime;
+    }
+
+    public SxEpCustomerComplaintBadnessModel() {
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpCustomerComplaintDetailBadDescStatisticsModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpCustomerComplaintDetailBadDescStatisticsModel.java
new file mode 100644
index 0000000..77ebed5
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpCustomerComplaintDetailBadDescStatisticsModel.java
@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("EP客诉不良点描述统计报表MODEL")
+public class SxEpCustomerComplaintDetailBadDescStatisticsModel implements Serializable {
+
+    private static final long serialVersionUID = -2248459442536385249L;
+
+    @ApiParam("不良代码")
+    private String badnessCode;
+
+    @ApiParam("不良代码名称")
+    private String badnessName;
+
+    @ApiParam("当前年度不良数量")
+    private Integer curYearBadQty;
+
+    @ApiParam("前一年度不良数量")
+    private Integer lastYearBadQty;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpEngineeringBadClassifyStatisticsModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpEngineeringBadClassifyStatisticsModel.java
new file mode 100644
index 0000000..5791fd4
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpEngineeringBadClassifyStatisticsModel.java
@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("EP工程不良分类统计月报日报MODEL")
+public class SxEpEngineeringBadClassifyStatisticsModel implements Serializable {
+
+    private static final long serialVersionUID = 6156774232599081029L;
+
+    @ApiParam("table动态列名")
+    private List<SxDynamicAttributeModel> attributeList;
+
+    @ApiParam("table数据")
+    private List<Map<String, String>> dataList;
+
+    public SxEpEngineeringBadClassifyStatisticsModel() {}
+
+    public SxEpEngineeringBadClassifyStatisticsModel(List<SxDynamicAttributeModel> attributeList) {
+        this.attributeList = attributeList;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpLineChartStatisticsModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpLineChartStatisticsModel.java
new file mode 100644
index 0000000..7d8c4d1
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpLineChartStatisticsModel.java
@@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("EP折线图不良统计报表MODEL")
+public class SxEpLineChartStatisticsModel implements Serializable {
+
+    private static final long serialVersionUID = 7147828721167817497L;
+
+    @ApiParam("当前年度")
+    private String curYear;
+
+    @ApiParam("上一年度")
+    private String lastYear;
+
+    @ApiParam("导出文件名称")
+    private String exportFileName;
+
+    @ApiParam("上一年度不良实绩")
+    private List<String> lastYearDataList;
+
+    @ApiParam("当前年度不良件数")
+    private List<String> curYearDataList;
+
+    @ApiParam("当前年度目标")
+    private List<String> curYearTargetList;
+
+    @ApiParam("当前年度时间跨度:yyyy-MM")
+    private List<String> curCheckTimeList;
+
+    @ApiParam("上一年度时间跨度:yyyy-MM")
+    private List<String> lastCheckTimeList;
+
+    @ApiParam("折线图X轴:月")
+    private List<String> xList;
+
+    @ApiParam("上一年度实绩折线名称")
+    private String lastYearDataListName;
+
+    @ApiParam("当前年度不良件数折线名称")
+    private String curYearDataListName;
+
+    @ApiParam("当前年度目标折线名称")
+    private String curYearTargetListName;
+
+    @ApiParam("月度统计报表数据")
+    private List<SxMonthStatisticsReportModel> dataList;
+
+    @ApiParam("table动态列名")
+    private List<SxDynamicAttributeModel> attributeList;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpOqcCheckDetailModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpOqcCheckDetailModel.java
new file mode 100644
index 0000000..ae2b905
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpOqcCheckDetailModel.java
@@ -0,0 +1,128 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("出货检验检验项MODEL")
+public class SxEpOqcCheckDetailModel implements Serializable {
+
+    private static final long serialVersionUID = -428795326522481258L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("生产日期")
+    private String workTime;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @ApiParam("检验顺序")
+    private Double seq;
+
+    @ApiParam("检验单号")
+    private String oqcNo;
+
+    @ApiParam("包装条码")
+    private String packageNo;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("检验项目ID")
+    public Long pid;
+
+    @ApiParam("项目分类")
+    private String projectCode;
+
+    @ApiParam("检查内容")
+    private String checkContent;
+
+    @ApiParam("检查项目")
+    private String checkItem;
+
+    @ApiParam("判定基准")
+    private String standard;
+
+    @ApiParam("判断方式")
+    private Integer checkType;
+
+    @ApiParam("标准值")
+    private String standardValue;
+
+    @ApiParam("上限值")
+    private String upLimit;
+
+    @ApiParam("下限值")
+    private String downLimit;
+
+    @ApiParam("检查器具")
+    private String checkTool;
+
+    @ApiParam("文件ID")
+    private Long fileId;
+
+    @ApiParam("文件源名")
+    private String fileOriginName;
+
+    @ApiParam("文件地址")
+    private String fileUrl;
+
+    @ApiParam("备注")
+    private String remark;
+
+    @ApiParam("实际值")
+    private String checkValue;
+
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @ApiParam("项目检验时间")
+    private String itemCheckTime;
+
+    @ApiParam("单据检验时间")
+    private String checkTime;
+
+    @ApiParam("机种分类")
+    private String categoryCode;
+
+    @ApiParam("产品分类")
+    private Integer productType;
+
+    public SxEpOqcCheckDetailModel() {}
+
+    public SxEpOqcCheckDetailModel(Long id, String oqcNo, String workCenterCode, String partNo, String checkTime, String projectCode,
+                                   String checkItem, Integer checkResult, String categoryCode, Integer productType) {
+        this.id = id;
+        this.oqcNo = oqcNo;
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.checkTime = checkTime;
+        this.projectCode = projectCode;
+        this.checkItem = checkItem;
+        this.checkResult = checkResult;
+        this.categoryCode = categoryCode;
+        this.productType = productType;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpOqcManageCheckDetailModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpOqcManageCheckDetailModel.java
new file mode 100644
index 0000000..defd330
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpOqcManageCheckDetailModel.java
@@ -0,0 +1,88 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("出货检验项目明细MODEL")
+public class SxEpOqcManageCheckDetailModel implements Serializable {
+
+    private static final long serialVersionUID = -6337919995940618747L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("检验顺序")
+    private Double seq;
+
+    @ApiParam("项目分类")
+    private String projectCode;
+
+    @ApiParam("项目类型名称")
+    private String projectName;
+
+    @ApiParam("检查内容")
+    private String checkContent;
+
+    @ApiParam("检查项目")
+    private String checkItem;
+
+    @ApiParam("判定基准")
+    private String standard;
+
+    @ApiParam("判断方式")
+    private Integer checkType;
+
+    @ApiParam("判断方式")
+    private String checkTypeName;
+
+    @ApiParam("标准值")
+    private String standardValue;
+
+    @ApiParam("上限值")
+    private String upLimit;
+
+    @ApiParam("下限值")
+    private String downLimit;
+
+    @ApiParam("检查器具")
+    private String checkTool;
+
+    @ApiParam("是否必检")
+    private Integer isNecessary;
+
+    @ApiParam("实际值")
+    private String checkValue;
+
+    @ApiParam("判定结果")
+    private Integer checkResult;
+
+    @ApiParam("判定结果(OK/NG)")
+    private String checkResultEn;
+
+    @ApiParam("判定结果(合格/不合格)")
+    private String checkResultCn;
+
+    public String getCheckResultEn() {
+        if (checkResult == null || checkResult == 0) {
+            return "无";
+        }
+        return QmsEnumUtil.QMS_OQC_CHECK_DETAIL_RESULT.valueOfDescription(checkResult);
+    }
+
+    public String getCheckResultCn() {
+        if (checkResult == null || checkResult == 0) {
+            return "无";
+        }
+        return QmsEnumUtil.QMS_OQC_CHECK_RESULT.valueOfDescription(checkResult);
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpOqcManageModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpOqcManageModel.java
new file mode 100644
index 0000000..f4ba740
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpOqcManageModel.java
@@ -0,0 +1,156 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsOqcCheck;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("出货检验MODEL")
+public class SxEpOqcManageModel implements Serializable {
+
+    private static final long serialVersionUID = 6344556402114815989L;
+
+    @ApiParam("扫描条码")
+    private String sn;
+
+    @ApiParam("扫描条码类型:产品条码=10,包装条码=20")
+    private String snType;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @ApiParam("生产线代码")
+    private String workCenterCode;
+
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @ApiParam("工单类型")
+    private String workOrderTypeName;
+
+    @ApiParam("生产日期")
+    private String workTime;
+
+    @ApiParam("计划数量")
+    private Double qty;
+
+    @ApiParam("生产数量")
+    private Double completeQty;
+
+    @ApiParam("已检测数量")
+    private Double totalOqcQty;
+
+    @ApiParam("机种分类")
+    private String categoryCode;
+
+    @ApiParam("作成日期")
+    private String complateDate;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("包装条码")
+    private String packageNo;
+
+    @ApiParam("出货检验单号")
+    private String oqcNo;
+
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @ApiParam("检验结果")
+    private String checkResultName;
+
+    @ApiParam("检验结果背景色")
+    private String checkResultColor;
+
+    @ApiParam("原因区分")
+    private String dutyDiff;
+
+    @ApiParam("合格按钮")
+    private Boolean qualifiedButton = false;
+
+    @ApiParam("不合格按钮")
+    private Boolean unQualifiedButton = false;
+
+    @ApiParam("生成检验单按钮")
+    private Boolean genOqcCheckButton = false;
+
+    @ApiParam("重载检验项按钮")
+    private Boolean reloadCheckDetailButton = false;
+
+    @ApiParam("重置按钮")
+    private Boolean resetButton = true;
+
+    @ApiParam("扫描条码类型下拉框")
+    private Boolean typeSelect = true;
+
+    @ApiParam("条码输入框")
+    private Boolean snInput = true;
+
+    @ApiParam("查询按钮")
+    private Boolean queryButton = true;
+
+    @ApiParam("原因区分下拉框")
+    private Boolean dutyDiffSelect = false;
+
+    @ApiParam("出货检验项目明细(必检)")
+    private List<SxEpOqcManageCheckDetailModel> checkDetailList;
+
+    @ApiParam("出货检验项目明细(不必检)")
+    private List<SxEpOqcManageCheckDetailModel> checkDetailList2;
+
+    @ApiParam("一个包装对应的多个产品条码集合")
+    private List<String> serialNumberList;
+
+    @ApiParam("下线产品集合")
+    private List<Map<String, String>> prodMapList;
+
+    @ApiParam("用户ID")
+    private Long userId;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("用户")
+    private String userInfo;
+
+    @ApiParam("出货检验单据集合")
+    private List<SxQmsOqcCheck> oqcCheckDbList;
+
+    @ApiParam("上传时间")
+    private String uploadDatetime;
+
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @ApiParam("文件源名")
+    private String fileOriginName;
+
+    @ApiParam("备注")
+    private String remark;
+
+    //false代表不能点   true代表可以点
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpOqcReportExportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpOqcReportExportModel.java
new file mode 100644
index 0000000..fe4b851
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpOqcReportExportModel.java
@@ -0,0 +1,151 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("EP出货检验报表MODEL")
+public class SxEpOqcReportExportModel implements Serializable {
+
+    private static final long serialVersionUID = 2558635315074435347L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("单据号")
+    private String oqcNo;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @ApiParam("计划数量")
+    private Double qty;
+
+    @ApiParam("包装条码")
+    private String packageNo;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("检测方式")
+    private Integer oqcType;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("检测数量")
+    private Double oqcQty;
+
+    @ApiParam("生产日期")
+    private String workTime;
+
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("原因区分")
+    private String dutyDiff;
+
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @ApiParam("检验人")
+    private String checkUser;
+
+    @ApiParam("检验时间")
+    private String checkTime;
+
+    @ApiParam("检验时间bak")
+    private String checkTimeBak;
+
+    @ApiParam("备注")
+    private String remark;
+
+    @ApiParam("机种分类")
+    private String categoryCode;
+
+    @ApiParam("产品分类")
+    private Integer productType;
+
+    @ApiParam("机种分类")
+    private String categoryCodeName;
+
+    @ApiParam("产品分类")
+    private String productTypeName;
+
+    @ApiParam("工单类型")
+    private String workOrderTypeName;
+
+    @ApiParam("检验结果")
+    private String checkResultName;
+
+    @ApiParam("检测方式")
+    private String oqcTypeName;
+
+    @ApiParam("原因区分")
+    private String dutyDiffName;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("检验时间开始")
+    private String checkTimeStart;
+
+    @ApiParam("检验时间结束")
+    private String checkTimeEnd;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+    @ApiParam("查询维度")
+    private Integer dimension;
+
+    @ApiParam("查询维度")
+    private Integer dimension1;
+
+    @ApiParam("上个年度检验时间开始")
+    private String lastCheckTimeStart;
+
+    @ApiParam("上个年度检验时间结束")
+    private String lastCheckTimeEnd;
+
+    @ApiParam("环境")
+    private Integer environment;
+
+    @ApiParam("温度")
+    private Integer temperature;
+
+    @ApiParam("湿度")
+    private Integer humidity;
+
+    @ApiParam("颜色")
+    private String color;
+
+    @ApiParam("购入方")
+    private String buyParty;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpOqcReportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpOqcReportModel.java
new file mode 100644
index 0000000..5664f57
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpOqcReportModel.java
@@ -0,0 +1,182 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("EP出货检验报表MODEL")
+public class SxEpOqcReportModel implements Serializable {
+
+    private static final long serialVersionUID = -3255659159101689455L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("单据号")
+    private String oqcNo;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @ApiParam("计划数量")
+    private Double qty;
+
+    @ApiParam("包装条码")
+    private String packageNo;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("检测方式")
+    private Integer oqcType;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("检测数量")
+    private Double oqcQty;
+
+    @ApiParam("生产日期")
+    private String workTime;
+
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("原因区分")
+    private String dutyDiff;
+
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @ApiParam("检验人")
+    private String checkUser;
+
+    @ApiParam("检验时间")
+    private String checkTime;
+
+    @ApiParam("检验时间bak")
+    private String checkTimeBak;
+
+    @ApiParam("备注")
+    private String remark;
+
+    @ApiParam("机种分类")
+    private String categoryCode;
+
+    @ApiParam("产品分类")
+    private Integer productType;
+
+    @ApiParam("机种分类")
+    private String categoryCodeName;
+
+    @ApiParam("产品分类")
+    private String productTypeName;
+
+    @ApiParam("工单类型")
+    private String workOrderTypeName;
+
+    @ApiParam("检验结果")
+    private String checkResultName;
+
+    @ApiParam("检测方式")
+    private String oqcTypeName;
+
+    @ApiParam("原因区分")
+    private String dutyDiffName;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("检验时间开始")
+    private String checkTimeStart;
+
+    @ApiParam("检验时间结束")
+    private String checkTimeEnd;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+    @ApiParam("查询维度")
+    private Integer dimension;
+
+    @ApiParam("查询维度")
+    private Integer dimension1;
+
+    @ApiParam("上个年度检验时间开始")
+    private String lastCheckTimeStart;
+
+    @ApiParam("上个年度检验时间结束")
+    private String lastCheckTimeEnd;
+
+    public SxEpOqcReportModel() {}
+
+    public SxEpOqcReportModel(Long id, String oqcNo, String workOrderNo, Integer workOrderType, Double qty, String packageNo, String serialNumber,
+                              Integer oqcType, String partNo, String partNameRdd, Double oqcQty, String workTime, String shiftCode, String workCenterCode,
+                              String dutyDiff, Integer checkResult, String checkUser, String checkTime, String remark, String categoryCode, Integer productType,
+                              String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+        this.id = id;
+        this.oqcNo = oqcNo;
+        this.workOrderNo = workOrderNo;
+        this.workOrderType = workOrderType;
+        this.qty = qty;
+        this.packageNo = packageNo;
+        this.serialNumber = serialNumber;
+        this.oqcType = oqcType;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.oqcQty = oqcQty;
+        this.workTime = workTime;
+        this.shiftCode = shiftCode;
+        this.workCenterCode = workCenterCode;
+        this.dutyDiff = dutyDiff;
+        this.checkResult = checkResult;
+        this.checkUser = checkUser;
+        this.checkTime = checkTime;
+        this.remark = remark;
+        this.categoryCode = categoryCode;
+        this.productType = productType;
+        this.organizeCode = organizeCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
+
+    public SxEpOqcReportModel(String oqcNo, String partNo, String workCenterCode, String dutyDiff, Integer checkResult, String checkTime, String categoryCode, Integer productType) {
+        this.oqcNo = oqcNo;
+        this.partNo = partNo;
+        this.workCenterCode = workCenterCode;
+        this.dutyDiff = dutyDiff;
+        this.checkResult = checkResult;
+        this.checkTime = checkTime;
+        this.categoryCode = categoryCode;
+        this.productType = productType;
+    }
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpPackageModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpPackageModel.java
new file mode 100644
index 0000000..1002808
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpPackageModel.java
@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @USER: wangjie
+ * @DATE: 2022-02-14 10:15
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("包装信息MODEL")
+public class SxEpPackageModel implements Serializable {
+
+    private static final long serialVersionUID = -459781765216077637L;
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("数量")
+    private Double qty;
+
+    @ApiParam("批号")
+    private String lotNo;
+
+    @ApiParam("是否封箱")
+    private Integer isSealed;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("入库时间")
+    private String inLocationTime;
+
+    @ApiParam("生产日期")
+    private String workTime;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpPieChartStatisticsDetailModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpPieChartStatisticsDetailModel.java
new file mode 100644
index 0000000..6b29565
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpPieChartStatisticsDetailModel.java
@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("EP饼图不良明细统计报表MODEL")
+public class SxEpPieChartStatisticsDetailModel implements Serializable {
+
+    private static final long serialVersionUID = 6799725827218809183L;
+
+    @ApiParam("项目分类")
+    private String projectCode;
+
+    @ApiParam("项目分类名称")
+    private String projectName;
+
+    @ApiParam("检查项目")
+    private String checkItem;
+
+    @ApiParam("不良数量")
+    private Integer badQty;
+
+    @ApiParam("占比")
+    private String rate;
+
+    @ApiParam("颜色")
+    private String color;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpPieChartStatisticsModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpPieChartStatisticsModel.java
new file mode 100644
index 0000000..b713d37
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpPieChartStatisticsModel.java
@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("EP饼图不良明细统计报表MODEL")
+public class SxEpPieChartStatisticsModel implements Serializable {
+
+    private static final long serialVersionUID = -5452254043446505254L;
+
+    @ApiParam("导出文件名称")
+    private String exportFileName;
+
+    @ApiParam("总不良数量")
+    private Integer totalBadQty;
+
+    @ApiParam("饼图外圈数据及TABLE的数据")
+    private List<SxEpPieChartStatisticsDetailModel> dataList;
+
+    @ApiParam("饼图内圈数据")
+    private List<SxEpPieChartStatisticsDetailModel> innerDataList;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpProductBatchesDefectCountsModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpProductBatchesDefectCountsModel.java
new file mode 100644
index 0000000..0f01bc4
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpProductBatchesDefectCountsModel.java
@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-04-14 13:02
+ */
+@Data
+@ApiModel("EP到货不良统计MODEL")
+public class SxEpProductBatchesDefectCountsModel implements Serializable {
+    private static final long serialVersionUID = -5192887679694641299L;
+
+    @ApiParam("产品类型")
+    private String productType;
+
+    @ApiParam("去年当月总数量")
+    private Double lastMonthManQcCounts;
+
+    @ApiParam("当年当月不良数量")
+    private Double curMonthManQcCounts;
+
+    @ApiParam("去年当月不良数量")
+    private Double lastMonthNcCounts;
+
+    @ApiParam("当年当月不良数量")
+    private Double curMonthNcCounts;
+
+    @ApiParam("当年当月不良数量")
+    private Double lastYearManQcCounts;
+
+    @ApiParam("当年总数量")
+    private Double curYearManQcCounts;
+
+    @ApiParam("去年不良总数量")
+    private Double lastYearNcCounts;
+
+    @ApiParam("当年不良数量")
+    private Double curYearNcCounts;
+
+    public SxEpProductBatchesDefectCountsModel(String productType, Double lastMonthManQcCounts, Double curMonthManQcCounts, Double lastMonthNcCounts, Double curMonthNcCounts, Double lastYearManQcCounts, Double curYearManQcCounts, Double lastYearNcCounts, Double curYearNcCounts) {
+        this.productType = productType;
+        this.lastMonthManQcCounts = lastMonthManQcCounts;
+        this.curMonthManQcCounts = curMonthManQcCounts;
+        this.lastMonthNcCounts = lastMonthNcCounts;
+        this.curMonthNcCounts = curMonthNcCounts;
+        this.lastYearManQcCounts = lastYearManQcCounts;
+        this.curYearManQcCounts = curYearManQcCounts;
+        this.lastYearNcCounts = lastYearNcCounts;
+        this.curYearNcCounts = curYearNcCounts;
+    }
+
+    public SxEpProductBatchesDefectCountsModel() {
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpQualityIncatorsMonitoringStatisticsModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpQualityIncatorsMonitoringStatisticsModel.java
new file mode 100644
index 0000000..f026822
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpQualityIncatorsMonitoringStatisticsModel.java
@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("EP到货不良统计MODEL")
+public class SxEpQualityIncatorsMonitoringStatisticsModel implements Serializable {
+
+    private static final long serialVersionUID = -7126731717065872996L;
+    @ApiParam("当前年度")
+    private String curYear;
+
+    @ApiParam("上一年度")
+    private String lastYear;
+
+    @ApiParam("前年度")
+    private String yearBeforeLast;
+
+    @ApiParam("当前月份")
+    private String curMonth;
+
+    @ApiParam("导出文件名称")
+    private String exportFileName;
+
+    @ApiParam("当前年度时间跨度:yyyy-MM")
+    private List<String> curCheckTimeList;
+
+    @ApiParam("上一年度时间跨度:yyyy-MM")
+    private List<String> lastCheckTimeList;
+
+    @ApiParam("月度统计报表数据")
+    private List<SxEpQualityIndicatorsMonitoringParamModel> dataList;
+
+    @ApiParam("带年月标题")
+    private Map<String, String> titleMap;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpQualityIndicatorsMonitoringParamModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpQualityIndicatorsMonitoringParamModel.java
new file mode 100644
index 0000000..b3227ad
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpQualityIndicatorsMonitoringParamModel.java
@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-04-14 10:59
+ */
+@Data
+@ApiModel("EP到货不良统计参数MODEL")
+public class SxEpQualityIndicatorsMonitoringParamModel implements Serializable {
+
+    private static final long serialVersionUID = -4534432701352198226L;
+
+    @ApiParam("项目类型")
+    private String projectName;
+
+    @ApiParam("项目名称")
+    private String projectType;
+
+    @ApiParam("年度计划")
+    private String yearPlan;
+
+    @ApiParam("去年同期月份实绩")
+    private String lastMonthData;
+
+    @ApiParam("当年当月实绩")
+    private String curMonthData;
+
+    @ApiParam("当月计划比")
+    private String curMonthPlanThan;
+
+    @ApiParam("当月计划比达成情况")
+    private String curMonthPlanThanComplete;
+
+    @ApiParam("月份前年比")
+    private String monthYearBeforeThan;
+
+    @ApiParam("前年比达成情况")
+    private String monthYearBeforeThanComplete;
+
+    @ApiParam("去年实绩")
+    private String lastYearData;
+
+    @ApiParam("当年实绩")
+    private String curYearData;
+
+    @ApiParam("计划比")
+    private String yearPlanThan;
+
+    @ApiParam("计划比达成情况")
+    private String yearPlanThanComplete;
+
+    @ApiParam("前年比")
+    private String yearBeforeThan;
+
+    @ApiParam("前年比达成情况")
+    private String curYearBeforeThanComplete;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpVendorDefectParamModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpVendorDefectParamModel.java
new file mode 100644
index 0000000..2268c6e
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpVendorDefectParamModel.java
@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-05-03 1:38
+ */
+@Data
+@ApiModel("EP供应商不良统计分析报表查询参数MODEL")
+public class SxEpVendorDefectParamModel implements Serializable {
+
+    private static final long serialVersionUID = 8634260007231806572L;
+    @ApiParam("供应商编码")
+    private String vendorCode;
+
+    @ApiParam("创建开始时间")
+    private String createDateTimeStart;
+
+    @ApiParam("创建结束时间")
+    private String createDateTimeEnd;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("机种代码")
+    private String machineCode;
+
+    @ApiParam("产品类型")
+    private Integer productType;
+
+    @ApiParam("产品阶段")
+    private Integer productStage;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("是否有效")
+    private Integer isValid;
+
+    @ApiParam("是否删除")
+    private Integer isDeleted;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpVqeAbnormalConfirmModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpVqeAbnormalConfirmModel.java
new file mode 100644
index 0000000..5a06b2a
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpVqeAbnormalConfirmModel.java
@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Api("供应商业绩异常联络单确认model")
+@Data
+public class SxEpVqeAbnormalConfirmModel {
+
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("异常联络单号")
+    private String orderNo;
+
+    @ApiParam("确认类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ABNORMAL_CONFIRM_TYPE.class)
+    private Integer confirmType;
+
+    @ApiParam("确认意见")
+    private String confirmIdea;
+
+    @ApiParam("对策接收确定")
+    private String gameAcceptanceConfirm;
+
+    @ApiParam("效果改善确定")
+    private String improvementEffectConfirm;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpVqeDefectModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpVqeDefectModel.java
new file mode 100644
index 0000000..ca16edb
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpVqeDefectModel.java
@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-05-03 22:46
+ */
+@Data
+@ApiModel("EP供应商不良统计分析报表MODEL")
+public class SxEpVqeDefectModel implements Serializable {
+
+    private static final long serialVersionUID = -8312606110597429157L;
+    @ApiParam("供应商编码")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("不良分类")
+    private String projectName;
+
+    @ApiParam("产品分类")
+    private Integer productType;
+
+    @ApiParam("产品阶段")
+    private Integer productStage;
+
+    @ApiParam("创建开始时间")
+    private String createDatetime;
+
+    public SxEpVqeDefectModel(String vendorCode, String vendorName, String partNo, String partNameRdd, String projectName, Integer productType, Integer productStage, String createDatetime) {
+        this.vendorCode = vendorCode;
+        this.vendorName = vendorName;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.projectName = projectName;
+        this.productType = productType;
+        this.productStage = productStage;
+        this.createDatetime = createDatetime;
+    }
+
+    public SxEpVqeDefectModel() {
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpVqeEvaluateYearReportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpVqeEvaluateYearReportModel.java
new file mode 100644
index 0000000..14d62ec
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpVqeEvaluateYearReportModel.java
@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("EP供应商Q评价年报MODEL")
+public class SxEpVqeEvaluateYearReportModel implements Serializable {
+
+    private static final long serialVersionUID = 6156774232599081029L;
+
+    @ApiParam("table动态列名")
+    private List<SxDynamicAttributeModel> attributeList;
+
+    @ApiParam("table数据")
+    private List<Map<String, String>> dataList;
+
+    @ApiParam("分页数据")
+    private Pager pager;
+
+    public SxEpVqeEvaluateYearReportModel() {}
+
+    public SxEpVqeEvaluateYearReportModel(List<SxDynamicAttributeModel> attributeList) {
+        this.attributeList = attributeList;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpVqeEvaluateYearReportParamModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpVqeEvaluateYearReportParamModel.java
new file mode 100644
index 0000000..7d94a15
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEpVqeEvaluateYearReportParamModel.java
@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-04-21 17:02
+ */
+@Data
+@ApiModel("供应商Q评价年报参数 MODEL")
+public class SxEpVqeEvaluateYearReportParamModel implements Serializable {
+
+    private static final long serialVersionUID = -5623317136022776598L;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("评价等级(只可选CD)")
+    private String level;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("查询:检验时间开始")
+    private String checkTimeStart;
+
+    @ApiParam("查询:检验时间结束")
+    private String checkTimeEnd;
+
+    @ApiParam("查询:上个年度检验时间开始")
+    private String checkTimeStartLast;
+
+    @ApiParam("查询:上个年度检验时间结束")
+    private String checkTimeEndLast;
+
+    @ApiParam("数据:年度检验时间开始")
+    private String curCheckTimeStart;
+
+    @ApiParam("数据:年度检验时间结束")
+    private String curCheckTimeEnd;
+
+    @ApiParam("数据:上个年度检验时间开始")
+    private String lastCheckTimeStart;
+
+    @ApiParam("数据:上个年度检验时间结束")
+    private String lastCheckTimeEnd;
+
+    @ApiParam("松下年")
+    private String year;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEvaluationManageModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEvaluationManageModel.java
new file mode 100644
index 0000000..0b9e1d5
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxEvaluationManageModel.java
@@ -0,0 +1,166 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @USER: wangjie
+ * @DATE: 2022-02-14 10:15
+ */
+@Data
+@ApiModel("评价管理MODEL")
+public class SxEvaluationManageModel implements Serializable {
+
+    private static final long serialVersionUID = 4328604958454074274L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("id")
+    private String idStr;
+
+    @ApiParam("申请编号")
+    private String applyNo;
+
+    @ApiParam("部门代码")
+    private String departmentCode;
+
+    @ApiParam("产品分类")
+    private Integer productType;
+
+    @ApiParam("BU产品分类")
+    private String buProductType;
+
+    @ApiParam("原因分类")
+    private Integer causeType;
+
+    @ApiParam("原因分类")
+    private String buCauseType;
+
+    @ApiParam("申请人")
+    private String applyUser;
+
+    @ApiParam("申请内容")
+    private String applyContent;
+
+    @ApiParam(value = "申请日期")
+    private String applyDatetime;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam(value = "样品预交日期")
+    private String samplePreDatetime;
+
+    @ApiParam(value = "样品实交日期")
+    private String sampleRealDatetime;
+
+    @ApiParam(value = "评价人")
+    private String evaluationUser;
+
+    @ApiParam(value = "评价时间")
+    private String evaluationDatetime;
+
+    @ApiParam("评价结果")
+    private String evaluationContent;
+
+    @ApiParam(value = "关联编号")
+    private String relateNo;
+
+    @ApiParam(value = "结果输出时间")
+    private String checkDatetime;
+
+    @ApiParam("备注")
+    private String remark;
+
+    @ApiParam("上传时间")
+    private String uploadDatetime;
+
+    @ApiParam("文件ID")
+    private Long fileId;
+
+    @ApiParam("文件源名")
+    private String fileOriginName;
+
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+    @ApiParam("部门名称")
+    private String departmentName;
+
+    @ApiParam("产品分类")
+    private String productTypeName;
+
+    @ApiParam("原因分类")
+    private String causeTypeName;
+
+    @ApiParam("申请日期起始")
+    public String applyDatetimeStart;
+
+    @ApiParam("申请日期截止")
+    public String applyDatetimeEnd;
+
+    @ApiParam("评价时间起始")
+    public String evaluationDatetimeStart;
+
+    @ApiParam("评价时间截止")
+    public String evaluationDatetimeEnd;
+
+    @ApiParam("结果输出时间起始")
+    public String checkDatetimeStart;
+
+    @ApiParam("结果输出时间截止")
+    public String checkDatetimeEnd;
+
+    @ApiParam("排序属性")
+    public String orderByParam = "";
+
+    @ApiParam(
+            value = "排序类型，1 正序，2 倒序",
+            example = "1"
+    )
+    public transient Integer ascOrDesc = 1;
+
+    public String orderBy() {
+        String result = "";
+        if (this.orderByParam != null && this.orderByParam.trim().length() > 0) {
+            result = " order by " + this.orderByParam;
+            if (this.ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
+                result = result + " asc";
+            } else {
+                result = result + " desc";
+            }
+        }
+
+        return result;
+    }
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxExcelImportErrorExtModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxExcelImportErrorExtModel.java
new file mode 100644
index 0000000..695ac45
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxExcelImportErrorExtModel.java
@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes导入异常结果model")
+public class SxExcelImportErrorExtModel implements Serializable {
+
+    @ApiParam("错误的行号")
+    private int rowNum;
+
+    @ApiParam("错误数量")
+    private int errorNum;
+
+    @ApiParam("错误列号")
+    private String cellNum;
+
+    @ApiParam("错误描述")
+    private String errorInfo;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxExcelImportResultExtModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxExcelImportResultExtModel.java
new file mode 100644
index 0000000..5c8038e
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxExcelImportResultExtModel.java
@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes导入结果model")
+public class SxExcelImportResultExtModel<T> implements Serializable {
+
+    @ApiParam("结果")
+    private boolean result;
+
+    @ApiParam("成功行数量")
+    private int successRowNum;
+
+    @ApiParam("失败行数量")
+    private int failRowNum;
+
+    @ApiParam("错误信息集合")
+    private List<SxExcelImportErrorExtModel> excelImportErrorModels;
+
+    @ApiParam("错误的行号")
+    private String errorRows;
+
+    @ApiParam("导入数据集合")
+    private List<T> excelList;
+
+    @ApiParam("导入进度")
+    private String importSpeed;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxGridModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxGridModel.java
new file mode 100644
index 0000000..4b6c214
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxGridModel.java
@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *  @Description: 图表model
+ * @author puxiao.liao
+ * @version 1.0
+ * @date 2022-04-14 15:32
+ **/
+@Data
+@ApiModel("图表model")
+public class SxGridModel {
+
+    @ApiParam("名称")
+    private String name;
+
+    @ApiParam("x轴数据")
+    private List<Object> xAxis;
+
+    @ApiParam("y轴数据")
+    private List<Object> yAxis;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxHappenStationModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxHappenStationModel.java
new file mode 100644
index 0000000..b3fd800
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxHappenStationModel.java
@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("发生岗位model")
+public class SxHappenStationModel implements Serializable {
+
+    private static final long serialVersionUID = 8662071628239289460L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam(value = "产线代码")
+    private String workCenterCode;
+
+    @ApiParam(value = "工位代码")
+    public String workCellCode;
+
+    @ApiParam("发生岗位")
+    private String happenStation;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("有效性")
+    public Integer isValid;
+
+    @ApiParam("是否已删除")
+    public Integer isDeleted;
+
+    @ApiParam("创建用户")
+    public String createUser;
+
+    @ApiParam("创建日期")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改日期")
+    public String modifyDatetime;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxLimitColorCfgModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxLimitColorCfgModel.java
new file mode 100644
index 0000000..4ab3f50
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxLimitColorCfgModel.java
@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @USER: wangjie
+ * @DATE: 2022-02-14 10:15
+ */
+@Data
+@ApiModel("RoHS检测管理MODEL")
+public class SxLimitColorCfgModel implements Serializable {
+
+    private static final long serialVersionUID = -5396182030572815191L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("id")
+    private String idStr;
+
+    @ApiParam("功能模块")
+    private Integer module;
+
+    @ApiParam("上限值")
+    private String upLimit;
+
+    @ApiParam("下限值")
+    private String downLimit;
+
+    @ApiParam("颜色代码")
+    private String colorCode;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+    @ApiParam("功能模块")
+    private String moduleName;
+
+    @ApiParam("颜色名称")
+    private String colorName;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxManagementTestMonitoringModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxManagementTestMonitoringModel.java
new file mode 100644
index 0000000..16dc946
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxManagementTestMonitoringModel.java
@@ -0,0 +1,112 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @USER: wangjie
+ * @DATE: 2022-02-14 10:15
+ */
+@Data
+@ApiModel("管理试验监控MODEL")
+public class SxManagementTestMonitoringModel implements Serializable {
+
+    private static final long serialVersionUID = -7561526699456171201L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("id")
+    private String idStr;
+
+    @ApiParam("管理编号")
+    private String managementNo;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("产品分类")
+    private Integer productType;
+
+    @ApiParam("产品分类描述")
+    private String productTypeName;
+
+    @ApiParam("机种编码")
+    private String machineCode;
+
+    @ApiParam(value = "机种名称")
+    private String machineName;
+
+    @ApiParam("检查区分")
+    private String checkDiff;
+
+    @ApiParam("检查区分描述")
+    private String checkDiffName;
+
+    @ApiParam(value = "类别")
+    private String category;
+
+    @ApiParam(value = "类别名称")
+    private String categoryName;
+
+    @ApiParam("管理试验项目")
+    private String managementPilotProject;
+
+    @ApiParam(value = "检测频度")
+    private Integer checkFrequency;
+
+    @ApiParam(value = "检测日期")
+    private String checkDatetime;
+
+    @ApiParam(value = "检测确认")
+    private Integer checkStatus;
+
+    @ApiParam(value = "检测确认描述")
+    private String checkStatusName;
+
+    @ApiParam(value = "检测确认日期")
+    private String checkedDatetime;
+
+    @ApiParam(value = "检测确认人")
+    private String checkedUser;
+
+    @ApiParam(value = "检测提醒")
+    private Integer checkRemind;
+
+    @ApiParam(value = "检测提醒颜色")
+    private String checkRemindColor;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("是否有效")
+    private Integer isValid;
+
+    @ApiParam("是否删除")
+    private Integer isDeleted;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxModuleExcelManageModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxModuleExcelManageModel.java
new file mode 100644
index 0000000..a46cee4
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxModuleExcelManageModel.java
@@ -0,0 +1,70 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("模块EXCEL管理")
+public class SxModuleExcelManageModel implements Serializable {
+
+    private static final long serialVersionUID = 1709954542566331639L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("模块代码")
+    private String moduleCode;
+
+    @ApiParam("模块名称")
+    private String moduleName;
+
+    @ApiParam("文件ID")
+    private Long fileId;
+
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @ApiParam("文件原名")
+    private String fileOriginName;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+    public SxModuleExcelManageModel() {
+    }
+
+    public SxModuleExcelManageModel(Long id, String moduleCode, String moduleName, Long fileId, String fileUrl, String fileOriginName,
+                                    String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+        this.id = id;
+        this.moduleCode = moduleCode;
+        this.moduleName = moduleName;
+        this.fileId = fileId;
+        this.fileUrl = fileUrl;
+        this.fileOriginName = fileOriginName;
+        this.organizeCode = organizeCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxMonitorManageModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxMonitorManageModel.java
new file mode 100644
index 0000000..49f0bc6
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxMonitorManageModel.java
@@ -0,0 +1,172 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @USER: wangjie
+ * @DATE: 2022-02-14 10:15
+ */
+@Data
+@ApiModel("RoHS检测/管理试验监控 管理MODEL")
+public class SxMonitorManageModel implements Serializable {
+
+    private static final long serialVersionUID = -4239047036461795363L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("id")
+    private String idStr;
+
+    @ApiParam(value = "模块")
+    private Integer module;
+
+    @ApiParam("编号")
+    private String manageNo;
+
+//    @ApiParam("检测时间")
+//    private String checkDateTime;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("产品分类")
+    private Integer productType;
+
+    @ApiParam("机种编码")
+    private String machineCode;
+
+    @ApiParam(value = "机种名称")
+    private String machineName;
+
+    @ApiParam(value = "分类")
+    private Integer classify;
+
+    @ApiParam(value = "等级")
+    private Integer level;
+
+    @ApiParam(value = "检测频度")
+    private Integer checkFrequency;
+
+    @ApiParam(value = "计划检测日期")
+    private String checkDatetime;
+
+    @ApiParam(value = "检测确认日期")
+    private String checkedDatetime;
+
+    @ApiParam(value = "检测确认计划日期")
+    private String checkedFreDatetime;
+
+    @ApiParam(value = "检测确认人")
+    private String checkedUser;
+
+    @ApiParam("检查区分")
+    private String checkDiff;
+
+    @ApiParam("类别")
+    private String category;
+
+    @ApiParam("管理试验项目")
+    private String projectName;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("是否有效")
+    private Integer isValid;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+    @ApiParam("产品分类")
+    private String productTypeName;
+
+    @ApiParam("分类")
+    private String classifyName;
+
+    @ApiParam("检查区分")
+    private String checkDiffName;
+
+    @ApiParam("类别")
+    private String categoryName;
+
+    @ApiParam(value = "等级")
+    private String levelName;
+
+    @ApiParam(value = "检测提醒")
+    private Integer checkRemind;
+
+    @ApiParam(value = "检测提醒颜色")
+    private String checkRemindColor;
+
+    @ApiParam(value = "检测提醒")
+    private Integer phthalatesCheckRemind;
+
+    @ApiParam(value = "邻苯检测提醒颜色")
+    private String phthalatesCheckRemindColor;
+
+    @ApiParam("计划检测日期起始")
+    public String checkDatetimeStart;
+
+    @ApiParam("计划检测日期截止")
+    public String checkDatetimeEnd;
+
+    @ApiParam("检测确认日期起始")
+    public String checkedDatetimeStart;
+
+    @ApiParam("检测确认日期截止")
+    public String checkedDatetimeEnd;
+
+    @ApiParam("检测确认计划日期起始")
+    public String checkedFreDatetimeStart;
+
+    @ApiParam("检测确认计划日期截止")
+    public String checkedFreDatetimeEnd;
+
+    @ApiParam("排序属性")
+    public String orderByParam = "";
+
+    @ApiParam(
+            value = "排序类型，1 正序，2 倒序",
+            example = "1"
+    )
+    public transient Integer ascOrDesc = 1;
+
+    public String orderBy() {
+        String result = "";
+        if (this.orderByParam != null && this.orderByParam.trim().length() > 0) {
+            result = " order by " + this.orderByParam;
+            if (this.ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
+                result = result + " asc";
+            } else {
+                result = result + " desc";
+            }
+        }
+
+        return result;
+    }
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxMonthStatisticsReportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxMonthStatisticsReportModel.java
new file mode 100644
index 0000000..252aa0e
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxMonthStatisticsReportModel.java
@@ -0,0 +1,75 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("月度统计报表MODEL")
+public class SxMonthStatisticsReportModel implements Serializable {
+
+    private static final long serialVersionUID = 5611181409773398953L;
+
+    @ApiParam("展示顺序")
+    private Integer index;
+
+    @ApiParam("首列")
+    private String firstCell;
+
+    @ApiParam("项目")
+    private String projectName;
+
+    @ApiParam("合计")
+    private String amount;
+
+    @ApiParam("当年4月")
+    private String month4;
+
+    @ApiParam("当年5月")
+    private String month5;
+
+    @ApiParam("当年6月")
+    private String month6;
+
+    @ApiParam("当年7月")
+    private String month7;
+
+    @ApiParam("当年8月")
+    private String month8;
+
+    @ApiParam("当年9月")
+    private String month9;
+
+    @ApiParam("当年10月")
+    private String month10;
+
+    @ApiParam("当年11月")
+    private String month11;
+
+    @ApiParam("当年12月")
+    private String month12;
+
+    @ApiParam("次年1月")
+    private String month1;
+
+    @ApiParam("次年2月")
+    private String month2;
+
+    @ApiParam("次年3月")
+    private String month3;
+
+    public SxMonthStatisticsReportModel() {}
+
+    public SxMonthStatisticsReportModel(Integer index, String firstCell, String projectName) {
+        this.index = index;
+        this.firstCell = firstCell;
+        this.projectName = projectName;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxOqcCheckPackageDetailModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxOqcCheckPackageDetailModel.java
new file mode 100644
index 0000000..0b7cb8a
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxOqcCheckPackageDetailModel.java
@@ -0,0 +1,77 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("出货检验单据条码关联MODEL")
+public class SxOqcCheckPackageDetailModel implements Serializable {
+
+    private static final long serialVersionUID = 4217022742034706726L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("检验单号")
+    private String oqcNo;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("生产日期")
+    private String workTime;
+
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @ApiParam("备注")
+    private String remark;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+    @ApiParam("检验结果")
+    private String checkResultName;
+
+    @ApiParam("班次名称")
+    private String shiftName;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxOqcRuleNoteDetailModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxOqcRuleNoteDetailModel.java
new file mode 100644
index 0000000..c781d2f
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxOqcRuleNoteDetailModel.java
@@ -0,0 +1,107 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("出货检验式样书明细MODEL")
+public class SxOqcRuleNoteDetailModel implements Serializable {
+
+    private static final long serialVersionUID = -6041366579314009654L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("序号")
+    private Double seq;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("项目分类")
+    private String projectCode;
+
+    @ApiParam("检查内容")
+    private String checkContent;
+
+    @ApiParam("检查项目")
+    private String checkItem;
+
+    @ApiParam("判定基准")
+    private String standard;
+
+    @ApiParam("判断方式")
+    private Integer checkType;
+
+    @ApiParam("标准值")
+    private String standardValue;
+
+    @ApiParam("上限值")
+    private String upLimit;
+
+    @ApiParam("下限值")
+    private String downLimit;
+
+    @ApiParam("检查器具")
+    private String checkTool;
+
+    @ApiParam("上传时间")
+    private String uploadDatetime;
+
+    @ApiParam("文件ID")
+    private Long fileId;
+
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @ApiParam("文件源名")
+    private String fileOriginName;
+
+    @ApiParam("批次号")
+    private String lotNo;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+    @ApiParam("项目类型名称")
+    private String projectName;
+
+    @ApiParam("判断方式")
+    private String checkTypeName;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("机种分类")
+    private String categoryCode;
+
+    @ApiParam("作成日期")
+    private String complateDate;
+
+    @ApiParam("是否必检")
+    private Integer isNecessary;
+
+    @ApiParam("是否必检")
+    private String isNecessaryName;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxOqcRuleNoteModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxOqcRuleNoteModel.java
new file mode 100644
index 0000000..9fcf3f2
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxOqcRuleNoteModel.java
@@ -0,0 +1,87 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("出货检验式样书MODEL")
+public class SxOqcRuleNoteModel implements Serializable {
+
+    private static final long serialVersionUID = -1893603132059994590L;
+
+    @ApiParam("id")
+    private String idStr;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("机种分类")
+    private String categoryCode;
+
+    @ApiParam("作成日期")
+    private String complateDate;
+
+    @ApiParam("上传时间")
+    private String uploadDatetime;
+
+    @ApiParam("文件ID")
+    private Long fileId;
+
+    @ApiParam("文件源名")
+    private String fileOriginName;
+
+    @ApiParam("批次号")
+    private String lotNo;
+
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+    public SxOqcRuleNoteModel(Long id, String partNo, String partNameRdd, String categoryCode, String complateDate,
+                              String uploadDatetime, Long fileId, String fileOriginName, String lotNo,
+                              String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String fileUrl) {
+        this.id = id;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.categoryCode = categoryCode;
+        this.complateDate = complateDate;
+        this.uploadDatetime = uploadDatetime;
+        this.fileId = fileId;
+        this.fileOriginName = fileOriginName;
+        this.lotNo = lotNo;
+        this.organizeCode = organizeCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.fileUrl = fileUrl;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPartCategoryModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPartCategoryModel.java
new file mode 100644
index 0000000..053dd65
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPartCategoryModel.java
@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2022/6/1 10:58
+ * @Modify:
+ **/
+@Data
+public class SxPartCategoryModel implements Serializable {
+
+    private static final long serialVersionUID = -6695582592383943451L;
+
+    @ApiParam("分类代码")
+    private String categoryCode;
+
+    @ApiParam("分类名称")
+    private String categoryName;
+
+    @ApiParam("分类类型")
+    private String categoryType;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPartDefectCountDataModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPartDefectCountDataModel.java
new file mode 100644
index 0000000..460df5c
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPartDefectCountDataModel.java
@@ -0,0 +1,145 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ *  @Description: 部品批次不良统计model
+ * @author puxiao.liao
+ * @version 1.0
+ * @date 2022-04-14 15:32
+ **/
+@Data
+@ApiModel("部品批次不良统计model")
+public class SxPartDefectCountDataModel {
+
+    @ApiParam("导出文件名称")
+    private String exportFileName;
+
+    @ApiParam("去年实际")
+    private List<Object> lastYearActual;
+
+    @ApiParam("去年实际名称")
+    private String lastYearActualListName;
+
+    @ApiParam("当年目标")
+    private List<Object> currentTarget;
+
+    @ApiParam("当年目标名称")
+    private String currentTargetListName;
+
+    @ApiParam("当年实际")
+    private List<Object> currentYearActual;
+
+    @ApiParam("当年实际名称")
+    private String currentYearActualListName;
+
+    @ApiParam("X轴")
+    private List<String> xList;
+
+    @ApiParam("工厂编码")
+    private String organizeCode;
+
+    @ApiParam("标题")
+    private List<SxDynamicAttributeModel> tableTitle;
+
+    @ApiParam("数据")
+    private List<SxPartDefectCountDataModel> tableData;
+
+
+    @ApiParam("分页数据")
+    private Pager pager;
+
+    @Transient
+    @ApiParam(value = "开始时间")
+    private String createDatetimeStart;
+
+    @Transient
+    @ApiParam(value = "结束时间")
+    private String createDatetimeEnd;
+
+    @Transient
+    @ApiParam(value = "项目")
+    private String projectName;
+
+
+    @Transient
+    @ApiParam("产品分类")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.EP_PRODUCT_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer productType;
+
+    @Transient
+    @ApiParam("生产线编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.ext.qms.pojo.bean.WmsWorkCenter",
+            searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode")
+    private String workCenterCode;
+
+    @ApiParam("目标类型 字典维护")
+    private String targetType;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("合计")
+    private String sumCount;
+
+    public String getSumCount() {
+        if(StringUtil.isEmpty(this.sumCount)) {
+            return "0";
+        }
+        return sumCount;
+    }
+
+
+    @ApiParam("4月")
+    private String month4;
+    @ApiParam("5月")
+    private String month5;
+    @ApiParam("6月")
+    private String month6;
+    @ApiParam("7月")
+    private String month7;
+    @ApiParam("8月")
+    private String month8;
+    @ApiParam("9月")
+    private String month9;
+    @ApiParam("10月")
+    private String month10;
+    @ApiParam("11月")
+    private String month11;
+    @ApiParam("12月")
+    private String month12;
+    @ApiParam("1月")
+    private String month1;
+    @ApiParam("2月")
+    private String month2;
+    @ApiParam("3月")
+    private String month3;
+
+    public SxPartDefectCountDataModel(){}
+
+    public SxPartDefectCountDataModel(String workCenterCode, String projectName){
+        this.workCenterCode = workCenterCode;
+        this.projectName = projectName;
+    }
+
+    public SxPartDefectCountDataModel(String projectName){
+        this.projectName = projectName;
+    }
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPartDefectCountDataTableModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPartDefectCountDataTableModel.java
new file mode 100644
index 0000000..e4b8b57
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPartDefectCountDataTableModel.java
@@ -0,0 +1,116 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ *  @Description: 部品批次不良统计model
+ * @author puxiao.liao
+ * @version 1.0
+ * @date 2022-04-14 15:32
+ **/
+@Data
+@ApiModel("部品批次不良统计model")
+public class SxPartDefectCountDataTableModel {
+
+    @ApiParam("导出文件名称")
+    private String exportFileName;
+
+    @ApiParam("table动态列名")
+    private List<SxDynamicAttributeModel> attributeList;
+
+    @ApiParam("工厂编码")
+    private String organizeCode;
+
+    @ApiParam("标题")
+    private List<SxDynamicAttributeModel> tableTitle;
+
+    @ApiParam("数据")
+    private List<SxPartDefectCountDataTableModel> tableData;
+
+
+    @ApiParam("分页数据")
+    private Pager pager;
+
+    @Transient
+    @ApiParam(value = "开始时间")
+    private String createDatetimeStart;
+
+    @Transient
+    @ApiParam(value = "结束时间")
+    private String createDatetimeEnd;
+
+    @Transient
+    @ApiParam(value = "项目")
+    private String projectName;
+
+
+    @Transient
+    @ApiParam("产品分类")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.EP_PRODUCT_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer productType;
+
+    @Transient
+    @ApiParam("生产线编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
+            dataSrc = "cn.estsh.i3plus.ext.qms.pojo.bean.WmsWorkCenter",
+            searchColumnName = "workCenterCode,workCenterName", listColumnName = "workCenterCode,workCenterName", explicitColumnName = "workCenterCode")
+    private String workCenterCode;
+
+    @ApiParam("目标类型 字典维护")
+    private String targetType;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("合计")
+    private String sumCount;
+
+    public String getSumCount() {
+        if(StringUtil.isEmpty(this.sumCount)) {
+            return "0";
+        }
+        return sumCount;
+    }
+
+
+    @ApiParam("4月")
+    private String month4;
+    @ApiParam("5月")
+    private String month5;
+    @ApiParam("6月")
+    private String month6;
+    @ApiParam("7月")
+    private String month7;
+    @ApiParam("8月")
+    private String month8;
+    @ApiParam("9月")
+    private String month9;
+    @ApiParam("10月")
+    private String month10;
+    @ApiParam("11月")
+    private String month11;
+    @ApiParam("12月")
+    private String month12;
+    @ApiParam("1月")
+    private String month1;
+    @ApiParam("2月")
+    private String month2;
+    @ApiParam("3月")
+    private String month3;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPartExtModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPartExtModel.java
new file mode 100644
index 0000000..c23aa3c
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPartExtModel.java
@@ -0,0 +1,109 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @USER: wangjie
+ * @DATE: 2022-02-14 10:15
+ */
+@Data
+@ApiModel("物料信息MODEL")
+public class SxPartExtModel implements Serializable {
+
+    private static final long serialVersionUID = 4065584098326114566L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("是否免检")
+    private Integer iqc;
+
+    @ApiParam("是否免检")
+    private String iqcName;
+
+    @ApiParam("免检达成批次")
+    private Integer iqcCount;
+
+    @ApiParam("已免检达成批次")
+    private Integer iqcPassCount;
+
+    @ApiParam("生产线编码")
+    private String workCenterCode;
+
+    @ApiParam("机种编码")
+    private String machineCode;
+
+    @ApiParam("部品分类")
+    private Integer partType;
+
+    @ApiParam("部品分类")
+    private String partTypeName;
+
+    @ApiParam("产品分类")
+    private String productType;
+
+    @ApiParam("产品分类")
+    private String productTypeName;
+
+    @ApiParam("检查区分")
+    private Integer checkType;
+
+    @ApiParam("检查区分")
+    private String checkTypeName;
+
+    @ApiParam("产品阶段")
+    private Integer productStage;
+
+    @ApiParam("产品阶段")
+    private String productStageName;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("仕向地")
+    private String sendAddress;
+
+    @ApiParam("购入方")
+    private String purchaser;
+
+    @ApiParam("式样书状态")
+    private Integer noteStatus;
+
+    @ApiParam("式样书状态")
+    private String noteStatusName;
+
+    @ApiParam("是否出货检")
+    private Integer isOqc;
+
+    @ApiParam("是否出货检")
+    private String isOqcName;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPartModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPartModel.java
new file mode 100644
index 0000000..fb3d9be
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPartModel.java
@@ -0,0 +1,73 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @USER: wangjie
+ * @DATE: 2022-02-14 10:15
+ */
+@Data
+@ApiModel("物料信息MODEL")
+public class SxPartModel implements Serializable {
+
+    private static final long serialVersionUID = 8559309159134326101L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("是否出货检")
+    private Integer isOqc;
+
+    @ApiParam("是否出货检")
+    private String isOqcName;
+
+    @ApiParam("分类1")
+    private String categoryCode1;
+
+    @ApiParam("分类2")
+    private String categoryCode2;
+
+    @ApiParam("分类3")
+    private String categoryCode3;
+
+    @ApiParam("分类1")
+    private String categoryCode1Name;
+
+    @ApiParam("分类2")
+    private String categoryCode2Name;
+
+    @ApiParam("分类3")
+    private String categoryCode3Name;
+
+    @ApiParam("产品分类")
+    private String productType;
+
+    @ApiParam("产品分类")
+    private String productTypeName;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPojoFieldModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPojoFieldModel.java
new file mode 100644
index 0000000..19c1558
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPojoFieldModel.java
@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : PojoField模型
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2020-04-28
+ * @Modify:
+ * @Modify:
+ **/
+@Data
+public class SxPojoFieldModel implements Serializable {
+
+    private static final long serialVersionUID = -8008541936093284713L;
+
+    @ApiParam(value ="属性名")
+    private String fieldName;
+
+    @ApiParam(value ="属性类型")
+    private String fieldType;
+
+    @ApiParam(value ="属性描述")
+    private String fieldDesc;
+
+    @ApiParam(value ="字段名称")
+    private String fieldColumnName;
+
+    @ApiParam(value = "数据来源")
+    private String dataSrc;
+
+    @ApiParam(value = "开窗列表显示列名称")
+    private String listColumnName;
+
+    @ApiParam(value = "开窗搜索列名称")
+    private String searchColumnName;
+
+    @ApiParam(value = "回显列名")
+    private String explicitColumnName;
+
+    @ApiParam(value = "下拉框规则")
+    private Integer selectRule;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPojoModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPojoModel.java
new file mode 100644
index 0000000..c2ae6c5
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxPojoModel.java
@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : Pojo模型
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2020-04-28
+ * @Modify:
+ **/
+@Data
+public class SxPojoModel implements Serializable {
+
+    private static final long serialVersionUID = 2789106687564071133L;
+
+    @ApiParam(value ="包名")
+    private String packageName;
+
+    @ApiParam(value ="POJO类名")
+    private String simpleName;
+
+    @ApiParam(value ="POJO类全名")
+    private String fullName;
+
+    @ApiParam(value ="表名称名")
+    private String tableName;
+
+    @ApiParam(value ="POJO类描述")
+    private String pojoDesc;
+
+    @ApiParam(value ="属性集合")
+    private List<SxPojoFieldModel> fieldList;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQcSnModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQcSnModel.java
new file mode 100644
index 0000000..377d4ad
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQcSnModel.java
@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsQCSn;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 质检-处理意见model
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/9/22 14:20
+ * @Modify:
+ **/
+@Data
+public class SxQcSnModel {
+
+    @ApiParam("质检状态")
+    public Integer qcStatus;
+
+    @ApiParam("备注")
+    public String remark;
+
+    @ApiParam("目的存储区")
+    public String destZoneNo;
+
+    @ApiParam("质检条码")
+    public List<SxQmsQCSn> sxQmsQCSnList;
+
+    @ApiParam("质检单号")
+    public List<String> orderNoLst;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsAbnormalMasterExportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsAbnormalMasterExportModel.java
new file mode 100644
index 0000000..6525edb
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsAbnormalMasterExportModel.java
@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsAbnormalMaster;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 导出model
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/7/8 14:39
+ * @Modify:
+ **/
+@Data
+public class SxQmsAbnormalMasterExportModel {
+    private SxQmsAbnormalMaster sxQmsAbnormalMaster;
+
+    private Pager pager;
+
+    @ApiParam("导出模板参数：ABNORMAL_EXPORT_TEMPLATE_CODE")
+    private String cfgCode;
+
+    private String organizeCode;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsAbnormalMasterModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsAbnormalMasterModel.java
new file mode 100644
index 0000000..4af17af
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsAbnormalMasterModel.java
@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsAbnormalMaster;
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+/**
+ * @Description: 异常联络单model
+ * @Author: puxiao
+ * @date: 2022-04-01
+ */
+@Data
+@Api("异常联络单model")
+public class SxQmsAbnormalMasterModel {
+
+    private SxQmsAbnormalMaster abnormalMasterModel;
+
+    private Pager pager;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsAbnormalRefDocModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsAbnormalRefDocModel.java
new file mode 100644
index 0000000..9a5b818
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsAbnormalRefDocModel.java
@@ -0,0 +1,99 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description: 异常联络单关联单model
+ * @Author: puxiao
+ * @date: 2022-04-01
+ */
+@Data
+@Api("异常联络单关联单model")
+public class SxQmsAbnormalRefDocModel {
+
+    @ApiParam("工厂")
+    private String organizeCode;
+
+    @ApiParam("单号")
+    private String orderNo;
+
+    @ApiParam("关联单号")
+    private String refOrderNo;
+
+    @ApiParam("异常场所")
+    private Integer busiType;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorDesc;
+
+    @ApiParam("机种编码")
+    private String machineCode;
+
+    @ApiParam("客户编码")
+    private String customerNo;
+
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @ApiParam("创建人")
+    private String createUser;
+
+    @ApiParam("创建时间")
+    private String createDateTime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("创建时间")
+    private String modifyDatetime;
+
+    @ApiParam("缺陷等级")
+    private String defectLevelValue;
+
+    @ApiParam("责任区分")
+    private String dutyDiffValue;
+
+    @ApiParam("剔除关联单号")
+    private String filterRefOrderNo;
+
+
+    public SxQmsAbnormalRefDocModel(
+                                    String refOrderNo,
+                                    String partNo,
+                                    String partNameRdd,
+                                    String vendorNo,
+                                    String vendorDesc,
+                                    String machineCode,
+                                    String createUser,
+                                    String createDateTime,
+                                    String modifyUser,
+                                    String modifyDatetime){
+        this.refOrderNo = refOrderNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.vendorNo = vendorNo;
+        this.vendorDesc = vendorDesc;
+        this.machineCode = machineCode;
+        this.createUser = createUser;
+        this.createDateTime = createDateTime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
+
+
+
+    public SxQmsAbnormalRefDocModel(){
+
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsAffectedManagementTestMonitoringModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsAffectedManagementTestMonitoringModel.java
new file mode 100644
index 0000000..bcd3357
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsAffectedManagementTestMonitoringModel.java
@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 受入管理试验监控导出model
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2022/5/30 14:52
+ * @Modify:
+ **/
+@Data
+@Api("受入管理试验监控导出model")
+public class SxQmsAffectedManagementTestMonitoringModel {
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("部品区分")
+    private String partProduceTypeStr;
+
+    @ApiParam("计划")
+    private String plan;
+
+    @ApiParam("实绩")
+    private String result;
+
+    @ApiParam("备注")
+    private String memo;
+
+    @ApiParam("创建人")
+    private String createUser;
+
+    @ApiParam("创建时间")
+    private String createDatetime;
+
+    @ApiParam("更新人")
+    private String modifyUser;
+
+    @ApiParam("更新时间")
+    private String modifyDatetime;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsBadnessModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsBadnessModel.java
new file mode 100644
index 0000000..27e94cd
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsBadnessModel.java
@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description :配置表
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@Api("不良表")
+public class SxQmsBadnessModel implements Serializable {
+
+    private static final long serialVersionUID = 2338576742588942015L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+    @ApiParam("有效性")
+    private Integer isValid;
+
+    @ApiParam("是否已删除")
+    private Integer isDeleted;
+
+    @ApiParam("不良类型模块")
+    private Integer badnessModule;
+
+    @ApiParam("不良类型模块描述")
+    private String badnessModuleName;
+
+    @ApiParam("不良编码")
+    private String badnessCode;
+
+    @ApiParam("不良名称 ")
+    private String badnessName;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsCustomerComplaintAndAbarbeitungModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsCustomerComplaintAndAbarbeitungModel.java
new file mode 100644
index 0000000..cf932a3
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsCustomerComplaintAndAbarbeitungModel.java
@@ -0,0 +1,258 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author: Xinwang.Yi
+ * @CreateDate: 2022/02/11 02:01 下午
+ * @Description:
+ **/
+@Data
+@ApiModel("客诉记录MODEL")
+public class SxQmsCustomerComplaintAndAbarbeitungModel implements Serializable {
+    private static final long serialVersionUID = -3053263203223813977L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("客诉单号")
+    private String complaintNo;
+
+    @ApiParam("客诉类型 10-异常联络，20-速报")
+    private Integer complaintType;
+
+    @ApiParam("客诉类型描述")
+    private String complaintTypeName;
+
+    @ApiParam("异常场所 10-市场不良、20-到货不良、30-受入不良、40-工程不良、50-改判")
+    private Integer abnormalSource;
+
+    @ApiParam("异常场所描述")
+    private String abnormalSourceName;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("客户编码")
+    private String customerNo;
+
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @ApiParam("发行日期")
+    private String publishDate;
+
+    @ApiParam("预定回达日")
+    private String planArriveDate;
+
+    @ApiParam("事业部管理NO")
+    private String departmentNo;
+
+    @ApiParam("问题点描述")
+    private String issueDesc;
+
+    @ApiParam("缺陷等级 10-轻度缺陷，20-中度缺陷，30-重度缺陷")
+    private Integer defectLevel;
+
+    @ApiParam("缺陷等级描述")
+    private String defectLevelName;
+
+    @ApiParam("件数")
+    private Integer qty;
+
+    @ApiParam("发生情况 10-初发，20-再发")
+    private Integer situation;
+
+    @ApiParam("不良点")
+    private String badnessCode;
+
+    @ApiParam("发生情况描述")
+    private String situationName;
+
+    @ApiParam("生产日期")
+    private String produceDate;
+
+    @ApiParam("客诉单状态 ")
+    private Integer complaintStatus;
+
+    @ApiParam("客诉单状态描述")
+    private String complaintStatusName;
+
+    @ApiParam("文件ID1")
+    private Long fileId1;
+
+    @ApiParam("文件URL1")
+    private String fileUrl1;
+
+    @ApiParam("文件原名1")
+    private String fileOriginName1;
+
+    @ApiParam("文件ID2")
+    private Long fileId2;
+
+    @ApiParam("文件URL2")
+    private String fileUrl2;
+
+    @ApiParam("文件原名2")
+    private String fileOriginName2;
+
+    @ApiParam("对策确认 10-通过，20-不通过")
+    private Integer countermeasureConfirm;
+
+    @ApiParam("整改确认 10-通过，20-不通过")
+    private Integer abarbeitungConfirm;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("有效性")
+    private Integer isValid;
+
+    @ApiParam("是否已删除")
+    private Integer isDeleted;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("创建日期开始区间")
+    private String createDatetimeStart;
+
+    @ApiParam("创建日期结束区间")
+    private String createDatetimeEnd;
+
+    @ApiParam("更新人")
+    private String modifyUser;
+
+    @ApiParam("更新日期")
+    private String modifyDatetime;
+
+    @ApiParam("责任区分")
+    private Integer dutyDiff;
+
+    @ApiParam("对策确认描述 10-通过，20-不通过")
+    private String countermeasureConfirmName;
+
+    @ApiParam("整改确认描述 10-通过，20-不通过")
+    private String abarbeitungConfirmName;
+
+    @ApiParam("客诉确认拒绝说明")
+    private String countermeasureNoPassExplain;
+
+    @ApiParam("整改确认拒绝说明")
+    private String abarbeitungNoPassExplain;
+
+    @ApiParam("上传时间")
+    private String uploadDatetime;
+
+    public SxQmsCustomerComplaintAndAbarbeitungModel() {
+    }
+
+    public SxQmsCustomerComplaintAndAbarbeitungModel(Long id, String complaintNo, Integer complaintType, String complaintTypeName, Integer abnormalSource,
+                                                     String abnormalSourceName, String partNo, String partNameRdd, String customerNo, String customerName,
+                                                     String publishDate, String planArriveDate, String departmentNo, String issueDesc, Integer defectLevel,
+                                                     String defectLevelName, Integer qty, Integer situation, String situationName, String produceDate,
+                                                     Integer complaintStatus, String complaintStatusName, Long fileId1, String fileUrl1, String fileOriginName1,
+                                                     Long fileId2, String fileUrl2, String fileOriginName2, Integer countermeasureConfirm, Integer abarbeitungConfirm,
+                                                     String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
+                                                     String createDatetimeStart, String createDatetimeEnd, String modifyUser, String modifyDatetime, Integer dutyDiff,
+                                                     String countermeasureConfirmName, String abarbeitungConfirmName, String uploadDatetime) {
+        this.id = id;
+        this.complaintNo = complaintNo;
+        this.complaintType = complaintType;
+        this.complaintTypeName = complaintTypeName;
+        this.abnormalSource = abnormalSource;
+        this.abnormalSourceName = abnormalSourceName;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.customerNo = customerNo;
+        this.customerName = customerName;
+        this.publishDate = publishDate;
+        this.planArriveDate = planArriveDate;
+        this.departmentNo = departmentNo;
+        this.issueDesc = issueDesc;
+        this.defectLevel = defectLevel;
+        this.defectLevelName = defectLevelName;
+        this.qty = qty;
+        this.situation = situation;
+        this.situationName = situationName;
+        this.produceDate = produceDate;
+        this.complaintStatus = complaintStatus;
+        this.complaintStatusName = complaintStatusName;
+        this.fileId1 = fileId1;
+        this.fileUrl1 = fileUrl1;
+        this.fileOriginName1 = fileOriginName1;
+        this.fileId2 = fileId2;
+        this.fileUrl2 = fileUrl2;
+        this.fileOriginName2 = fileOriginName2;
+        this.countermeasureConfirm = countermeasureConfirm;
+        this.abarbeitungConfirm = abarbeitungConfirm;
+        this.organizeCode = organizeCode;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.createDatetimeStart = createDatetimeStart;
+        this.createDatetimeEnd = createDatetimeEnd;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.dutyDiff = dutyDiff;
+        this.countermeasureConfirmName = countermeasureConfirmName;
+        this.abarbeitungConfirmName = abarbeitungConfirmName;
+        this.uploadDatetime = uploadDatetime;
+    }
+
+    public SxQmsCustomerComplaintAndAbarbeitungModel(Long id, String createDatetime, String createUser , String modifyUser, String modifyDatetime,
+                                                     String organizeCode, Long fileId1, String fileOriginName1, Long fileId2, String fileOriginName2,
+                                                     String uploadDatetime, Integer isValid, Integer isDeleted, String complaintNo, Integer complaintType, Integer abnormalSource,
+                                                     String partNo, String partNameRdd, String customerNo, String customerName,
+                                                     String publishDate, String planArriveDate, String departmentNo, String issueDesc,
+                                                     Integer defectLevel, Integer qty, Integer situation, String produceDate,
+                                                     Integer complaintStatus, String fileUrl1, String fileUrl2, Integer dutyDiff,
+                                                     Integer countermeasureConfirm, Integer abarbeitungConfirm, String badnessCode) {
+        this.id = id;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.organizeCode = organizeCode;
+        this.fileId1 = fileId1;
+        this.fileOriginName1 = fileOriginName1;
+        this.fileId2 = fileId2;
+        this.fileOriginName2 = fileOriginName2;
+        this.uploadDatetime = uploadDatetime;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.complaintNo = complaintNo;
+        this.complaintType = complaintType;
+        this.abnormalSource = abnormalSource;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.customerNo = customerNo;
+        this.customerName = customerName;
+        this.publishDate = publishDate;
+        this.planArriveDate = planArriveDate;
+        this.departmentNo = departmentNo;
+        this.issueDesc = issueDesc;
+        this.defectLevel = defectLevel;
+        this.qty = qty;
+        this.situation = situation;
+        this.produceDate = produceDate;
+        this.complaintStatus = complaintStatus;
+        this.fileUrl1 = fileUrl1;
+        this.fileUrl2 = fileUrl2;
+        this.dutyDiff = dutyDiff;
+        this.countermeasureConfirm = countermeasureConfirm;
+        this.abarbeitungConfirm = abarbeitungConfirm;
+        this.badnessCode = badnessCode;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsCustomerComplaintModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsCustomerComplaintModel.java
new file mode 100644
index 0000000..1ccc6b5
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsCustomerComplaintModel.java
@@ -0,0 +1,343 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author: Xinwang.Yi
+ * @CreateDate: 2022/02/11 02:01 下午
+ * @Description:
+ **/
+@Data
+@ApiModel("客诉记录MODEL")
+public class SxQmsCustomerComplaintModel implements Serializable {
+    private static final long serialVersionUID = -3053263203223813977L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("客诉单号")
+    private String complaintNo;
+
+    @ApiParam("客诉类型 10-异常联络，20-速报")
+    private Integer complaintType;
+
+    @ApiParam("客诉类型描述")
+    private String complaintTypeName;
+
+    @ApiParam("异常场所 10-市场不良、20-到货不良、30-受入不良、40-工程不良、50-改判")
+    private Integer abnormalSource;
+
+    @ApiParam("异常场所描述")
+    private String abnormalSourceName;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("客户编码")
+    private String customerNo;
+
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @ApiParam("发行日期")
+    private String publishDate;
+
+    @ApiParam("预定回达日")
+    private String planArriveDate;
+
+    @ApiParam("事业部管理NO")
+    private String departmentNo;
+
+    @ApiParam("问题点描述")
+    private String issueDesc;
+
+    @ApiParam("缺陷等级 10-轻度缺陷，20-中度缺陷，30-重度缺陷")
+    private Integer defectLevel;
+
+    @ApiParam("缺陷等级描述")
+    private String defectLevelName;
+
+    @ApiParam("件数")
+    private Integer qty;
+
+    @ApiParam("发生情况 10-初发，20-再发")
+    private Integer situation;
+
+    @ApiParam("不良点")
+    private String badnessCode;
+
+    @ApiParam("不良点")
+    private String badnessName;
+
+    @ApiParam("发生情况描述")
+    private String situationName;
+
+    @ApiParam("生产日期")
+    private String produceDate;
+
+    @ApiParam("客诉单状态 ")
+    private Integer complaintStatus;
+
+    @ApiParam("客诉单状态描述")
+    private String complaintStatusName;
+
+    @ApiParam("文件ID1")
+    private Long fileId1;
+
+    @ApiParam("文件URL1")
+    private String fileUrl1;
+
+    @ApiParam("文件原名1")
+    private String fileOriginName1;
+
+    @ApiParam("文件ID2")
+    private Long fileId2;
+
+    @ApiParam("文件URL2")
+    private String fileUrl2;
+
+    @ApiParam("文件原名2")
+    private String fileOriginName2;
+
+    @ApiParam("对策确认 10-通过，20-不通过")
+    private Integer countermeasureConfirm;
+
+    @ApiParam("整改确认 10-通过，20-不通过")
+    private Integer abarbeitungConfirm;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("有效性")
+    private Integer isValid;
+
+    @ApiParam("是否已删除")
+    private Integer isDeleted;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("创建日期开始区间")
+    private String createDatetimeStart;
+
+    @ApiParam("创建日期结束区间")
+    private String createDatetimeEnd;
+
+    @ApiParam("更新人")
+    private String modifyUser;
+
+    @ApiParam("更新日期")
+    private String modifyDatetime;
+
+    @ApiParam("责任区分")
+    private String dutyDiff;
+
+    @ApiParam("对策确认描述 10-通过，20-不通过")
+    private String countermeasureConfirmName;
+
+    @ApiParam("整改确认描述 10-通过，20-不通过")
+    private String abarbeitungConfirmName;
+
+    @ApiParam("客诉确认拒绝说明")
+    private String countermeasureNoPassExplain;
+
+    @ApiParam("整改确认拒绝说明")
+    private String abarbeitungNoPassExplain;
+
+    @ApiParam("上传时间")
+    private String uploadDatetime;
+
+    @ApiParam("仕向地")
+    private String sendAddress;
+
+//    @ApiParam("制造编号")
+//    private String manufacturingSerialNo;
+//
+//    @ApiParam("安装时间")
+//    private String installationTime;
+//
+//    @ApiParam("购机时间")
+//    private String theCostOfTime;
+//
+//    @ApiParam("故障发生时间")
+//    private String timeOfFailure;
+//
+//    @ApiParam("使用时间 故障发生时间-安装时间。单位：月")
+//    private Double hoursOfUse;
+//
+//    @ApiParam("故障现象")
+//    private String faultPhenomenon;
+//
+//    @ApiParam("故障原因")
+//    private String failureCause;
+//
+//    @ApiParam("制造日期")
+//    private String manufacturingDate;
+//
+//    @ApiParam("部品编码")
+//    private String departmentOfProductCoding;
+//
+//    @ApiParam("部品名称")
+//    private String departmentOfProductName;
+//
+//    @ApiParam("单价")
+//    private BigDecimal unitPrice;
+//
+//    @ApiParam("金额")
+//    private BigDecimal amount;
+//
+//    @ApiParam("服务网点")
+//    private String serviceNetworkStation;
+//
+//    @ApiParam("是否二次维修")
+//    private Integer whetherSecondaryMaintenance;
+
+    public SxQmsCustomerComplaintModel() {
+    }
+
+    public SxQmsCustomerComplaintModel(Long id, String complaintNo, Integer complaintType, String complaintTypeName, Integer abnormalSource, String abnormalSourceName, String partNo, String partNameRdd, String customerNo, String customerName, String publishDate, String planArriveDate, String departmentNo, String issueDesc, Integer defectLevel, String defectLevelName, Integer qty, Integer situation, String situationName, String produceDate, Integer complaintStatus, String complaintStatusName, Long fileId1, String fileUrl1, String fileOriginName1, Long fileId2, String fileUrl2, String fileOriginName2, Integer countermeasureConfirm, Integer abarbeitungConfirm, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String createDatetimeStart, String createDatetimeEnd, String modifyUser, String modifyDatetime, String dutyDiff, String countermeasureConfirmName, String abarbeitungConfirmName, String uploadDatetime) {
+        this.id = id;
+        this.complaintNo = complaintNo;
+        this.complaintType = complaintType;
+        this.complaintTypeName = complaintTypeName;
+        this.abnormalSource = abnormalSource;
+        this.abnormalSourceName = abnormalSourceName;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.customerNo = customerNo;
+        this.customerName = customerName;
+        this.publishDate = publishDate;
+        this.planArriveDate = planArriveDate;
+        this.departmentNo = departmentNo;
+        this.issueDesc = issueDesc;
+        this.defectLevel = defectLevel;
+        this.defectLevelName = defectLevelName;
+        this.qty = qty;
+        this.situation = situation;
+        this.situationName = situationName;
+        this.produceDate = produceDate;
+        this.complaintStatus = complaintStatus;
+        this.complaintStatusName = complaintStatusName;
+        this.fileId1 = fileId1;
+        this.fileUrl1 = fileUrl1;
+        this.fileOriginName1 = fileOriginName1;
+        this.fileId2 = fileId2;
+        this.fileUrl2 = fileUrl2;
+        this.fileOriginName2 = fileOriginName2;
+        this.countermeasureConfirm = countermeasureConfirm;
+        this.abarbeitungConfirm = abarbeitungConfirm;
+        this.organizeCode = organizeCode;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.createDatetimeStart = createDatetimeStart;
+        this.createDatetimeEnd = createDatetimeEnd;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.dutyDiff = dutyDiff;
+        this.countermeasureConfirmName = countermeasureConfirmName;
+        this.abarbeitungConfirmName = abarbeitungConfirmName;
+        this.uploadDatetime = uploadDatetime;
+    }
+
+    public SxQmsCustomerComplaintModel(Long id, String createDatetime, String createUser , String modifyUser, String modifyDatetime,
+                                       String organizeCode, Long fileId1, String fileOriginName1, Long fileId2, String fileOriginName2,
+                                       String uploadDatetime, Integer isValid, Integer isDeleted, String complaintNo, Integer complaintType, Integer abnormalSource,
+                                       String partNo, String partNameRdd, String customerNo, String customerName,
+                                       String publishDate, String planArriveDate, String departmentNo, String issueDesc,
+                                       Integer defectLevel, Integer qty, Integer situation, String produceDate,
+                                       Integer complaintStatus, String fileUrl1, String fileUrl2, String dutyDiff,
+                                       Integer countermeasureConfirm, Integer abarbeitungConfirm, String badnessCode, String sendAddress) {
+        this.id = id;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.organizeCode = organizeCode;
+        this.fileId1 = fileId1;
+        this.fileOriginName1 = fileOriginName1;
+        this.fileId2 = fileId2;
+        this.fileOriginName2 = fileOriginName2;
+        this.uploadDatetime = uploadDatetime;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.complaintNo = complaintNo;
+        this.complaintType = complaintType;
+        this.abnormalSource = abnormalSource;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.customerNo = customerNo;
+        this.customerName = customerName;
+        this.publishDate = publishDate;
+        this.planArriveDate = planArriveDate;
+        this.departmentNo = departmentNo;
+        this.issueDesc = issueDesc;
+        this.defectLevel = defectLevel;
+        this.qty = qty;
+        this.situation = situation;
+        this.produceDate = produceDate;
+        this.complaintStatus = complaintStatus;
+        this.fileUrl1 = fileUrl1;
+        this.fileUrl2 = fileUrl2;
+        this.dutyDiff = dutyDiff;
+        this.countermeasureConfirm = countermeasureConfirm;
+        this.abarbeitungConfirm = abarbeitungConfirm;
+        this.badnessCode = badnessCode;
+        this.sendAddress = sendAddress;
+    }
+
+    public SxQmsCustomerComplaintModel(Long id, String createDatetime, String createUser , String modifyUser, String modifyDatetime,
+                                       String organizeCode, Long fileId1, String fileOriginName1, Long fileId2, String fileOriginName2,
+                                       String uploadDatetime, Integer isValid, Integer isDeleted, String complaintNo, Integer complaintType, Integer abnormalSource,
+                                       String partNo, String partNameRdd, String customerNo, String customerName,
+                                       String publishDate, String planArriveDate, String departmentNo, String issueDesc,
+                                       Integer defectLevel, Integer qty, Integer situation, String produceDate,
+                                       Integer complaintStatus, String fileUrl1, String fileUrl2, String dutyDiff,
+                                       Integer countermeasureConfirm, Integer abarbeitungConfirm) {
+        this.id = id;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.organizeCode = organizeCode;
+        this.fileId1 = fileId1;
+        this.fileOriginName1 = fileOriginName1;
+        this.fileId2 = fileId2;
+        this.fileOriginName2 = fileOriginName2;
+        this.uploadDatetime = uploadDatetime;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.complaintNo = complaintNo;
+        this.complaintType = complaintType;
+        this.abnormalSource = abnormalSource;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.customerNo = customerNo;
+        this.customerName = customerName;
+        this.publishDate = publishDate;
+        this.planArriveDate = planArriveDate;
+        this.departmentNo = departmentNo;
+        this.issueDesc = issueDesc;
+        this.defectLevel = defectLevel;
+        this.qty = qty;
+        this.situation = situation;
+        this.produceDate = produceDate;
+        this.complaintStatus = complaintStatus;
+        this.fileUrl1 = fileUrl1;
+        this.fileUrl2 = fileUrl2;
+        this.dutyDiff = dutyDiff;
+        this.countermeasureConfirm = countermeasureConfirm;
+        this.abarbeitungConfirm = abarbeitungConfirm;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsCustomerComplaintReportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsCustomerComplaintReportModel.java
new file mode 100644
index 0000000..cad0c33
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsCustomerComplaintReportModel.java
@@ -0,0 +1,280 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Author: Dominic
+ * @CreateDate: 2022/06/07 13:26:20
+ * @Description:
+ **/
+@Data
+@ApiModel("客诉记录报表MODEL")
+public class SxQmsCustomerComplaintReportModel implements Serializable {
+
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("客诉单号")
+    private String complaintNo;
+
+    @ApiParam("客诉单状态")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.BU_COMPLAINT_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer complaintStatus;
+
+    @ApiParam("客诉单状态描述")
+    private String complaintStatusName;
+
+    @ApiParam("责任区分")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.DUTY_DIFF.class, refForeignKey = "value", value = "description")
+    private Integer dutyDiff;
+
+    @ApiParam("责任区分 前端传参用")
+    private String dutyDiffs;
+
+    @ApiParam("管理编码")
+    private String departmentNo;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料编码集合")
+    private List<String> partNoList;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("购机时间")
+    private String theCostOfTime;
+
+    @ApiParam("安装时间")
+    private String installationTime;
+
+    @ApiParam("故障发生时间")
+    private String timeOfFailure;
+
+    @ApiParam("使用时间 故障发生时间-安装时间。单位：月")
+    private Double hoursOfUse;
+
+    @ApiParam("服务网点")
+    private String serviceNetworkStation;
+
+    @ApiParam("部品编码")
+    private String departmentOfProductCoding;
+
+    @ApiParam("部品名称")
+    private String departmentOfProductName;
+
+    @ApiParam("产线代码")
+    private String productLineCode;
+
+    @ApiParam("客户编码")
+    private String customerNo;
+
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("产品分类")
+    private String productClassification;
+
+    @ApiParam("机种分类")
+    private String categoryCode;
+
+    @ApiParam("缺陷等级 10-轻度缺陷，20-中度缺陷，30-重度缺陷")
+    private Integer defectLevel;
+
+    @ApiParam("缺陷等级描述")
+    private String defectLevelName;
+
+    @ApiParam("再发次数")
+    private Integer recurTimes;
+
+    @ApiParam("生产时间")
+    private String produceTime;
+
+    @ApiParam("生产日期")
+    private String produceDate;
+
+    @ApiParam("生产批次")
+    private String prodLot;
+
+    @ApiParam("对策前/后")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.COUNTERMEASURE_ACTION.class, refForeignKey = "value", value = "description")
+    private Integer countermeasureAction;
+
+    @ApiParam("部品在库数量")
+    private BigDecimal quantityOfPartsInWarehouse;
+
+    @ApiParam("成品在库数量")
+    private BigDecimal quantityOfFinishedProductsInWarehouse;
+
+    @ApiParam("是否进行再发防止报告")
+    private Integer wtcrpr;
+
+    @ApiParam("不良原因")
+    private String causeOfDefect;
+
+    @Column(name = "FILE_URL1")
+    @ApiParam("文件URL1")
+    private String fileUrl1;
+
+    @Column(name = "FILE_URL2")
+    @ApiParam("文件URL2")
+    private String fileUrl2;
+
+    @ApiParam("异常发行日期")
+    private String abnormalReleaseDate;
+
+    @ApiParam("异常发行日期开始")
+    private String abnormalReleaseDateStart;
+
+    @ApiParam("异常发行日期结束")
+    private String abnormalReleaseDateEnd;
+
+    @ApiParam("预定回复日期")
+    private String expectedReplyDate;
+
+    @ApiParam("对应日期")
+    private String correspondingToTheDate;
+
+    @ApiParam("实际回答日期")
+    private String actualReplyDate;
+
+    @ApiParam("发生原因")
+    private String occurReason;
+
+    @ApiParam("发生源临时对策")
+    private String temporaryCountermeasureOfSource;
+
+    @ApiParam("发生源恒久对策")
+    private String persistentGameOfOrigin;
+
+    @ApiParam("流出原因")
+    private String outflowReason;
+
+    @ApiParam("流出源临时对策")
+    private String outflowSourceTemporaryCountermeasure;
+
+    @ApiParam("流出源恒久对策")
+    private String outflowSourcePermanentCountermeasure;
+
+    @ApiParam("对策附件信息")
+    private String fileUrl;
+
+    @ApiParam("备注")
+    private String remark;
+
+    @ApiParam("更新人")
+    private String modifyUser;
+
+    @ApiParam("更新日期")
+    private String modifyDatetime;
+
+    @ApiParam("更新日期开始")
+    private String modifyDatetimeStart;
+
+    @ApiParam("更新日期结束")
+    private String modifyDatetimeEnd;
+
+    @ApiParam("文件原名1")
+    private String fileOriginName1;
+
+    @ApiParam("文件原名2")
+    private String fileOriginName2;
+
+    @ApiParam("上传时间")
+    private String uploadDatetime;
+
+    @ApiParam("附件文件原名")
+    private String abarbeitungFileOriginName;
+
+    @ApiParam("附件上传时间")
+    private String abarbeitungUploadDatetime;
+
+    public SxQmsCustomerComplaintReportModel(String complaintNo, Integer complaintStatus, Integer dutyDiff,
+                                             String departmentNo, String expectedReplyDate, String partNo,
+                                             String partNameRdd, String theCostOfTime, String installationTime,
+                                             String timeOfFailure, Double hoursOfUse, String serviceNetworkStation,
+                                             String departmentOfProductCoding, String departmentOfProductName,
+                                             String productLineCode, String customerNo, String customerName,
+                                             String vendorNo, String vendorName,
+                                             String productClassification, String categoryCode, Integer defectLevel,
+                                             Integer recurTimes, String produceTime, String produceDate, String prodLot,
+                                             Integer countermeasureAction, BigDecimal quantityOfPartsInWarehouse,
+                                             BigDecimal quantityOfFinishedProductsInWarehouse, Integer wtcrpr,
+                                             String causeOfDefect, String fileUrl1, String fileUrl2, String fileOriginName1,
+                                             String fileOriginName2, String uploadDatetime,
+                                             String abnormalReleaseDate,
+                                             String correspondingToTheDate, String actualReplyDate, String occurReason,
+                                             String temporaryCountermeasureOfSource, String persistentGameOfOrigin,
+                                             String outflowReason, String outflowSourceTemporaryCountermeasure,
+                                             String outflowSourcePermanentCountermeasure, String fileUrl, String abarbeitungFileOriginName,
+                                             String abarbeitungUploadDatetime, String remark,
+                                             String modifyUser, String modifyDatetime) {
+        this.complaintNo = complaintNo;
+        this.complaintStatus = complaintStatus;
+        this.dutyDiff = dutyDiff;
+        this.departmentNo = departmentNo;
+        this.expectedReplyDate = expectedReplyDate;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.theCostOfTime = theCostOfTime;
+        this.installationTime = installationTime;
+        this.timeOfFailure = timeOfFailure;
+        this.hoursOfUse = hoursOfUse;
+        this.serviceNetworkStation = serviceNetworkStation;
+        this.departmentOfProductCoding = departmentOfProductCoding;
+        this.departmentOfProductName = departmentOfProductName;
+        this.productLineCode = productLineCode;
+        this.customerNo = customerNo;
+        this.customerName = customerName;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.productClassification = productClassification;
+        this.categoryCode = categoryCode;
+        this.defectLevel = defectLevel;
+        this.recurTimes = recurTimes;
+        this.produceTime = produceTime;
+        this.produceDate = produceDate;
+        this.prodLot = prodLot;
+        this.countermeasureAction = countermeasureAction;
+        this.quantityOfPartsInWarehouse = quantityOfPartsInWarehouse;
+        this.quantityOfFinishedProductsInWarehouse = quantityOfFinishedProductsInWarehouse;
+        this.wtcrpr = wtcrpr;
+        this.causeOfDefect = causeOfDefect;
+        this.fileUrl1 = fileUrl1;
+        this.fileUrl2 = fileUrl2;
+        this.fileOriginName1 = fileOriginName1;
+        this.fileOriginName2 = fileOriginName2;
+        this.uploadDatetime = uploadDatetime;
+        this.abnormalReleaseDate = abnormalReleaseDate;
+        this.correspondingToTheDate = correspondingToTheDate;
+        this.actualReplyDate = actualReplyDate;
+        this.occurReason = occurReason;
+        this.temporaryCountermeasureOfSource = temporaryCountermeasureOfSource;
+        this.persistentGameOfOrigin = persistentGameOfOrigin;
+        this.outflowReason = outflowReason;
+        this.outflowSourceTemporaryCountermeasure = outflowSourceTemporaryCountermeasure;
+        this.outflowSourcePermanentCountermeasure = outflowSourcePermanentCountermeasure;
+        this.fileUrl = fileUrl;
+        this.abarbeitungFileOriginName = abarbeitungFileOriginName;
+        this.abarbeitungUploadDatetime = abarbeitungUploadDatetime;
+        this.remark = remark;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsImprovementExperienceModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsImprovementExperienceModel.java
new file mode 100644
index 0000000..4647a6d
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsImprovementExperienceModel.java
@@ -0,0 +1,83 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-02-21 15:43
+ */
+@Data
+@ApiModel("改善经验库主表MODEL")
+public class SxQmsImprovementExperienceModel implements Serializable {
+
+    private static final long serialVersionUID = -7865109707606633181L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+    @ApiParam("有效性")
+    private Integer isValid;
+
+    @ApiParam("是否已删除")
+    private Integer isDeleted;
+
+    @ApiParam(value = "改善类别")
+    private Integer improveType;
+
+    @ApiParam(value = "改善类别描述")
+    private String improveTypeName;
+
+    @ApiParam(value = "问题描述")
+    private String problemDesc;
+
+    @ApiParam(value = "解决方案")
+    private String solution;
+
+    @Column(name = "REMARK")
+    @ApiParam(value = "备注")
+    private String remark;
+
+    @ApiParam(value = "机种编码")
+    private String machineCode;
+
+    @ApiParam(value = "机种名称")
+    private String machineName;
+
+    @ApiParam(value = "产线")
+    private String workCenterCode;
+
+    @ApiParam("问题描述文件列表")
+    private List<String> problemDescList;
+
+    @ApiParam("解决方案文件列表")
+    private List<String> solutionList;
+
+    @ApiParam(value = "物料名称")
+    private String partNo;
+
+    @ApiParam("分类1")
+    private String categoryCode1;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsODMManagementTestMonitoringModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsODMManagementTestMonitoringModel.java
new file mode 100644
index 0000000..46ad9e6
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsODMManagementTestMonitoringModel.java
@@ -0,0 +1,74 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : ODM管理试验监控导出model
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2022/5/30 14:52
+ * @Modify:
+ **/
+@Data
+@Api("ODM管理试验监控导出model")
+public class SxQmsODMManagementTestMonitoringModel {
+
+    @ApiParam("状态描述")
+    private String statusStr;
+
+    @ApiParam("产品类型名称")
+    private String productTypeName;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("仕向地")
+    private String toLand;
+
+    @ApiParam("电压频率")
+    private String voltageFrequency;
+
+    @ApiParam("台数")
+    private Integer count;
+
+    @ApiParam("试验周期")
+    private String testCycle;
+
+    @ApiParam("试验类型区分")
+    private String testTypeDistinguishStr;
+
+    @ApiParam("计划")
+    private String plan;
+
+    @ApiParam("送检日期")
+    private String checkDatetime;
+
+    @ApiParam("实绩")
+    private String result;
+
+    @ApiParam("备注")
+    private String memo;
+
+    @ApiParam("创建人")
+    private String createUser;
+
+    @ApiParam("创建时间")
+    private String createDatetime;
+
+    @ApiParam("更新人")
+    private String modifyUser;
+
+    @ApiParam("更新时间")
+    private String modifyDatetime;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsQCHandleModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsQCHandleModel.java
new file mode 100644
index 0000000..7b259d8
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsQCHandleModel.java
@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsQCMaster;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsQCTransDetails;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description: 质检拓展model
+ * @Author: puxiao
+ * @date: 2021-10-08
+ */
+@Data
+@Api("质检作业Model")
+public class SxQmsQCHandleModel extends BaseBean {
+
+
+   // @ApiParam("质检条码")
+   // private List<SxQmsQCTransSn> sxQmsQCTransSns;
+
+
+    @ApiParam("收货条码检测记录结果值")
+    private List<SxQmsQCTransDetails> sxQmsQCTransSnDetails;
+
+    @ApiParam("质检主表")
+    private SxQmsQCMaster sxQmsQCMaster;
+
+    @ApiParam("品质担当")
+    private String qualityUser;
+
+
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsQCMasterExtModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsQCMasterExtModel.java
new file mode 100644
index 0000000..c33f795
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsQCMasterExtModel.java
@@ -0,0 +1,495 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description: 质检查询model
+ * @Author: puxiao
+ * @date: 2022-04-03
+ */
+@Data
+@Api("质检查询model")
+public class SxQmsQCMasterExtModel extends BaseBean {
+
+
+    @ApiParam("单号")
+    public String orderNo;
+
+    /**
+     * 业务类型:IQC=进料检验,IPQC=在线检验,
+     * FQC=成品检验,OQC=出货检验
+     */
+    @ApiParam(value = "业务类型", example = "0")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_INFO_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer orderType;
+
+    @ApiParam("结果类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_MODE_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer qcMode;
+
+    /**
+     * 状态:1=创建,5=待处理,10=已完成,90=已关闭,91=已取消
+     */
+    @ApiParam(value = "单据状态", example = "1")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_INFO_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer orderStatus;
+
+    /**
+     * 状态:10=质检中,20=合格,30=不合格
+     */
+    @ApiParam(value = "质检状态", example = "1")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer qcStatus;
+
+    @ApiParam("备注")
+    public String remark;
+
+    @ApiParam("处理意见")
+    private String suggestion;
+
+
+    @ApiParam("客户编号")
+    public String custNo;
+
+    @ApiParam("供应商编号")
+    public String vendorNo;
+
+    @ApiParam(value = "版本", example = "1")
+    public Integer version;
+
+    @ApiParam("关联单号类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LINK_ORDER_TYPE")
+    public String refType;
+
+    @ApiParam("关联单号")
+    public String refSrc;
+
+    @ApiParam(value = "客户简称")
+    private String custName;
+
+    @ApiParam(value = "供应商全称")
+    private String vendorDesc;
+
+    @ApiParam(value = "是否生产任务", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
+    public Integer isTask;
+
+    @ApiParam(value = "是否散件", example = "2")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    public Integer isPart;
+
+    @ApiParam(value = "ERP单号")
+    public String erpSrcNo;
+
+    @ApiParam(value = "零件号")
+    public String partNo;
+
+    @ApiParam(value = "零件名称")
+    public String partNameRdd;
+
+    @ApiParam(value = "收货数量")
+    public Double poQty;
+
+    @ApiParam(value = "供应商批次")
+    private String dateCode;
+
+    @ApiParam(value = "收货日期")
+    private String rcDate;
+
+    @ApiParam("质检开始时间")
+    private String qcStartDateTime;
+
+    @ApiParam("质检结束时间")
+    private String qcEndDateTime;
+
+    @ApiParam(value = "质检状态")
+    List<Integer> qcStatusList;
+
+    @ApiParam(value = "质检状态描述")
+    public String qcStatusDesc;
+
+    @ApiParam("单据类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ITEM_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer itemType;
+
+    @ApiParam("检验类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TEST_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer testType;
+
+    @ApiParam("模块")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.SX_QMS_RC_RULE_NOTE_MODULE.class, refForeignKey = "value", value = "description")
+    private Integer module;
+
+    @ApiParam(value = "标识是ODM受入还是部品受入QMS创建的质检单 -- YES = ODM")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.IS_EXISTS.class, refForeignKey = "value", value = "description")
+    private Integer isQc;
+
+    @ApiParam("检测总结果 ODM用")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer qcStatusResult;
+
+    @ApiParam(value = "是否允许生成加严检")
+    private boolean createStricter = false;
+
+    @ApiParam(value = "合格不合格控制 默认true-允许点击")
+    private boolean conformityButtonControl;
+
+    @ApiParam("是否异常处置")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isAbnormalHandle;
+
+    @ApiParam("产品分类")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.EP_PRODUCT_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer productType;
+
+    @ApiParam("是否免检")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true)
+    private Integer iqc;
+
+    @Transient
+    @ApiParam("导出模板code")
+    private String exportTemplateCode;
+
+    @Transient
+    @ApiParam("条码")
+    private String sn;
+
+    @ApiParam("检查日期")
+    private String checkDate;
+
+    public SxQmsQCMasterExtModel(){}
+
+    public SxQmsQCMasterExtModel(
+            Long id,
+            String organizeCode,
+            String erpSrcNo,
+            String orderNo,
+            Integer qcMode,
+            Integer orderType,
+            Integer orderStatus,
+            Integer qcStatus,
+            String remark,
+            String suggestion,
+            Double poQty,
+            String custNo,
+            String vendorNo,
+            Integer version,
+            String refType,
+            String refSrc,
+            String custName,
+            String vendorDesc,
+            Integer isTask,
+            Integer isPart,
+            String partNo,
+            String partNameRdd,
+            String qcStartDateTime,
+            String qcEndDateTime,
+            String createDatetime,
+            String createUser,
+            String modifyDatetime,
+            String modifyUser,
+            Integer isDeleted,
+            Integer isValid) {
+        this.id = id;
+        this.organizeCode = organizeCode;
+        this.erpSrcNo = erpSrcNo;
+        this.orderNo = orderNo;
+        this.qcMode = qcMode;
+        this.orderType = orderType;
+        this.orderStatus = orderStatus;
+        this.qcStatus = qcStatus;
+        this.remark = remark;
+        this.suggestion = suggestion;
+        this.poQty = poQty;
+        this.custNo = custNo;
+        this.vendorNo = vendorNo;
+        this.version = version;
+        this.refType = refType;
+        this.refSrc = refSrc;
+        this.custName = custName;
+        this.vendorDesc = vendorDesc;
+        this.isTask = isTask;
+        this.isPart = isPart;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qcStartDateTime =qcStartDateTime;
+        this.qcEndDateTime = qcEndDateTime;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyDatetime = modifyDatetime;
+        this.modifyUser = modifyUser;
+        this.isDeleted=isDeleted;
+        this.isValid=isValid;
+    }
+
+    public SxQmsQCMasterExtModel(
+            Long id,
+            String organizeCode,
+            String erpSrcNo,
+            String orderNo,
+            Integer qcMode,
+            Integer orderType,
+            Integer orderStatus,
+            Integer qcStatus,
+            String remark,
+            String custNo,
+            String vendorNo,
+            Integer version,
+            String refType,
+            String refSrc,
+            String custName,
+            String vendorDesc,
+            Integer isTask,
+            Integer isPart,
+            String partNo,
+            String partNameRdd,
+            String qcStartDateTime,
+            String qcEndDateTime,
+            String createDatetime,
+            String createUser,
+            String modifyDatetime,
+            String modifyUser,
+            Integer isDeleted,
+            Integer isValid) {
+        this.id = id;
+        this.organizeCode = organizeCode;
+        this.erpSrcNo = erpSrcNo;
+        this.orderNo = orderNo;
+        this.qcMode = qcMode;
+        this.orderType = orderType;
+        this.orderStatus = orderStatus;
+        this.qcStatus = qcStatus;
+        this.remark = remark;
+        this.custNo = custNo;
+        this.vendorNo = vendorNo;
+        this.version = version;
+        this.refType = refType;
+        this.refSrc = refSrc;
+        this.custName = custName;
+        this.vendorDesc = vendorDesc;
+        this.isTask = isTask;
+        this.isPart = isPart;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qcStartDateTime =qcStartDateTime;
+        this.qcEndDateTime = qcEndDateTime;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyDatetime = modifyDatetime;
+        this.modifyUser = modifyUser;
+        this.isDeleted=isDeleted;
+        this.isValid=isValid;
+    }
+
+    public SxQmsQCMasterExtModel(
+            Long id,
+            String organizeCode,
+            String erpSrcNo,
+            String orderNo,
+            Integer qcMode,
+            Integer orderType,
+            Integer orderStatus,
+            Integer qcStatus,
+            String remark,
+            String custNo,
+            String vendorNo,
+            Integer version,
+            String refType,
+            String refSrc,
+            String custName,
+            String vendorDesc,
+            Integer isTask,
+            Integer isPart,
+            String partNo,
+            String partNameRdd,
+            String createDatetime,
+            String createUser,
+            String modifyDatetime,
+            String modifyUser,
+            Integer isDeleted,
+            Integer isValid,
+            Integer itemType,
+            Integer testType,
+            Integer qcStatusResult,
+            Integer isAbnormalHandle,
+            String rcDate) {
+        this.id = id;
+        this.organizeCode = organizeCode;
+        this.erpSrcNo = erpSrcNo;
+        this.orderNo = orderNo;
+        this.qcMode = qcMode;
+        this.orderType = orderType;
+        this.orderStatus = orderStatus;
+        this.qcStatus = qcStatus;
+        this.remark = remark;
+        this.custNo = custNo;
+        this.vendorNo = vendorNo;
+        this.version = version;
+        this.refType = refType;
+        this.refSrc = refSrc;
+        this.custName = custName;
+        this.vendorDesc = vendorDesc;
+        this.isTask = isTask;
+        this.isPart = isPart;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyDatetime = modifyDatetime;
+        this.modifyUser = modifyUser;
+        this.isDeleted=isDeleted;
+        this.isValid=isValid;
+        this.itemType=itemType;
+        this.testType=testType;
+        this.qcStatusResult = qcStatusResult;
+        this.isAbnormalHandle = isAbnormalHandle;
+        this.rcDate = rcDate;
+    }
+
+    public SxQmsQCMasterExtModel(
+            Long id,
+            String organizeCode,
+            String erpSrcNo,
+            String orderNo,
+            Integer qcMode,
+            Integer orderType,
+            Integer orderStatus,
+            Integer qcStatus,
+            String remark,
+            String suggestion,
+            Double poQty,
+            String custNo,
+            String vendorNo,
+            Integer version,
+            String refType,
+            String refSrc,
+            String custName,
+            String vendorDesc,
+            Integer isTask,
+            Integer isPart,
+            String partNo,
+            String partNameRdd,
+            String qcStartDateTime,
+            String qcEndDateTime,
+            String createDatetime,
+            String createUser,
+            String modifyDatetime,
+            String modifyUser,
+            Integer isDeleted,
+            Integer isValid,
+            Integer productType,
+            String dateCode,
+            String checkDate,
+            String rcDate) {
+        this.id = id;
+        this.organizeCode = organizeCode;
+        this.erpSrcNo = erpSrcNo;
+        this.orderNo = orderNo;
+        this.qcMode = qcMode;
+        this.orderType = orderType;
+        this.orderStatus = orderStatus;
+        this.qcStatus = qcStatus;
+        this.remark = remark;
+        this.suggestion = suggestion;
+        this.poQty = poQty;
+        this.custNo = custNo;
+        this.vendorNo = vendorNo;
+        this.version = version;
+        this.refType = refType;
+        this.refSrc = refSrc;
+        this.custName = custName;
+        this.vendorDesc = vendorDesc;
+        this.isTask = isTask;
+        this.isPart = isPart;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qcStartDateTime =qcStartDateTime;
+        this.qcEndDateTime = qcEndDateTime;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyDatetime = modifyDatetime;
+        this.modifyUser = modifyUser;
+        this.isDeleted=isDeleted;
+        this.isValid=isValid;
+        this.productType = productType;
+        this.dateCode = dateCode;
+        this.checkDate = checkDate;
+        this.rcDate = rcDate;
+    }
+
+    public SxQmsQCMasterExtModel(
+            Long id,
+            String organizeCode,
+            String erpSrcNo,
+            String orderNo,
+            Integer qcMode,
+            Integer orderType,
+            Integer orderStatus,
+            Integer qcStatus,
+            String remark,
+            String custNo,
+            String vendorNo,
+            Integer version,
+            String refType,
+            String refSrc,
+            String custName,
+            String vendorDesc,
+            Integer isTask,
+            Integer isPart,
+            String partNo,
+            String partNameRdd,
+            String createDatetime,
+            String createUser,
+            String modifyDatetime,
+            String modifyUser,
+            Integer isDeleted,
+            Integer isValid,
+            Integer itemType,
+            Integer testType,
+            Integer qcStatusResult,
+            Integer isAbnormalHandle,
+            Integer iqc) {
+        this.id = id;
+        this.organizeCode = organizeCode;
+        this.erpSrcNo = erpSrcNo;
+        this.orderNo = orderNo;
+        this.qcMode = qcMode;
+        this.orderType = orderType;
+        this.orderStatus = orderStatus;
+        this.qcStatus = qcStatus;
+        this.remark = remark;
+        this.custNo = custNo;
+        this.vendorNo = vendorNo;
+        this.version = version;
+        this.refType = refType;
+        this.refSrc = refSrc;
+        this.custName = custName;
+        this.vendorDesc = vendorDesc;
+        this.isTask = isTask;
+        this.isPart = isPart;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyDatetime = modifyDatetime;
+        this.modifyUser = modifyUser;
+        this.isDeleted=isDeleted;
+        this.isValid=isValid;
+        this.itemType=itemType;
+        this.testType=testType;
+        this.qcStatusResult = qcStatusResult;
+        this.isAbnormalHandle = isAbnormalHandle;
+        this.iqc = iqc;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsQCTransDetailModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsQCTransDetailModel.java
new file mode 100644
index 0000000..03db315
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsQCTransDetailModel.java
@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description: 质检查询model
+ * @Author: puxiao
+ * @date: 2022-03-08
+ */
+@Data
+@Api("质检查询model")
+public class SxQmsQCTransDetailModel {
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("检查区间")
+    private Integer checkRegion;
+
+    @ApiParam("检查项目")
+    private Integer projectCode;
+
+    @ApiParam("开始日期")
+    public String createDatetimeStart = "createDatetimeStart";
+
+    @ApiParam("结束日期")
+    public String createDatetimeEnd = "createDatetimeEnd";
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsQCTransDetailsReportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsQCTransDetailsReportModel.java
new file mode 100644
index 0000000..5662669
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsQCTransDetailsReportModel.java
@@ -0,0 +1,133 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description: 受入报表model
+ * @Author: puxiao
+ * @date: 2022-04-03
+ */
+@Data
+@Api("受入报表model")
+public class SxQmsQCTransDetailsReportModel {
+
+    @ApiParam("标题")
+    private List<SxDynamicAttributeModel> sxDynamicAttributeModelList;
+
+    @ApiParam("数据")
+    private List<SxQmsQCTransDetailsReportModel> sxQmsQCTransDetailsReportModelList;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("项目类型")
+    private String projectCode;
+
+    @ApiParam("项目名称")
+    private String projectName;
+
+    @ApiParam("部品类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.PART_PRODUCT_TYPE.class, refForeignKey = "value", value = "description")
+    private String partCheckType;
+
+    @ApiParam("检查区分")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_MODE_TYPE.class, refForeignKey = "value", value = "description")
+    private String qcMode;
+
+    @ApiParam("OK/NG")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_STATUS.class, refForeignKey = "value", value = "description")
+    private String qcStatus;
+
+    private Integer counting;
+
+    @ApiParam("检测值1")
+    private String count1;
+    @ApiParam("检测值2")
+    private String count2;
+    @ApiParam("检测值3")
+    private String count3;
+    @ApiParam("检测值4")
+    private String count4;
+    @ApiParam("检测值5")
+    private String count5;
+    @ApiParam("检测值6")
+    private String count6;
+    @ApiParam("检测值7")
+    private String count7;
+    @ApiParam("检测值8")
+    private String count8;
+    @ApiParam("检测值9")
+    private String count9;
+    @ApiParam("检测值10")
+    private String count10;
+    @ApiParam("检测值11")
+    private String count11;
+    @ApiParam("检测值12")
+    private String count12;
+    @ApiParam("检测值13")
+    private String count13;
+    @ApiParam("检测值14")
+    private String count14;
+    @ApiParam("检测值15")
+    private String count15;
+
+    @ApiParam("检测值16")
+    private String count16;
+    @ApiParam("检测值17")
+    private String count17;
+    @ApiParam("检测值18")
+    private String count18;
+    @ApiParam("检测值19")
+    private String count19;
+    @ApiParam("检测值20")
+    private String count20;
+    @ApiParam("检测值21")
+    private String count21;
+    @ApiParam("检测值22")
+    private String count22;
+    @ApiParam("检测值23")
+    private String count23;
+    @ApiParam("检测值24")
+    private String count24;
+    @ApiParam("检测值25")
+    private String count25;
+    @ApiParam("检测值26")
+    private String count26;
+    @ApiParam("检测值27")
+    private String count27;
+    @ApiParam("检测值28")
+    private String count28;
+    @ApiParam("检测值29")
+    private String count29;
+    @ApiParam("检测值30")
+    private String count30;
+    @ApiParam("检测值31")
+    private String count31;
+
+    @ApiParam("合格数量")
+    private Integer count;
+
+    @ApiParam("外观不合格")
+    private Integer appearanceCount;
+
+    @ApiParam("尺寸不合格")
+    private Integer sizeCount;
+
+    @ApiParam("实验不合格")
+    private Integer experrimentCount;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsRcRuleNoteImportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsRcRuleNoteImportModel.java
new file mode 100644
index 0000000..9a20f35
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsRcRuleNoteImportModel.java
@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+
+
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsRcRuleNote;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsRcRuleNoteDetail;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description: 质检规格书model
+ * @Author: puxiao
+ * @date: 2022-04-05
+ */
+@Data
+@Api("质检规格书model")
+public class SxQmsRcRuleNoteImportModel {
+    @ApiParam("规格书")
+    private SxQmsRcRuleNote sxQmsRcRuleNote;
+
+    @ApiParam("规格书明细")
+    private List<SxQmsRcRuleNoteDetail> sxQmsRcRuleNoteDetailList;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsRecheckInstructionModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsRecheckInstructionModel.java
new file mode 100644
index 0000000..60549d7
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsRecheckInstructionModel.java
@@ -0,0 +1,92 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-02-15 11:14
+ */
+@Data
+@ApiModel("再检指示书MODEL")
+public class SxQmsRecheckInstructionModel implements Serializable {
+
+    private static final long serialVersionUID = -6009512114462934601L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("创建人")
+    private String createUser;
+
+    @ApiParam("创建时间")
+    private String createDatetime;
+
+    @ApiParam("编辑人")
+    private String modifyUser;
+
+    @ApiParam("编辑时间")
+    private String modifyDatetime;
+
+    @ApiParam("有效性")
+    private Integer isValid;
+
+    @ApiParam("是否已删除")
+    private Integer isDeleted;
+
+    @ApiParam("再检指示单号")
+    private String recheckInstructionNo;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("机种编码")
+    private String machineCode;
+
+    @ApiParam("不合格内容")
+    private String belowStandardContent;
+
+    @ApiParam("再检方法")
+    private String recheckMethod;
+
+    @ApiParam("再检场所")
+    private String recheckPlace;
+
+    @ApiParam("处置方法1")
+    private String disposalMethods1;
+
+    @ApiParam("处置方法2")
+    private String disposalMethods2;
+
+    @ApiParam("处置方法3")
+    private String disposalMethods3;
+
+    @ApiParam("其他不符合1")
+    private String otherNonconformingItems1;
+
+    @ApiParam("其他不符合2")
+    private String otherNonconformingItems2;
+
+    @ApiParam("其他不符合3")
+    private String otherNonconformingItems3;
+
+    @ApiParam("抽检结果1")
+    private String spotCheckResults1;
+
+    @ApiParam("抽检结果2")
+    private String spotCheckResults2;
+
+    @ApiParam("单据状态 1-已创建,2-已完成")
+    private Integer instructionStatus;
+
+    @ApiParam("单据状态描述 1-已创建,2-已完成")
+    private String instructionStatusName;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsShipStopOrderDetailInsertModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsShipStopOrderDetailInsertModel.java
new file mode 100644
index 0000000..d434df2
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsShipStopOrderDetailInsertModel.java
@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsOqcCheckPackageDetail;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsShipStopOrder;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsShipStopOrderDetail;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("出货停止指示书明细新增MODEL")
+public class SxQmsShipStopOrderDetailInsertModel {
+    //工厂代码
+    private String organizeCode;
+    //出货停止指示书明细
+    private List<SxQmsShipStopOrderDetail> sxQmsShipStopOrderDetail;
+    //出货停止指示书
+    private SxQmsShipStopOrder sxQmsShipStopOrder;
+
+    //出货停止指令书明细
+    private List<SxQmsOqcCheckPackageDetail> sxQmsOqcCheckPackageDetailList;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsShipmentManagementTestMonitoringModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsShipmentManagementTestMonitoringModel.java
new file mode 100644
index 0000000..0763aa5
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsShipmentManagementTestMonitoringModel.java
@@ -0,0 +1,65 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 出货管理试验监控导出model
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2022/5/30 14:52
+ * @Modify:
+ **/
+@Data
+@Api("出货管理试验监控导出model")
+public class SxQmsShipmentManagementTestMonitoringModel {
+
+    @ApiParam("产品类型名称")
+    private String productTypeName;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("仕向地")
+    private String toLand;
+
+    @ApiParam("电压频率")
+    private String voltageFrequency;
+
+    @ApiParam("台数")
+    private Integer count;
+
+    @ApiParam("试验周期")
+    private String testCycle;
+
+    @ApiParam("试验类型区分")
+    private String testTypeDistinguishStr;
+
+    @ApiParam("计划")
+    private String plan;
+
+    @ApiParam("报告日期")
+    private String reportDatetime;
+
+    @ApiParam("实绩")
+    private String result;
+
+    @ApiParam("备注")
+    private String memo;
+
+    @ApiParam("创建人")
+    private String createUser;
+
+    @ApiParam("创建时间")
+    private String createDatetime;
+
+    @ApiParam("更新人")
+    private String modifyUser;
+
+    @ApiParam("更新时间")
+    private String modifyDatetime;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsTableTitle.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsTableTitle.java
new file mode 100644
index 0000000..d27760f
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsTableTitle.java
@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author puxiao.liao
+ * @version 1.0
+ * @date 2022-04-14 15:32
+ **/
+@Data
+@ApiModel("表格title-MODEL")
+public class SxQmsTableTitle implements Serializable {
+
+    @ApiParam("工厂编码")
+    private String organizeCode;
+
+    @ApiParam("title编码")
+    private String titleCode;
+
+    @ApiParam("title描述")
+    private String titleDesc;
+
+    @ApiParam("模块")
+    private Integer module;
+
+    @ApiParam("序号")
+    private Integer index;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsVqeAbnormalMasterModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsVqeAbnormalMasterModel.java
new file mode 100644
index 0000000..ace04c4
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsVqeAbnormalMasterModel.java
@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+
+@Api("供应商业绩异常联络单model,非创建状态不可编辑项")
+@Data
+public class SxQmsVqeAbnormalMasterModel {
+
+    @Column(name = "MONTH")
+    @ApiParam("评价月份")
+    private Integer month;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNameRdd;
+
+    @Column(name = "MONTH_GRADE")
+    @ApiParam("当月等级")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ABCD.class)
+    private Integer monthGrade;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsVqeAbnormalReplyModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsVqeAbnormalReplyModel.java
new file mode 100644
index 0000000..89f9ce1
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxQmsVqeAbnormalReplyModel.java
@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsVqeAbnormalDetail;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsVqeAbnormalMaster;
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Api("供应商业务异常联络单model")
+public class SxQmsVqeAbnormalReplyModel {
+
+    private String organizeCode;
+
+    private SxQmsVqeAbnormalMaster sxQmsVqeAbnormalMaster;
+
+    private List<SxQmsVqeAbnormalDetail> sxQmsVqeAbnormalDetailList;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxRepairExpedientModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxRepairExpedientModel.java
new file mode 100644
index 0000000..5472686
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxRepairExpedientModel.java
@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("维修措施model")
+public class SxRepairExpedientModel implements Serializable {
+
+    private static final long serialVersionUID = 8662071628239289460L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam(value = "维修代码")
+    private String repairCode;
+
+    @ApiParam(value = "维修名称")
+    public String repairName;
+
+    @ApiParam("维修类型")
+    private String repairType;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("有效性")
+    public Integer isValid;
+
+    @ApiParam("是否已删除")
+    public Integer isDeleted;
+
+    @ApiParam("创建用户")
+    public String createUser;
+
+    @ApiParam("创建日期")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改日期")
+    public String modifyDatetime;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxShiftModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxShiftModel.java
new file mode 100644
index 0000000..621358c
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxShiftModel.java
@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("班次信息MODEL")
+public class SxShiftModel implements Serializable {
+
+    private static final long serialVersionUID = -6630429228876470427L;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @ApiParam("开班时间")
+    private String startTime;
+
+    @ApiParam("下班时间")
+    private String endTime;
+
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("创建人")
+    private String createUser;
+
+    @ApiParam("创建时间")
+    private String createDatetime;
+
+    @ApiParam("编辑人")
+    private String modifyUser;
+
+    @ApiParam("编辑时间")
+    private String modifyDatetime;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxVendorDefectCountDataModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxVendorDefectCountDataModel.java
new file mode 100644
index 0000000..14ecfc4
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxVendorDefectCountDataModel.java
@@ -0,0 +1,108 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *  @Description: 厂家不合格统计model
+ * @author puxiao.liao
+ * @version 1.0
+ * @date 2022-04-14 15:32
+ **/
+@Data
+@ApiModel("厂家不合格统计model")
+public class SxVendorDefectCountDataModel {
+
+
+    @ApiParam("标题")
+    private List<SxDynamicAttributeModel> sxDynamicAttributeModelList;
+
+    @ApiParam("数据")
+    private List<SxVendorDefectCountDataModel> sxVendorDefectCountDataModelList;
+
+    @ApiParam("分页数据")
+    private Pager pager;
+
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("总计")
+    private Integer sumQty;
+
+    @ApiParam("合格数量")
+    private Integer okQty;
+
+    @ApiParam("检测值1")
+    private String count1;
+    @ApiParam("检测值2")
+    private String count2;
+    @ApiParam("检测值3")
+    private String count3;
+    @ApiParam("检测值4")
+    private String count4;
+    @ApiParam("检测值5")
+    private String count5;
+    @ApiParam("检测值6")
+    private String count6;
+    @ApiParam("检测值7")
+    private String count7;
+    @ApiParam("检测值8")
+    private String count8;
+    @ApiParam("检测值9")
+    private String count9;
+    @ApiParam("检测值10")
+    private String count10;
+    @ApiParam("检测值11")
+    private String count11;
+    @ApiParam("检测值12")
+    private String count12;
+    @ApiParam("检测值13")
+    private String count13;
+    @ApiParam("检测值14")
+    private String count14;
+    @ApiParam("检测值15")
+    private String count15;
+
+    @ApiParam("检测值16")
+    private String count16;
+    @ApiParam("检测值17")
+    private String count17;
+    @ApiParam("检测值18")
+    private String count18;
+    @ApiParam("检测值19")
+    private String count19;
+    @ApiParam("检测值20")
+    private String count20;
+    @ApiParam("检测值21")
+    private String count21;
+    @ApiParam("检测值22")
+    private String count22;
+    @ApiParam("检测值23")
+    private String count23;
+    @ApiParam("检测值24")
+    private String count24;
+    @ApiParam("检测值25")
+    private String count25;
+    @ApiParam("检测值26")
+    private String count26;
+    @ApiParam("检测值27")
+    private String count27;
+    @ApiParam("检测值28")
+    private String count28;
+    @ApiParam("检测值29")
+    private String count29;
+    @ApiParam("检测值30")
+    private String count30;
+    @ApiParam("检测值31")
+    private String count31;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxVendorQEvaluateDetailReportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxVendorQEvaluateDetailReportModel.java
new file mode 100644
index 0000000..1059934
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxVendorQEvaluateDetailReportModel.java
@@ -0,0 +1,73 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+@Api("供应商Q评价明细model")
+public class SxVendorQEvaluateDetailReportModel {
+    @ApiParam("工厂编号")
+    private String organizeCode;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("发生日期")
+    private String occureDate;
+
+    @ApiParam("异常发生场所")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ABNORMAL_SOURCE.class, refForeignKey = "value", value = "description")
+    public Integer busiType;
+
+    @ApiParam("线别")
+    private String workCenterCode;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("不良内容")
+    private String badContent;
+
+    @ApiParam("缺陷等级")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.DEFECT_LEVEL.class, refForeignKey = "value", value = "description")
+    private Integer defectLevel;
+
+    @ApiParam("扣减分数")
+    private Integer minusScore;
+
+    @ApiParam("创建人")
+    private String createUser;
+
+    @ApiParam("创建时间")
+    private String createDatetime;
+
+    @ApiParam("查询参数，开始创建时间")
+    private String createDatetimeStart;
+
+    @ApiParam("查询参数，结束创建时间")
+    private String createDatetimeEnd;
+
+    public SxVendorQEvaluateDetailReportModel(String organizeCode, String vendorNo, String vendorName, String occureDate, Integer busiType, String workCenterCode, String partNo, String partNameRdd, String badContent, Integer defectLevel, String createUser, String createDatetime) {
+        this.organizeCode = organizeCode;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.occureDate = occureDate;
+        this.busiType = busiType;
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.badContent = badContent;
+        this.defectLevel = defectLevel;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxVendorQEvaluateMonitorReportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxVendorQEvaluateMonitorReportModel.java
new file mode 100644
index 0000000..947b05e
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxVendorQEvaluateMonitorReportModel.java
@@ -0,0 +1,74 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+@Api("供应商Q评价CD监控报表model")
+public class SxVendorQEvaluateMonitorReportModel {
+
+    @ApiParam("4月评价等级")
+    private String aprilGrade;
+
+    @ApiParam("5月评价等级")
+    private String mayGrade;
+
+    @ApiParam("6月评价等级")
+    private String juneGrade;
+
+    @ApiParam("7月评价等级")
+    private String julyGrade;
+
+    @ApiParam("8月评价等级")
+    private String augustGrade;
+
+    @ApiParam("9月评价等级")
+    private String septemberGrade;
+
+    @ApiParam("10月评价等级")
+    private String octoberGrade;
+
+    @ApiParam("11月评价等级")
+    private String novemberGrade;
+
+    @ApiParam("12月评价等级")
+    private String decemberGrade;
+
+    @ApiParam("1月评价等级")
+    private String januaryGrade;
+
+    @ApiParam("2月评价等级")
+    private String februaryGrade;
+
+    @ApiParam("3月评价等级")
+    private String marchGrade;
+
+    @ApiParam("受入检查分")
+    private Integer incomingScore;
+
+    @ApiParam("制造工程分")
+    private Integer engineeringScore;
+
+    @ApiParam("市场反馈分")
+    private Integer marketScore;
+
+    @ApiParam("人工加减分")
+    private Integer artificialScore;
+
+    @ApiParam("总分")
+    private Integer totalScore;
+
+
+    @ApiParam("工厂编号")
+    private String organizeCode;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("年份")
+    private Integer year;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxVendorQEvaluateMonthReportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxVendorQEvaluateMonthReportModel.java
new file mode 100644
index 0000000..38f38a6
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxVendorQEvaluateMonthReportModel.java
@@ -0,0 +1,122 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("供应商Q评价月报model")
+public class SxVendorQEvaluateMonthReportModel {
+
+    @ApiParam("年份")
+    private Integer year;
+
+    @ApiParam("月份")
+    private Integer month;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("受入检查(重)次数")
+    private Integer incomingSevereCount;
+
+    @ApiParam("受入检查(重)分数")
+    private Integer incomingSevereScore;
+
+    @ApiParam("受入检查(中)次数")
+    private Integer incomingModerateCount;
+
+    @ApiParam("受入检查(中)分数")
+    private Integer incomingModerateScore;
+
+    @ApiParam("受入检查(轻)次数")
+    private Integer incomingMinorCount;
+
+    @ApiParam("受入检查(轻)分数")
+    private Integer incomingMinorScore;
+
+    @ApiParam("制造工程(重)次数")
+    private Integer engineeringSevereCount;
+
+    @ApiParam("制造工程(重)分数")
+    private Integer engineeringSevereScore;
+
+    @ApiParam("制造工程(中)次数")
+    private Integer engineeringModerateCount;
+
+    @ApiParam("制造工程(中)分数")
+    private Integer engineeringModerateScore;
+
+    @ApiParam("制造工程(轻)次数")
+    private Integer engineeringMinorCount;
+
+    @ApiParam("制造工程(轻)分数")
+    private Integer engineeringMinorScore;
+
+    @ApiParam("市场反馈(重)次数")
+    private Integer marketSevereCount;
+
+    @ApiParam("市场反馈(重)分数")
+    private Integer marketSevereScore;
+
+    @ApiParam("市场反馈(中)次数")
+    private Integer marketModerateCount;
+
+    @ApiParam("市场反馈(中)分数")
+    private Integer marketModerateScore;
+
+    @ApiParam("市场反馈(轻)次数")
+    private Integer marketMinorCount;
+
+    @ApiParam("市场反馈(轻)分数")
+    private Integer marketMinorScore;
+
+    @ApiParam("品质管理(次数)")
+    private Integer qualityManagementCount;
+
+    @ApiParam("品质管理(分值)")
+    private Integer qualityManagementScore;
+
+    @ApiParam("RoHS违反(次数)")
+    private Integer rohsViolationCount;
+
+    @ApiParam("RoHS违反(分值)")
+    private Integer rohsViolationScore;
+
+    @ApiParam("重大事件发生(次数)")
+    private Integer majorIncidentCount;
+
+    @ApiParam("重大事件发生(分值)")
+    private Integer majorIncidentScore;
+
+    @ApiParam("4M擅自变更(次数)")
+    private Integer unauthorizedChangeCount;
+
+    @ApiParam("4M擅自变更(分值)")
+    private Integer unauthorizedChangeScore;
+
+    @ApiParam("其他(次数)")
+    private Integer otherCount;
+
+    @ApiParam("其他(分值)")
+    private Integer otherScore;
+
+    @ApiParam("总分")
+    private Integer totalScore;
+
+    @ApiParam("等级")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ABCD.class)
+    private Integer monthGrade;
+
+    @ApiParam("工厂编号")
+    private String organizeCode;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxWorkCellModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxWorkCellModel.java
new file mode 100644
index 0000000..33bee26
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxWorkCellModel.java
@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("工位model")
+public class SxWorkCellModel implements Serializable {
+
+    private static final long serialVersionUID = -6630723169304972112L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("生产区域代码")
+    private String areaCode;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("有效性")
+    public Integer isValid;
+
+    @ApiParam("是否已删除")
+    public Integer isDeleted;
+
+    @ApiParam("创建用户")
+    public String createUser;
+
+    @ApiParam("创建日期")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改日期")
+    public String modifyDatetime;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxWorkOrderModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxWorkOrderModel.java
new file mode 100644
index 0000000..623957b
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/SxWorkOrderModel.java
@@ -0,0 +1,126 @@
+package cn.estsh.i3plus.pojo.qms.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 16:29
+ **/
+@ApiModel("生产工单MODEL")
+@Data
+public class SxWorkOrderModel implements Serializable {
+
+    private static final long serialVersionUID = 5430390206403006189L;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @ApiParam("生产线代码")
+    private String workCenterCode;
+
+    @ApiParam("生产线名称")
+    public String workCenterName;
+
+    @ApiParam("工单状态代码")
+    private Integer workOrderStatus;
+
+    @ApiParam("工单状态")
+    private String workOrderStatusName;
+
+    @ApiParam("工单类型代码-正常/试制/返工")
+    private Integer workOrderType;
+
+    @ApiParam("工单类型")
+    private String workOrderTypeName;
+
+    @ApiParam("计划开始时间")
+    private String startTime;
+
+    @ApiParam("计划结束时间")
+    private String endTime;
+
+    @ApiParam("排产日期")
+    private String scheduleDate;
+
+    @ApiParam("计划数量")
+    private Double qty;
+
+    @ApiParam("返工计划数量")
+    private Double planQty;
+
+    @ApiParam("完成数量")
+    private Double completeQty;
+
+    @ApiParam("工单来源")
+    private String workOrderSource;
+
+    @ApiParam("创建人")
+    private String createUser;
+
+    @ApiParam("创建时间")
+    private String createDatetime;
+
+    @ApiParam("编辑人")
+    private String modifyUser;
+
+    @ApiParam("编辑时间")
+    private String modifyDatetime;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("缺件数量")
+    private Double missingQty;
+
+    @ApiParam("生产排序")
+    private Double seq;
+
+    @ApiParam("排序属性")
+    public String orderByParam = "";
+
+    @ApiParam(
+            value = "排序类型，1 正序，2 倒序",
+            example = "1"
+    )
+    public Integer ascOrDesc = 1;
+
+    @ApiParam("计划开始时间开始")
+    private String startTimeStart;
+
+    @ApiParam("计划开始时间结束")
+    private String startTimeEnd;
+
+    @ApiParam("更新开始时间")
+    private String modifyStartTime;
+
+    @ApiParam("更新结束时间")
+    private String modifyEndTime;
+
+    @ApiParam("计划结束时间开始")
+    private String endTimeStart;
+
+    @ApiParam("计划结束时间结束")
+    private String endTimeEnd;
+
+    @ApiParam("条码生成状态")
+    private Integer snCreateStatus;
+
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuBadnessClassifyDetailModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuBadnessClassifyDetailModel.java
new file mode 100644
index 0000000..a57d4d4
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuBadnessClassifyDetailModel.java
@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description :不良分类明细MODEL
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("不良分类明细MODEL")
+public class BuBadnessClassifyDetailModel implements Serializable {
+
+    private static final long serialVersionUID = -3015345806769828803L;
+    @ApiParam("不良分类代码")
+    private String badnessClassifyCode;
+
+    @ApiParam("不良分类名称")
+    private String badnessClassifyName;
+
+    @ApiParam("不良分类明细代码")
+    private String badnessClassifyDetailCode;
+
+    @ApiParam("不良分类明细名称")
+    private String badnessClassifyDetailName;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("创建人")
+    public String createUser;
+
+    @ApiParam("创建时间")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改时间")
+    public String modifyDatetime;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuBadnessClassifyModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuBadnessClassifyModel.java
new file mode 100644
index 0000000..c8dd89f
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuBadnessClassifyModel.java
@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description :不良分类MODEL
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-06-04
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("不良分类MODEL")
+public class BuBadnessClassifyModel implements Serializable {
+
+    private static final long serialVersionUID = 979235509750176039L;
+    @ApiParam("不良类型代码")
+    private String badnessTypeCode;
+
+    @ApiParam("不良分类代码")
+    private String badnessClassifyCode;
+
+    @ApiParam("不良分类名称")
+    private String badnessClassifyName;
+
+    @ApiParam("不良类型名称")
+    private String badnessTypeName;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("创建人")
+    public String createUser;
+
+    @ApiParam("创建时间")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改时间")
+    public String modifyDatetime;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuNumberRuleModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuNumberRuleModel.java
new file mode 100644
index 0000000..cc80763
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuNumberRuleModel.java
@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-mes-panasonic-bu
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-07-14 17:15
+ */
+@Data
+@ApiModel("生产编码规则MODEL")
+public class BuNumberRuleModel implements Serializable {
+
+    private static final long serialVersionUID = -8421559191008405471L;
+    @ApiParam("规则代码")
+    private String ruleCode;
+
+    @ApiParam("规则描述")
+    private String ruleDesc;
+
+    @ApiParam("前缀")
+    private String prefix;
+
+    @ApiParam("编码规则")
+    private String numberRule;
+
+    @ApiParam("序号长度")
+    private Integer serialnoLength;
+
+    @ApiParam("增量")
+    private Integer serialnoIncrement = 1;
+
+    @ApiParam("起始值")
+    private Integer beginVal = 1;
+
+    @ApiParam("最大值")
+    private Integer endVal;
+
+    @ApiParam("最大值后循环")
+    private Integer isCycle;
+
+    @ApiParam("最大值后不循环的实现类")
+    private String implClass;
+
+    @ApiParam("拼接固定字符,多个逗号分隔")
+    private String spiltRule;
+
+    @ApiParam("构造入参方法名")
+    private String methodName;
+
+    @ApiParam("规则属性长度拼接")
+    private String ruleLengthSpilt;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcBatchModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcBatchModel.java
new file mode 100644
index 0000000..135daad
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcBatchModel.java
@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("出货检验信息model")
+public class BuOqcBatchModel implements Serializable {
+
+    private static final long serialVersionUID = -909534231613605494L;
+    @ApiParam("id")
+    private List<Long> idList;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("检验单号")
+    private String oqcNo;
+
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcCheckDetailReportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcCheckDetailReportModel.java
new file mode 100644
index 0000000..1ffb0ab
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcCheckDetailReportModel.java
@@ -0,0 +1,125 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("BU出货检验项目明细报表 MODEL")
+public class BuOqcCheckDetailReportModel implements Serializable {
+
+    private static final long serialVersionUID = 8121267344743716004L;
+
+    @ApiParam("生产日期")
+    private String workTime;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @ApiParam("单据号")
+    private String oqcNo;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("包装条码")
+    private String packageNo;
+
+    @ApiParam("检验顺序")
+    private Double seq;
+
+    @ApiParam("检查项目")
+    private String checkItem;
+
+    @ApiParam("判定基准")
+    private String standard;
+
+    @ApiParam("检查器具")
+    private String checkTool;
+
+    @ApiParam("判断方式")
+    private Integer checkType;
+
+    @ApiParam("判断方式")
+    private String checkTypeName;
+
+    @ApiParam("标准值")
+    private String standardValue;
+
+    @ApiParam("上限值")
+    private String upLimit;
+
+    @ApiParam("下限值")
+    private String downLimit;
+
+    @ApiParam("备注")
+    private String remark;
+
+    @ApiParam("实际值")
+    private String checkValue;
+
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @ApiParam("检验结果")
+    private String checkResultName;
+
+    @ApiParam("检验结果背景颜色")
+    private String checkResultColor;
+
+    @ApiParam("检验人")
+    private String checkUser;
+
+    @ApiParam("项目检验时间")
+    private String itemCheckTime;
+
+    @ApiParam("确认人")
+    private String confirmUser;
+
+    @ApiParam("确认时间")
+    private String confirmTime;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("创建人")
+    public String createUser;
+
+    @ApiParam("创建时间")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改时间")
+    public String modifyDatetime;
+
+    @ApiParam("id")
+    public String idStr;
+
+    @ApiParam("生产日期开始")
+    public String workTimeStart;
+
+    @ApiParam("生产日期结束")
+    public String workTimeEnd;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcCheckFreConfirmDetailReportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcCheckFreConfirmDetailReportModel.java
new file mode 100644
index 0000000..1db56fc
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcCheckFreConfirmDetailReportModel.java
@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("BU出货检验缺件确认 MODEL")
+public class BuOqcCheckFreConfirmDetailReportModel implements Serializable {
+
+    private static final long serialVersionUID = -277521187974722570L;
+
+    @ApiParam("id")
+    public String idStr;
+
+    @ApiParam("工厂")
+    public String organizeCode;
+
+    @ApiParam("产品条码")
+    public String serialNumber;
+
+    @ApiParam("生产工单号")
+    public String workOrderNo;
+
+    @ApiParam("物料号")
+    public String partNo;
+
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @ApiParam("创建用户")
+    public String createUser;
+
+    @ApiParam("创建日期")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改日期")
+    public String modifyDatetime;
+
+    @ApiParam("原材料物料编码")
+    private String itemPartNo;
+
+    @ApiParam("原材料物料名称")
+    private String itemPartName;
+
+    @ApiParam(value = "原材料物料数量")
+    private Double qty;
+
+}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcCheckFreConfirmReportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcCheckFreConfirmReportModel.java
new file mode 100644
index 0000000..8004ab6
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcCheckFreConfirmReportModel.java
@@ -0,0 +1,101 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("BU出货检验缺件确认 MODEL")
+public class BuOqcCheckFreConfirmReportModel implements Serializable {
+
+    private static final long serialVersionUID = -4038356551797410431L;
+
+    @ApiParam("id")
+    public String idStr;
+
+    @ApiParam("工厂")
+    public String organizeCode;
+
+    @ApiParam("产品条码")
+    public String serialNumber;
+
+    @ApiParam("生产工单号")
+    public String workOrderNo;
+
+    @ApiParam("物料号")
+    public String partNo;
+
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @ApiParam("创建用户")
+    public String createUser;
+
+    @ApiParam("创建日期")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改日期")
+    public String modifyDatetime;
+
+    @ApiParam("下线产线")
+    private String workCenterCode;
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("下线时间")
+    private String outWcTime;
+
+    @ApiParam("补件状态")
+    private Integer freStatus;
+
+    @ApiParam("补件状态")
+    private String freStatusName;
+
+    @ApiParam("补件人")
+    private String freUser;
+
+    @ApiParam("补件时间")
+    private String freTime;
+
+    @ApiParam("确认状态")
+    private Integer confirmStatus;
+
+    @ApiParam("确认状态")
+    private String confirmStatusName;
+
+    @ApiParam("确认人")
+    private String confirmUser;
+
+    @ApiParam("确认时间")
+    private String confirmTime;
+
+    @ApiParam("下线时间开始")
+    private String outWcTimeStart;
+
+    @ApiParam("下线时间结束")
+    private String outWcTimeEnd;
+
+    @ApiParam("补件时间开始")
+    private String freTimeStart;
+
+    @ApiParam("补件时间结束")
+    private String freTimeEnd;
+
+    @ApiParam("确认时间开始")
+    private String confirmTimeStart;
+
+    @ApiParam("确认时间结束")
+    private String confirmTimeEnd;
+
+}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcCheckQualityEarlyWarningReportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcCheckQualityEarlyWarningReportModel.java
new file mode 100644
index 0000000..7fc2f71
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcCheckQualityEarlyWarningReportModel.java
@@ -0,0 +1,70 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+
+import cn.estsh.i3plus.pojo.qms.model.SxDynamicAttributeModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("BU出货检验质量预警报表 MODEL")
+public class BuOqcCheckQualityEarlyWarningReportModel implements Serializable {
+
+    private static final long serialVersionUID = -3402596554658100525L;
+
+    @ApiParam("查询维度")
+    private Integer dimension;
+
+    @ApiParam("查询维度")
+    private Integer dimension1;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("发生时间起始")
+    private String happenTimeStart;
+
+    @ApiParam("发生时间结束")
+    public String happenTimeEnd;
+
+    @ApiParam("检验时间起始")
+    private String checkTimeStart;
+
+    @ApiParam("检验时间结束")
+    public String checkTimeEnd;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("table动态列名")
+    private List<SxDynamicAttributeModel> attributeList = new ArrayList<>();
+
+    @ApiParam("table数据")
+    private List<Map<String, Object>> dataList;
+
+    public String toBaseString() {
+        return "BuOqcCheckQualityEarlyWarningReportModel{" +
+                "dimension=" + dimension +
+                ", dimension1=" + dimension1 +
+                ", workCenterCode='" + workCenterCode + '\'' +
+                ", happenTimeStart='" + happenTimeStart + '\'' +
+                ", happenTimeEnd='" + happenTimeEnd + '\'' +
+                ", organizeCode='" + organizeCode + '\'' +
+                '}';
+    }
+
+    public BuOqcCheckQualityEarlyWarningReportModel addAttribute(SxDynamicAttributeModel attribute) {
+        this.attributeList.add(attribute);
+        return this;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcCheckReportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcCheckReportModel.java
new file mode 100644
index 0000000..e2de82d
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcCheckReportModel.java
@@ -0,0 +1,199 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("BU出货检验结果明细报表 MODEL")
+public class BuOqcCheckReportModel implements Serializable {
+
+    private static final long serialVersionUID = -2157256311162608054L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("生产日期")
+    private String workTime;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @ApiParam("工单类型")
+    private String workOrderTypeName;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("产品类别")
+    private String categoryCode3;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @ApiParam("单据号")
+    private String oqcNo;
+
+    @ApiParam("检验单类型")
+    private Integer oqcNoType;
+
+    @ApiParam("检验单类型")
+    private String oqcNoTypeName;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("包装条码")
+    private String packageNo;
+
+    @ApiParam("计划数量")
+    private Double qty;
+
+    @ApiParam("抽检数量")
+    private Double spotCheckQty;
+
+    @ApiParam("检测数量")
+    private Double oqcQty;
+
+    @ApiParam("产品类型")
+    private String snType;
+
+    @ApiParam("产品类型")
+    private String snTypeName;
+
+    @ApiParam("检测方式")
+    private Integer oqcType;
+
+    @ApiParam("检测方式")
+    private String oqcTypeName;
+
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @ApiParam("检验结果")
+    private String checkResultName;
+
+    @ApiParam("检验结果背景颜色")
+    private String checkResultColor;
+
+    @ApiParam("检验人")
+    private String checkUser;
+
+    @ApiParam("检验时间")
+    private String checkTime;
+
+    @ApiParam("不良类型代码")
+    private String badnessTypeCode;
+
+    @ApiParam("不良类型名称")
+    private String badnessTypeName;
+
+    @ApiParam("不良分类代码")
+    private String badnessClassifyCode;
+
+    @ApiParam("不良分类名称")
+    private String badnessClassifyName;
+
+    @ApiParam("不良分类明细编码")
+    private String badnessClassifyDetailCode;
+
+    @ApiParam("不良分类明细名称")
+    private String badnessClassifyDetailName;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("创建人")
+    private String createUser;
+
+    @ApiParam("创建时间")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改时间")
+    private String modifyDatetime;
+
+    @ApiParam("生产日期开始")
+    private String workTimeStart;
+
+    @ApiParam("生产日期结束")
+    private String workTimeEnd;
+
+    @ApiParam("销售向")
+    private String salesTo;
+
+    @ApiParam("生产日期")
+    private String workTimeBak;
+
+    @ApiParam("创建日期开始")
+    public String createDatetimeStart;
+
+    @ApiParam("创建日期结束")
+    public String createDatetimeEnd;
+
+    @ApiParam("成品=10/组件=20")
+    private Integer pageType;
+
+    @ApiParam("抽检范围开始")
+    public Integer batchLimitStart;
+
+    @ApiParam("抽检范围结束")
+    public Integer batchLimitEnd;
+
+    @ApiParam("备注")
+    private String remark;
+
+    public BuOqcCheckReportModel() {}
+
+    //出货检验月报日报
+    public BuOqcCheckReportModel(String workTime, String oqcNo, String workOrderNo, Integer workOrderType, String partNo, String partNameRdd, String workCenterCode, String shiftCode,
+                                 Integer oqcNoType, String serialNumber, String packageNo, Double qty, Double spotCheckQty, Double oqcQty, Integer oqcType, Integer checkResult,
+                                 String checkUser, String checkTime, String badnessTypeCode, String badnessClassifyCode, String badnessClassifyDetailName,
+                                 String createUser, String createDatetime, String modifyUser, String modifyDatetime, String categoryCode3, String salesTo) {
+        this.workTime = workTime;
+        this.oqcNo = oqcNo;
+        this.workOrderNo = workOrderNo;
+        this.workOrderType = workOrderType;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workCenterCode = workCenterCode;
+        this.shiftCode = shiftCode;
+        this.oqcNoType = oqcNoType;
+        this.serialNumber = serialNumber;
+        this.packageNo = packageNo;
+        this.qty = qty;
+        this.spotCheckQty = spotCheckQty;
+        this.oqcQty = oqcQty;
+        this.oqcType = oqcType;
+        this.checkResult = checkResult;
+        this.checkUser = checkUser;
+        this.checkTime = checkTime;
+        this.badnessTypeCode = badnessTypeCode;
+        this.badnessClassifyCode = badnessClassifyCode;
+        this.badnessClassifyDetailName = badnessClassifyDetailName;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.categoryCode3 = categoryCode3;
+        this.salesTo = salesTo;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcCheckStatisticsReportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcCheckStatisticsReportModel.java
new file mode 100644
index 0000000..4308a8e
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcCheckStatisticsReportModel.java
@@ -0,0 +1,127 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+
+import cn.estsh.i3plus.pojo.qms.model.SxDynamicAttributeModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("BU出货检验月报日报model")
+public class BuOqcCheckStatisticsReportModel implements Serializable {
+
+    private static final long serialVersionUID = -4951355680517558336L;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("生产日期")
+    private String workTime;
+
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @ApiParam("产品类别")
+    private String categoryCode3;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("销售向")
+    private String salesTo;
+
+    @ApiParam("销售向")
+    private String salesToName;
+
+    @ApiParam("生产批量数")
+    private Integer workTimesQty;
+
+    @ApiParam("检验批量数")
+    private Integer lastCheckedQty;
+
+    @ApiParam("检验台数")
+    private Double checkAmountQty;
+
+    @ApiParam("产量")
+    private Double qty;
+
+    @ApiParam("抽样率")
+    private String sampleRate;
+
+    @ApiParam("缺点数")
+    private Integer unQcQty;
+
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @ApiParam("抽检数量")
+    private Double spotCheckQty;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("生产日期开始")
+    public String workTimeStart;
+
+    @ApiParam("生产日期结束")
+    public String workTimeEnd;
+
+    @ApiParam("查询维度")
+    private Integer dimension;
+
+    @ApiParam("查询维度")
+    private Integer dimension1;
+
+    @ApiParam("table动态列名")
+    private List<SxDynamicAttributeModel> attributeList = new ArrayList<>();
+
+    @ApiParam("table数据")
+    private List<Map<String, Object>> dataList;
+
+    public BuOqcCheckStatisticsReportModel() {}
+
+    public BuOqcCheckStatisticsReportModel(String workOrderNo, String partNo, String partNameRdd, String workTime, String shiftCode, Double spotCheckQty, Integer checkResult, String salesTo, String categoryCode3) {
+        this.workOrderNo = workOrderNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workTime = workTime;
+        this.shiftCode = shiftCode;
+        this.spotCheckQty = spotCheckQty;
+        this.checkResult = checkResult;
+        this.salesTo = salesTo;
+        this.categoryCode3 = categoryCode3;
+    }
+
+    public BuOqcCheckStatisticsReportModel addAttribute(SxDynamicAttributeModel attribute) {
+        this.attributeList.add(attribute);
+        return this;
+    }
+
+    public String toBaseString() {
+        return "BuOqcCheckStatisticsReportModel{" +
+                "dimension=" + dimension +
+                ", dimension1=" + dimension1 +
+                ", categoryCode3='" + categoryCode3 + '\'' +
+                ", salesTo='" + salesTo + '\'' +
+                ", partNo='" + partNo + '\'' +
+                ", organizeCode='" + organizeCode + '\'' +
+                ", workTimeStart='" + workTimeStart + '\'' +
+                ", workTimeEnd='" + workTimeEnd + '\'' +
+                '}';
+    }
+
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcLastCheckDetailReportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcLastCheckDetailReportModel.java
new file mode 100644
index 0000000..3cf150a
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcLastCheckDetailReportModel.java
@@ -0,0 +1,176 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("出货总检报表model")
+public class BuOqcLastCheckDetailReportModel implements Serializable {
+
+    private static final long serialVersionUID = -324922560305908655L;
+
+    @ApiParam("工厂")
+    private String organizeCode;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @ApiParam("工单类型")
+    private String workOrderTypeName;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("颜色")
+    private String colorCode;
+
+    @ApiParam("生产日期")
+    private String workTime;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @ApiParam("计划数量")
+    private Double planQty;
+
+    @ApiParam("工单剩余未数量")
+    private Double unFinishQty;
+
+    @ApiParam("抽检数量")
+    private Double spotCheckQty;
+
+    @ApiParam("检测范围")
+    private Double checkLimit;
+
+    @ApiParam("生产数量")
+    private Double qty;
+
+    @ApiParam("缺点数/不合格项目数")
+    private Integer unQcQty;
+
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @ApiParam("检验结果名称")
+    private String checkResultName;
+
+    @ApiParam("检验结果背景颜色")
+    private String checkResultColor;
+
+    @ApiParam("总检测单号")
+    private String checkNo;
+
+    @ApiParam("检验人")
+    private String checkUser;
+
+    @ApiParam("检验时间")
+    private String confirmTime;
+
+    @ApiParam("备注")
+    private String remark;
+
+    @ApiParam("单据明细")
+    private List<BuOqcLastCheckDetailReportModel> detailList;
+
+    @ApiParam("检验单号")
+    private String oqcNo;
+
+    @ApiParam("产品类别")
+    private String categoryCode3;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("包装条码")
+    private String packageNo;
+
+    @ApiParam("检验时间")
+    private String checkTime;
+
+    @ApiParam("检验单类型")
+    private Integer oqcNoType;
+
+    @ApiParam("检验单类型")
+    private String oqcNoTypeName;
+
+    @ApiParam("检测数量")
+    private Double oqcQty;
+
+    @ApiParam("产品类型")
+    private String snType;
+
+    @ApiParam("产品类型")
+    private String snTypeName;
+
+    @ApiParam("检测方式")
+    private Integer oqcType;
+
+    @ApiParam("检测方式")
+    private String oqcTypeName;
+
+    @ApiParam("不良类型代码")
+    private String badnessTypeCode;
+
+    @ApiParam("不良类型名称")
+    private String badnessTypeName;
+
+    @ApiParam("不良分类代码")
+    private String badnessClassifyCode;
+
+    @ApiParam("不良分类名称")
+    private String badnessClassifyName;
+
+    @ApiParam("不良分类明细名称")
+    private String badnessClassifyDetailName;
+
+    @ApiParam("生产日期开始")
+    private String workTimeStart;
+
+    @ApiParam("生产日期结束")
+    private String workTimeEnd;
+
+    @ApiParam("pager")
+    private Pager pager;
+
+    public BuOqcLastCheckDetailReportModel() {}
+
+    public BuOqcLastCheckDetailReportModel(String workTime, String workOrderNo, Integer workOrderType, String partNo, String partNameRdd,
+                                           String workCenterCode, String shiftCode, Double planQty, Double spotCheckQty, Double checkLimit,
+                                           Integer checkResult, String checkNo, String checkUser, String confirmTime, String remark, String colorCode) {
+        this.workTime = workTime;
+        this.workOrderNo = workOrderNo;
+        this.workOrderType = workOrderType;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workCenterCode = workCenterCode;
+        this.shiftCode = shiftCode;
+        this.planQty = planQty;
+        this.spotCheckQty = spotCheckQty;
+        this.checkLimit = checkLimit;
+        this.checkResult = checkResult;
+        this.checkNo = checkNo;
+        this.checkUser = checkUser;
+        this.confirmTime = confirmTime;
+        this.remark = remark;
+        this.colorCode = colorCode;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcManageModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcManageModel.java
new file mode 100644
index 0000000..2cbf38e
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcManageModel.java
@@ -0,0 +1,112 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("出货检验信息model")
+public class BuOqcManageModel implements Serializable {
+
+    private static final long serialVersionUID = 5906530688005645492L;
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("生产日期")
+    private String workTime;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @ApiParam("计划数量")
+    private Double planQty;
+
+    @ApiParam("已检测范围数量")
+    private Double checkLimit;
+
+    @ApiParam("检验单号")
+    private String oqcNo;
+
+    @ApiParam("抽检条码")
+    private String serialNumber;
+
+    @ApiParam("包装条码")
+    private String packageNo;
+
+    @ApiParam("抽检数量")
+    private Double spotCheckQty;
+
+    @ApiParam("批次范围")
+    private Double batchLimit;
+
+    @ApiParam("检验类型")
+    private Integer oqcType;
+
+    @ApiParam("检验类型名称")
+    private String oqcTypeName;
+
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @ApiParam("检验结果名称")
+    private String checkResultName;
+
+    @ApiParam("检验人")
+    private String checkUser;
+
+    @ApiParam("检验时间")
+    private String checkTime;
+
+    @ApiParam("产品类别")
+    private String categoryCode3;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("创建用户")
+    public String createUser;
+
+    @ApiParam("创建日期")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改日期")
+    public String modifyDatetime;
+
+    @ApiParam("创建日期开始")
+    public String createDatetimeStart;
+
+    @ApiParam("创建日期结束")
+    public String createDatetimeEnd;
+
+    @ApiParam("成品=1/组件=2")
+    private Integer pageType;
+
+    @ApiParam("抽检范围开始")
+    public Integer batchLimitStart;
+
+    @ApiParam("抽检范围结束")
+    public Integer batchLimitEnd;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcPackageDetailModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcPackageDetailModel.java
new file mode 100644
index 0000000..924de34
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOqcPackageDetailModel.java
@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("出货检验产品信息model")
+public class BuOqcPackageDetailModel implements Serializable {
+
+    private static final long serialVersionUID = -844149559622806484L;
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("检验单号")
+    private String oqcNo;
+
+    @ApiParam("条码")
+    private String serialNumber;
+
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @ApiParam("检验结果名称")
+    private String checkResultName;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("创建用户")
+    public String createUser;
+
+    @ApiParam("创建日期")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改日期")
+    public String modifyDatetime;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOutPutStatisticsModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOutPutStatisticsModel.java
new file mode 100644
index 0000000..24d7c2d
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOutPutStatisticsModel.java
@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate: 2019\11\15 10:12
+ * @Modify:
+ **/
+@Data
+@Api("产量统计MODEL")
+public class BuOutPutStatisticsModel implements Serializable {
+
+    private static final long serialVersionUID = -1545535307751062460L;
+
+    @ApiParam("ID")
+    private Long id;
+
+    @ApiParam("产量")
+    private Double qty;
+
+    @ApiParam("工单计划数量")
+    private Double planQty;
+
+    @ApiParam("工单剩余未数量")
+    private Double unFinishQty;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOutPutStatisticsQtyModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOutPutStatisticsQtyModel.java
new file mode 100644
index 0000000..9e13a85
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuOutPutStatisticsQtyModel.java
@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate: 2019\11\15 10:12
+ * @Modify:
+ **/
+@Data
+@Api("BU产量统计班次完工数量MODEL")
+public class BuOutPutStatisticsQtyModel implements Serializable {
+
+    private static final long serialVersionUID = -2775383158682668800L;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("生产日期")
+    private String workTime;
+
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @ApiParam("工单未完成数量")
+    private Double unFinishQty;
+
+    @ApiParam("产量")
+    private Double qty;
+
+    @ApiParam("工厂")
+    private String organizeCode;
+
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("生产日期开始")
+    private String workTimeStart;
+
+    @ApiParam("生产日期结束")
+    private String workTimeEnd;
+
+    @ApiParam("产品类别")
+    private String categoryCode3;
+
+    @ApiParam("销售向")
+    private String salesTo;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuWorkCenterModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuWorkCenterModel.java
new file mode 100644
index 0000000..c6e3a08
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuWorkCenterModel.java
@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-mes-panasonic-bu
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-06-10 13:47
+ */
+@Data
+@ApiModel("产线MODEL")
+public class BuWorkCenterModel implements Serializable {
+    private static final long serialVersionUID = 1968119091489397725L;
+
+    @ApiParam("产线代码")
+    private String workCenterCode;
+
+    @ApiParam("产线名称")
+    private String workCenterName;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuWorkOrderModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuWorkOrderModel.java
new file mode 100644
index 0000000..f4a11ac
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/BuWorkOrderModel.java
@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-mes-panasonic-bu
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-06-10 13:47
+ */
+@Data
+@ApiModel("工单MODEL")
+public class BuWorkOrderModel implements Serializable {
+
+    private static final long serialVersionUID = -8121168165571990519L;
+    @ApiParam("计划数量")
+    private Double qty;
+
+    @ApiParam("完工数量")
+    private Double completeQty;
+
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @ApiParam("产线编码")
+    private String workCenterCode;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @ApiParam("结束时间")
+    private String endTime;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("修改时间")
+    private String modifyDatetime;
+
+    @ApiParam("工单状态")
+    private Integer workOrderStatus;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/MesShiftExtModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/MesShiftExtModel.java
new file mode 100644
index 0000000..71354ec
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/MesShiftExtModel.java
@@ -0,0 +1,72 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.ColumnDefault;
+
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-mes-panasonic-bu
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-05-18 13:13
+ */
+@Data
+@ApiModel("班次信息MODEL")
+public class MesShiftExtModel implements Serializable {
+
+    private static final long serialVersionUID = -2244642573666177675L;
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @ApiParam("开班时间")
+    private String startTime;
+
+    @ApiParam("下班时间")
+    private String endTime;
+
+    @ColumnDefault("0")
+    @ApiParam("作业时长")
+    private Double workTimes;
+
+    @ApiParam("班次顺序")
+    private Integer shiftSeq;
+
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @ApiParam("作业人数")
+    private Double workerQty;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("有效性")
+    private Integer isValid;
+
+    @ApiParam("是否已删除")
+    private Integer isDeleted;
+
+    @ApiParam("创建人")
+    private String createUser;
+
+    @ApiParam("创建时间")
+    private String createDatetime;
+
+    @ApiParam("更新人")
+    private String modifyUser;
+
+    @ApiParam("更新时间")
+    private String modifyDatetime;
+
+    @ApiParam("id")
+    private Long id;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/MissPartConfirmModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/MissPartConfirmModel.java
new file mode 100644
index 0000000..13aa754
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/MissPartConfirmModel.java
@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsErrorLineOff;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author xinwang.yi
+ * @version 1.0
+ * @date 2022/06/09 14:47
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("缺件确认")
+public class MissPartConfirmModel implements Serializable {
+
+    private static final long serialVersionUID = 8139497794986692602L;
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("生产日期")
+    private String workTime;
+
+    @ApiParam("补件列表")
+    private ListPager<SxQmsErrorLineOff> qmsErrorLineOffs;
+
+    @ApiParam("颜色")
+    private String color;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/OqcLastCheckModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/OqcLastCheckModel.java
new file mode 100644
index 0000000..605915a
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/OqcLastCheckModel.java
@@ -0,0 +1,156 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("总检验结果 MODEL")
+public class OqcLastCheckModel implements Serializable {
+
+    private static final long serialVersionUID = 3946056930962962292L;
+
+    @ApiParam("生产工单")
+    private String workOrderNo;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("作业时间")
+    private String workTime;
+
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @ApiParam("工单计划数量")
+    private Double planQty;
+
+    @ApiParam("班次完工数量")
+    private Double qty;
+
+    @ApiParam("工单剩余完工数量")
+    private Double unFinishQty;
+
+    @ApiParam("抽检数量")
+    private Double spotCheckQty;
+
+    @ApiParam("检测范围")
+    private Double checkLimit;
+
+    @ApiParam("总检测单号")
+    private String checkNo;
+
+    @ApiParam("总检测结果")
+    private Integer checkResult;
+
+    @ApiParam("总检测结果名称")
+    private String checkResultName;
+
+    @ApiParam("备注")
+    private String remark;
+
+    @ApiParam("检测时间")
+    private String confirmTime;
+
+    @ApiParam("检测人员")
+    private String checkUser;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("操作人")
+    public String userInfo;
+
+    @ApiParam("产量统计ID")
+    private Long id;
+
+    @ApiParam("产量统计PID")
+    private Long pid;
+
+    @ApiParam("作业时间开始")
+    private String workTimeStart;
+
+    @ApiParam("作业时间结束")
+    private String workTimeEnd;
+
+    @ApiParam("组件抽检只读状态")
+    private Boolean zjCheckBoo = true;
+
+    @ApiParam("总检合格只读状态")
+    private Boolean qcBoo = true;
+
+    @ApiParam("总检不合格只读状态")
+    private Boolean unQcBoo = true;
+
+    @ApiParam("颜色")
+    private String color;
+
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @ApiParam("工单类型描述")
+    private String workOrderTypeName;
+
+    public OqcLastCheckModel() {
+    }
+
+    public OqcLastCheckModel(Long id, Long pid, String organizeCode, String workOrderNo, String workCenterCode, String partNo, String partNameRdd, String workTime, String shiftCode,
+                             Double spotCheckQty, Double checkLimit, String checkNo, Integer checkResult, String remark, String confirmTime, String checkUser) {
+        this.id = id;
+        this.pid = pid;
+        this.organizeCode = organizeCode;
+        this.workOrderNo = workOrderNo;
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workTime = workTime;
+        this.shiftCode = shiftCode;
+        this.spotCheckQty = spotCheckQty;
+        this.checkLimit = checkLimit;
+        this.checkNo = checkNo;
+        this.checkResult = checkResult;
+        this.remark = remark;
+        this.confirmTime = confirmTime;
+        this.checkUser = checkUser;
+    }
+
+    public OqcLastCheckModel(Long id, Long pid, String organizeCode, String workOrderNo, String workCenterCode, String partNo, String partNameRdd, String workTime, String shiftCode,
+                             Double spotCheckQty, Double checkLimit, String checkNo, Integer checkResult, String remark, String confirmTime, String checkUser, Integer workOrderType) {
+        this.id = id;
+        this.pid = pid;
+        this.organizeCode = organizeCode;
+        this.workOrderNo = workOrderNo;
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workTime = workTime;
+        this.shiftCode = shiftCode;
+        this.spotCheckQty = spotCheckQty;
+        this.checkLimit = checkLimit;
+        this.checkNo = checkNo;
+        this.checkResult = checkResult;
+        this.remark = remark;
+        this.confirmTime = confirmTime;
+        this.checkUser = checkUser;
+        this.workOrderType = workOrderType;
+    }
+
+    public OqcLastCheckModel(Boolean boo) {
+        this.qcBoo = boo;
+        this.unQcBoo = boo;
+    }
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/OqcLastCheckParamModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/OqcLastCheckParamModel.java
new file mode 100644
index 0000000..31b1c7a
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/OqcLastCheckParamModel.java
@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("总检验结果 MODEL")
+public class OqcLastCheckParamModel implements Serializable {
+
+    private static final long serialVersionUID = 6102116247615898694L;
+
+    @ApiParam("产量统计出货检验ID")
+    private Long id;
+
+    @ApiParam("生产工单")
+    private String workOrderNo;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("备注")
+    private String remark;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("总检测结果")
+    private Integer checkResult;
+
+    @ApiParam("操作人")
+    private String userInfo;
+
+    @ApiParam("操作数据")
+    private List<OqcLastCheckParamModel> modelList;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/OqcProjectModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/OqcProjectModel.java
new file mode 100644
index 0000000..cdd27dd
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/OqcProjectModel.java
@@ -0,0 +1,90 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("出货检验项目信息model")
+public class OqcProjectModel implements Serializable {
+
+    private static final long serialVersionUID = -3732982699213266046L;
+
+    @ApiParam("ID")
+    private Long id;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("创建人")
+    public String createUser;
+
+    @ApiParam("创建时间")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改时间")
+    public String modifyDatetime;
+
+    @ApiParam("序号")
+    private Double seq;
+
+    @ApiParam("产品类别")
+    private String categoryCode3;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("检验项目")
+    private String checkItem;
+
+    @ApiParam("判断基准")
+    private String standard;
+
+    @ApiParam("值类型")
+    private Integer checkType;
+
+    @ApiParam("值类型描述")
+    private String checkTypeName;
+
+    @ApiParam("标准值")
+    private String standardValue;
+
+    @ApiParam("上限值")
+    private String upLimit;
+
+    @ApiParam("下限值")
+    private String downLimit;
+
+    @ApiParam("启用器具")
+    private String checkTool;
+
+    @ApiParam("检验类型")
+    private Integer oqcNoType;
+
+    @ApiParam("检验类型描述")
+    private String oqcNoTypeName;
+
+    @ApiParam("多个物料")
+    private List<String> partNoList;
+
+    @ApiParam("多个物料-对应物料类别")
+    private List<String> category3List;
+
+    @ApiParam("多个ID")
+    private List<Long> idList;
+
+    @ApiParam("状态")
+    private Integer status;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/PartCategoryModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/PartCategoryModel.java
new file mode 100644
index 0000000..2c2fb16
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/PartCategoryModel.java
@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-06-06 11:16
+ */
+@Data
+@ApiModel("零件种类model")
+public class PartCategoryModel implements Serializable {
+
+    private static final long serialVersionUID = 8370407952155682499L;
+
+    @ApiParam("分类代码")
+    private String categoryCode;
+
+    @ApiParam("分类名称")
+    private String categoryName;
+
+    @ApiParam("分类类型")
+    private String categoryType;
+
+    @ApiParam("ID")
+    private Long id;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("创建人")
+    public String createUser;
+
+    @ApiParam("创建时间")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改时间")
+    public String modifyDatetime;
+
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SwebPurchaseOrderExt.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SwebPurchaseOrderExt.java
new file mode 100644
index 0000000..084073e
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SwebPurchaseOrderExt.java
@@ -0,0 +1,159 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.ColumnDefault;
+
+import javax.persistence.Column;
+import javax.persistence.Transient;
+
+
+@Data
+public class SwebPurchaseOrderExt extends BaseBean {
+
+    @ApiParam("SAP单号")
+    @Column(name = "SAP_ORDER_NO")
+    private String sapOrderNo;
+
+    @ApiParam("工厂代码")
+    @Column(name = "FACTORY_NO")
+    private String factoryNo;
+
+    @ApiParam("工厂名称")
+    @Column(name = "FACTORY_NAME")
+    private String factoryName;
+
+    @ApiParam("币种")
+    @Column(name = "CURRENCY_TYPE")
+    private String currencyType;
+
+    @ApiParam("单价")
+    @Column(name = "PRICE")
+    @ColumnDefault("0")
+    private Double price = 0.0;
+
+    @ApiParam("数量")
+    @Column(name = "ORDER_QTY")
+    @ColumnDefault("0")
+    private Double orderQty = 0.0;
+
+    @ApiParam("总价")
+    @Column(name = "TOTAL")
+    @ColumnDefault("0")
+    private Double total = 0.0;
+
+    @ApiParam("物料编码")
+    @Column(name = "PART_NO")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    @Column(name = "PART_NAME")
+    private String partName;
+
+    @ApiParam("单位")
+    @Column(name = "UNIT")
+    private String unit;
+
+    @ApiParam("变更前需求日")
+    @Column(name = "DEMAND_DAY_BEFORE_CHANGE")
+    private String demandDayBeforeChange;
+
+    @ApiParam("变更前交货数量")
+    @Column(name = "DELIVERY_AMOUNT_BEFORE_CHANGE")
+    private Double deliveryAmountBeforeChange = 0.0;
+
+    @ApiParam("变更后需求日")
+    @Column(name = "DEMAND_DAY_AFTER_CHANGE")
+    private String demandDayAfterChange;
+
+    @ApiParam("变更后交货数量")
+    @Column(name = "DELIVERY_AMOUNT_AFTER_CHANGE")
+    private Double deliveryAmountAfterChange = 0.0;
+
+    @ApiParam("收货数量")
+    @Column(name = "REC_QTY")
+    private Double recQty = 0.0;
+
+    @ApiParam("检验合格数量")
+    @Column(name = "QUALIFIED_QTY")
+    private Double qualifiedQty = 0.0;
+
+    @ApiParam("入库数量")
+    @Column(name = "IN_STOCK_QTY")
+    private Double inStockQty = 0.0;
+
+    @ApiParam("同步标识")
+    @Column(name = "IS_SYNC_WMS")
+    private Integer isSyncWms = 2;
+
+    @Transient
+    @ApiParam("订单状态名称")
+    private String poStatusName;
+
+    @Transient
+    @ApiParam("未清数量")
+    private Double outstandingQty;
+
+    @ApiParam("PO单价")
+    @Column(name = "net_price")
+    private Double netPrice;
+
+    @ApiParam("PO单价(货币)")
+    @Column(name = "currency")
+    private String currency;
+
+    @ApiParam("单位(倍数)")
+    @Column(name = "multiple_unit")
+    private Double multipleUnit;
+
+    @ApiParam("PO金额")
+    @Column(name = "PO_AMOUNT")
+    private Double poAmount;
+
+    @ApiParam("PO金额(币别)")
+    @Column(name = "PO_CURRENCY")
+    private String poCurrency;
+
+    @ApiParam("打印状态")
+    @Column(name = "PRINT_STATUS")
+    private Integer printStatus = 20;
+
+    @Transient
+    @ApiParam("打印状态中文名称")
+    private String printStatusCn;
+
+    @Column(name = "UPLOAD_DATE_TIME")
+    @ApiParam("上传时间")
+    private String uploadDateTime;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("文件源名")
+    private String fileOriginName;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @ApiParam("单据号")
+    private String orderNo;
+
+    @ApiParam("供应商编号")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam(value = "订单类型", example = "10")
+    private Integer orderType;
+
+    @ApiParam(value = "库存地")
+    private String erpWarehouse;
+
+    @ApiParam(value = "合同号")
+    private String refNo;
+
+    @ApiParam(value = "是否导入使用")
+    private boolean isImport;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuAbnormalReportModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuAbnormalReportModel.java
new file mode 100644
index 0000000..5dc7286
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuAbnormalReportModel.java
@@ -0,0 +1,119 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Api("bu异常联络单报表model")
+@Data
+public class SxBuAbnormalReportModel {
+
+    /** 异常联络单主表 start **/
+
+    @ApiParam("异常联络单号")
+    public String orderNo;
+
+    @ApiParam("异常场所")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ABNORMAL_SOURCE.class, refForeignKey = "value", value = "description")
+    public Integer busiType;
+
+    @ApiParam("责任区分")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.DUTY_DIFF.class, refForeignKey = "value", value = "description")
+    private Integer dutyDiff;
+
+    @ApiParam("机种名称")
+    private String machineName;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    /** 异常联络单主表 end **/
+
+
+    //异常联络单明细表
+    @ApiParam("是否向事业部汇报")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isReport;
+
+    //异常联络单确认表
+    @ApiParam("是否再发防止")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isPreventOccur;
+
+    //异常联络单明细表(不良项目)
+    @ApiParam("不良区分")
+    private String abnormalPorject;
+
+    /** 异常联络单回复表 start **/
+
+    @ApiParam("发生原因")
+    public String occureReason;
+
+    @ApiParam("流出原因")
+    public String outFlowReason;
+
+    @ApiParam("临时应急对策")
+    public String tempDealOption;
+
+    @ApiParam("原因分析")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ABNORMAL_ANALYSIS_CAUSE.class, refForeignKey = "value", value = "description")
+    public Integer causeAnalysis;
+
+    @ApiParam("恒久防止对策(再发防止对策)")
+    private String preventOption;
+
+    /** 异常联络单回复表 end **/
+
+
+    /** 异常联络单主表 start **/
+
+    @ApiParam("问题提出日期")
+    private String applyDatetime;
+
+    @ApiParam("回复期限日期")
+    private String replyEndDate;
+
+    @ApiParam("完成时间(联络单确认时间)")
+    private String contactConfirmDateTime;
+
+    /** 异常联络单主表 end **/
+
+
+    @ApiParam("订单状态")
+    private Integer orderStatus;
+
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    public SxBuAbnormalReportModel() {
+    }
+
+    public SxBuAbnormalReportModel(String orderNo, Integer busiType, Integer dutyDiff, String machineName,
+                                   String partNo, String partNameRdd, String vendorNo, String vendorName, Integer isReport,
+                                   String abnormalPorject, String applyDatetime, String replyEndDate, String contactConfirmDateTime) {
+        this.orderNo = orderNo;
+        this.busiType = busiType;
+        this.dutyDiff = dutyDiff;
+        this.machineName = machineName;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.isReport = isReport;
+        this.abnormalPorject = abnormalPorject;
+        this.applyDatetime = applyDatetime;
+        this.replyEndDate = replyEndDate;
+        this.contactConfirmDateTime = contactConfirmDateTime;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuMonitorManageModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuMonitorManageModel.java
new file mode 100644
index 0000000..c31d069
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuMonitorManageModel.java
@@ -0,0 +1,236 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * RoHS检测/管理试验监控 管理MODEL
+ * jiaqi.hou
+ */
+@Data
+@ApiModel("RoHS检测/管理试验监控管理MODEL")
+public class SxBuMonitorManageModel implements Serializable {
+
+    private static final long serialVersionUID = -4239047036461795363L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("id")
+    private String idStr;
+
+    @ApiParam(value = "模块")
+    private Integer module;
+
+    @ApiParam("编号")
+    private String manageNo;
+
+    @ApiParam("检测时间 不进行计算,仅显示,可编辑")
+    private String checkDate;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("产品分类")
+    private Integer productType;
+
+    @ApiParam("BU产品分类")
+    private String productTypeStr;
+
+    @ApiParam("机种编码")
+    private String machineCode;
+
+    @ApiParam(value = "机种名称")
+    private String machineName;
+
+    @ApiParam(value = "分类")
+    private Integer classify;
+
+    @ApiParam(value = "等级")
+    private Integer level;
+
+    @ApiParam(value = "检测频度")
+    private Integer checkFrequency;
+
+    @ApiParam(value = "计划检测日期")
+    private String checkDatetime;
+
+    @ApiParam(value = "检测确认日期")
+    private String checkedDatetime;
+
+    @ApiParam(value = "检测确认计划日期")
+    private String checkedFreDatetime;
+
+    @ApiParam(value = "检测确认人")
+    private String checkedUser;
+
+    @ApiParam("检查区分")
+    private String checkDiff;
+
+    @ApiParam("类别")
+    private String category;
+
+    @ApiParam("管理试验项目")
+    private String projectName;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("修改人")
+    private String modifyUser;
+
+    @ApiParam("修改日期")
+    private String modifyDatetime;
+
+    @ApiParam("产品分类")
+    private String productTypeName;
+
+    @ApiParam("分类")
+    private String classifyName;
+
+    @ApiParam("检查区分")
+    private String checkDiffName;
+
+    @ApiParam("类别")
+    private String categoryName;
+
+    @ApiParam(value = "等级")
+    private String levelName;
+
+    @ApiParam(value = "检测提醒")
+    private Integer checkRemind;
+
+    @ApiParam(value = "检测提醒颜色")
+    private String checkRemindColor;
+
+    @ApiParam("检测类型")
+    private Integer actionType;
+
+    @ApiParam("检测类型")
+    private String actionTypeName;
+
+    @ApiParam(value = "备注")
+    private String remark;
+
+    @ApiParam(value = "检测确认结果 10-合格；20-不合格")
+    private Integer checkResult;
+
+    @ApiParam(value = "检测确认结果 10-合格；20-不合格")
+    private String checkResultName;
+
+    @ApiParam("计划检测日期起始")
+    public String checkDatetimeStart;
+
+    @ApiParam("计划检测日期截止")
+    public String checkDatetimeEnd;
+
+    @ApiParam("检测确认日期起始")
+    public String checkedDatetimeStart;
+
+    @ApiParam("检测确认日期截止")
+    public String checkedDatetimeEnd;
+
+    @ApiParam("检测确认计划日期起始")
+    public String checkedFreDatetimeStart;
+
+    @ApiParam("检测确认计划日期截止")
+    public String checkedFreDatetimeEnd;
+
+    @ApiParam("排序属性")
+    public String orderByParam = "";
+
+    @ApiParam(value = "邻苯是否检测")
+    private Integer phthalatesCheck;
+
+    @ApiParam(value = "邻苯是否检测")
+    private String phthalatesCheckName;
+
+    @ApiParam("邻苯等级")
+    private Integer phthalatesLevel;
+
+    @ApiParam("邻苯等级")
+    private String phthalatesLevelName;
+
+    @ApiParam("邻苯检测频度")
+    private String phthalatesCheckFrequency;
+
+    @ApiParam("邻苯实际检测日期")
+    private String phthalatesActualCheckDate;
+
+    @ApiParam(value = "邻苯预计检测日期")
+    private String phthalatesExpectedCheckDate;
+
+    @ApiParam(value = "邻苯检测提醒")
+    private Integer phthalatesCheckRemind;
+
+    @ApiParam(value = "邻苯检测提醒颜色")
+    private String phthalatesCheckRemindColor;
+
+    @ApiParam(value = "上次计划检测日期")
+    private String lastCheckDatetime;
+
+    @ApiParam(value = "上次计划检测日期")
+    private String lastCheckDatetimeStart;
+
+    @ApiParam(value = "上次开始计划检测日期")
+    private String lastCheckDatetimeEnd;
+
+    @ApiParam(value = "上次结束计划检测日期")
+    private String lastCheckFreDatetime;
+
+    @ApiParam(value = "上次检测日期")
+    private String lastCheckedDatetime;
+
+    @ApiParam(value = "上次开始检测日期范围")
+    private String lastCheckedDatetimeStart;
+
+    @ApiParam(value = "上次结束检测日期范围")
+    private String lastCheckedDatetimeEnd;
+
+    @ApiParam(value = "邻苯检测确认人")
+    private String phthalatesCheckedUser;
+
+//    @ApiParam(value = "邻苯上次计划时间")
+//    private String lastCheckDate;
+
+
+    @ApiParam(
+            value = "排序类型，1 正序，2 倒序",
+            example = "1"
+    )
+    public transient Integer ascOrDesc = 1;
+
+    public String orderBy() {
+        String result = "";
+        if (this.orderByParam != null && this.orderByParam.trim().length() > 0) {
+            result = " order by " + this.orderByParam;
+            if (this.ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
+                result = result + " asc";
+            } else {
+                result = result + " desc";
+            }
+        }
+
+        return result;
+    }
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcBoardCurDayCheckConditionModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcBoardCurDayCheckConditionModel.java
new file mode 100644
index 0000000..34bfe55
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcBoardCurDayCheckConditionModel.java
@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("BU出货检验电子看板-单日出货检验情况MODEL")
+public class SxBuOqcBoardCurDayCheckConditionModel implements Serializable {
+
+    private static final long serialVersionUID = -6096098508334728888L;
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @ApiParam("生产计划数量")
+    private Integer planQty;
+
+    @ApiParam("实绩生产数量")
+    private Integer completeQty;
+
+    @ApiParam("计划检验数量")
+    private Integer planCheckQty;
+
+    @ApiParam("实绩检验数量")
+    private Integer completeCheckQty;
+
+    @ApiParam("检验状态")
+    private String status;
+
+    @ApiParam("检验状态背景颜色")
+    private String statusColor;
+
+    @ApiParam("结果")
+    private String result;
+
+    @ApiParam("点检员")
+    private String userName;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcCurDayStatisticsModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcCurDayStatisticsModel.java
new file mode 100644
index 0000000..a11c9ed
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcCurDayStatisticsModel.java
@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("当日质检数量状态统计MODEL")
+public class SxBuOqcCurDayStatisticsModel implements Serializable {
+
+    private static final long serialVersionUID = 1187930403678538147L;
+
+    @ApiParam("计划质检数量")
+    private List<Integer> planQtyList;
+
+    @ApiParam("实际质检数量")
+    private List<Integer> qtyList;
+
+    @ApiParam("柱状图X轴:时间戳")
+    private List<String> xList;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcDataModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcDataModel.java
new file mode 100644
index 0000000..a16b6d6
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcDataModel.java
@@ -0,0 +1,70 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("出货检验MODEL")
+public class SxBuOqcDataModel implements Serializable {
+
+    private static final long serialVersionUID = 8626743692715232532L;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("包装条码")
+    private String packageNo;
+
+    @ApiParam("生产工单")
+    private String workOrderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @ApiParam("工单类型名称")
+    private String workOrderTypeName;
+
+    @ApiParam("作业时间")
+    private String workTime;
+
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @ApiParam("计划数量")
+    private Double planQty;
+
+    @ApiParam("班次完工数量")
+    private Double completeQty;
+
+    @ApiParam("产量统计ID")
+    private String idStr;
+
+    @ApiParam("下线产品集合")
+    private List<Map<String, String>> prodMapList;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcManageCheckDetailModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcManageCheckDetailModel.java
new file mode 100644
index 0000000..39fafee
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcManageCheckDetailModel.java
@@ -0,0 +1,95 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("出货检验检验项MODEL")
+public class SxBuOqcManageCheckDetailModel implements Serializable {
+
+    private static final long serialVersionUID = -2783970854717430437L;
+
+    @ApiParam("idStr")
+    private String idStr;
+
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @ApiParam("生产日期")
+    private String workTime;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @ApiParam("检验顺序")
+    private Double seq;
+
+    @ApiParam("检验单号")
+    private String oqcNo;
+
+    @ApiParam("包装条码")
+    private String packageNo;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("检验项目ID")
+    public Long pid;
+
+    @ApiParam("检查项目")
+    private String checkItem;
+
+    @ApiParam("判定基准")
+    private String standard;
+
+    @ApiParam("判断方式")
+    private Integer checkType;
+
+    @ApiParam("标准值")
+    private String standardValue;
+
+    @ApiParam("上限值")
+    private String upLimit;
+
+    @ApiParam("下限值")
+    private String downLimit;
+
+    @ApiParam("检查器具")
+    private String checkTool;
+
+    @ApiParam("备注")
+    private String remark;
+
+    @ApiParam("实际值")
+    private String checkValue;
+
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @ApiParam("项目检验时间")
+    private String itemCheckTime;
+
+    @ApiParam("产品类别")
+    private String categoryCode3;
+
+    @ApiParam("判断方式")
+    private String checkTypeName;
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcManageManualModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcManageManualModel.java
new file mode 100644
index 0000000..07b63a0
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcManageManualModel.java
@@ -0,0 +1,97 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("BU出货检验参数MODEL")
+public class SxBuOqcManageManualModel implements Serializable {
+
+    private static final long serialVersionUID = -1995566346621217318L;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("操作人")
+    private String userInfo;
+
+    @ApiParam("返回信息")
+    private String msg;
+
+    @ApiParam("检验单号")
+    private String oqcNo;
+
+    @ApiParam("检验类型")
+    private Integer oqcNoType = 10;
+
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @ApiParam("生产工单")
+    private String workOrderNo;
+
+    @ApiParam("不良类型代码")
+    private String badnessTypeCode;
+
+    @ApiParam("不良类型名称")
+    private String badnessTypeName;
+
+    @ApiParam("不良分类代码")
+    private String badnessClassifyCode;
+
+    @ApiParam("不良分类名称")
+    private String badnessClassifyName;
+
+    @ApiParam("不良分类明细名称")
+    private String badnessClassifyDetailName;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("作业时间")
+    private String workTime;
+
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @ApiParam("班次完工数量")
+    private Double completeQty;
+
+    @ApiParam("已检测范围数量")
+    private Double checkLimit;
+
+    @ApiParam("未检批次范围")
+    private Double batchLimit;
+
+    @ApiParam("当前批次范围")
+    private Double curBatchLimit;
+
+    @ApiParam("产品类型")
+    private String categoryCode3;
+
+    @ApiParam("工单类型名称")
+    private String workOrderTypeName;
+
+    @ApiParam("产量统计ID")
+    private String idStr;
+
+    @ApiParam("检验类型只读状态")
+    private Map<Integer, Boolean> oqcNoTypeBooMap = new HashMap<>();
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcManageModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcManageModel.java
new file mode 100644
index 0000000..22e8cb4
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcManageModel.java
@@ -0,0 +1,241 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("出货检验MODEL")
+public class SxBuOqcManageModel implements Serializable {
+
+    private static final long serialVersionUID = -1693182178033633122L;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("操作人")
+    private String userInfo;
+
+    @ApiParam("操作人ID")
+    private String userId;
+
+    @ApiParam("返回信息")
+    private String msg;
+
+    @ApiParam("条码")
+    private String sn;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("包装条码")
+    private String packageNo;
+
+    @ApiParam("产量统计ID")
+    private String idStr;
+
+    @ApiParam("生产工单")
+    private String workOrderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("商品码")
+    private String goodsCode;
+
+    @ApiParam("商品码2")
+    private String goodsCode2;
+
+    @ApiParam("产品类型")
+    private String categoryCode3;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @ApiParam("工单类型名称")
+    private String workOrderTypeName;
+
+    @ApiParam("作业时间")
+    private String workTime;
+
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @ApiParam("计划数量")
+    private Double planQty;
+
+    @ApiParam("班次完工数量")
+    private Double completeQty;
+
+    @ApiParam("已检测范围数量")
+    private Double checkLimit;
+
+    @ApiParam("当前检验类型")
+    private Integer curOqcNoType;
+
+    @ApiParam("当前检验类型名称")
+    private String curOqcNoTypeName;
+
+    @ApiParam("当前抽检数量")
+    private Double curSpotCheckQty;
+
+    @ApiParam("当前批次范围")
+    private Double curBatchLimit;
+
+    @ApiParam("检验单号")
+    private String oqcNo;
+
+    @ApiParam("当前检验结果")
+    private String curCheckResultName;
+
+    @ApiParam("不良类型代码")
+    private String badnessTypeCode;
+
+    @ApiParam("不良类型名称")
+    private String badnessTypeName;
+
+    @ApiParam("不良分类代码")
+    private String badnessClassifyCode;
+
+    @ApiParam("不良分类名称")
+    private String badnessClassifyName;
+
+    @ApiParam("不良分类明细名称")
+    private String badnessClassifyDetailName;
+
+    @ApiParam("抽检数量")
+    private Double spotCheckQty = new Double(1);
+
+    @ApiParam("批次范围")
+    private Double batchLimit = new Double(1);
+
+    @ApiParam("检验类型")
+    private Integer oqcNoType = 10;
+
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @ApiParam("批次范围只读状态")
+    private Boolean batchLimitBoo = false;
+
+    @ApiParam("抽检数量框只读状态")
+    private Map<Integer, Boolean> spotCheckQtyBooMap = new HashMap<>();
+
+    @ApiParam("检验类型只读状态")
+    private Map<Integer, Boolean> oqcNoTypeBooMap = new HashMap<>();
+
+    @ApiParam("生成检验单只读状态")
+    private Map<Integer, Boolean> genOqcBooMap = new HashMap<>();
+
+    @ApiParam("条码框只读状态")
+    private Boolean snBoo = true;
+
+    @ApiParam("切换只读状态")
+    private Boolean changeBoo = false;
+
+    @ApiParam("合格只读状态")
+    private Boolean qcBoo = false;
+
+    @ApiParam("不合格只读状态")
+    private Boolean unQcBoo = false;
+
+    @ApiParam("重置只读状态")
+    private Boolean resetBoo = true;
+
+    @ApiParam("重载检验项只读状态")
+    private Boolean reloadCheckBoo = false;
+
+    @ApiParam("检验项目明细")
+    private ListPager<SxBuOqcManageCheckDetailModel> detailList;
+
+    public SxBuOqcManageModel() {}
+
+    public SxBuOqcManageModel(String organizeCode, String userId, String userInfo, Integer oqcNoType) {
+        this.organizeCode = organizeCode;
+        this.userId = userId;
+        this.userInfo = userInfo;
+        this.oqcNoType = oqcNoType;
+    }
+
+    public SxBuOqcManageModel(String organizeCode, String userId, String userInfo, String sn, String idStr) {
+        this.organizeCode = organizeCode;
+        this.userId = userId;
+        this.userInfo = userInfo;
+        this.sn = sn;
+        this.idStr = idStr;
+
+        this.spotCheckQtyBooMap.put(QmsEnumUtil.OQC_CHECK_TYPE.DAILY_INSPECTION.getValue(), false);
+        this.spotCheckQtyBooMap.put(QmsEnumUtil.OQC_CHECK_TYPE.TEARDOWN_INSPECTION.getValue(), false);
+        this.spotCheckQtyBooMap.put(QmsEnumUtil.OQC_CHECK_TYPE.EMPTY_INSPECTION.getValue(), false);
+
+        this.oqcNoTypeBooMap.put(QmsEnumUtil.OQC_CHECK_TYPE.DAILY_INSPECTION.getValue(), true);
+        this.oqcNoTypeBooMap.put(QmsEnumUtil.OQC_CHECK_TYPE.TEARDOWN_INSPECTION.getValue(), true);
+        this.oqcNoTypeBooMap.put(QmsEnumUtil.OQC_CHECK_TYPE.EMPTY_INSPECTION.getValue(), true);
+
+        this.genOqcBooMap.put(QmsEnumUtil.OQC_CHECK_TYPE.DAILY_INSPECTION.getValue(), false);
+        this.genOqcBooMap.put(QmsEnumUtil.OQC_CHECK_TYPE.TEARDOWN_INSPECTION.getValue(), false);
+        this.genOqcBooMap.put(QmsEnumUtil.OQC_CHECK_TYPE.EMPTY_INSPECTION.getValue(), false);
+
+    }
+
+    public String toBaseString() {
+        return "SxBuOqcManageModel{" +
+                "organizeCode='" + organizeCode + '\'' +
+                ", userInfo='" + userInfo + '\'' +
+                ", userId='" + userId + '\'' +
+                ", sn='" + sn + '\'' +
+                ", serialNumber='" + serialNumber + '\'' +
+                ", goodsCode='" + goodsCode + '\'' +
+                ", packageNo='" + packageNo + '\'' +
+                ", goodsCode2='" + goodsCode2 + '\'' +
+                ", idStr='" + idStr + '\'' +
+                '}';
+    }
+
+    @Override
+    public String toString() {
+        return "SxBuOqcManageModel{" +
+                "organizeCode='" + organizeCode + '\'' +
+                ", userInfo='" + userInfo + '\'' +
+                ", userId='" + userId + '\'' +
+                ", sn='" + sn + '\'' +
+                ", serialNumber='" + serialNumber + '\'' +
+                ", goodsCode='" + goodsCode + '\'' +
+                ", packageNo='" + packageNo + '\'' +
+                ", goodsCode2='" + goodsCode2 + '\'' +
+                ", idStr='" + idStr + '\'' +
+                ", workOrderNo='" + workOrderNo + '\'' +
+                ", partNo='" + partNo + '\'' +
+                ", partNameRdd='" + partNameRdd + '\'' +
+                ", categoryCode3='" + categoryCode3 + '\'' +
+                ", workCenterCode='" + workCenterCode + '\'' +
+                ", workOrderType=" + workOrderType +
+                ", workOrderTypeName='" + workOrderTypeName + '\'' +
+                ", workTime='" + workTime + '\'' +
+                ", shiftCode='" + shiftCode + '\'' +
+                ", shiftName='" + shiftName + '\'' +
+                ", planQty=" + planQty +
+                ", completeQty=" + completeQty +
+                '}';
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcManageParamModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcManageParamModel.java
new file mode 100644
index 0000000..ead1e83
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuOqcManageParamModel.java
@@ -0,0 +1,79 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/15 15:32
+ **/
+@Data
+@ApiModel("BU出货检验参数MODEL")
+public class SxBuOqcManageParamModel implements Serializable {
+
+    private static final long serialVersionUID = -1693182178033633122L;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("操作人")
+    private String userInfo;
+
+    @ApiParam("操作人ID")
+    private String userId;
+
+    @ApiParam("条码")
+    private String sn;
+
+    @ApiParam("产量统计ID")
+    private String idStr;
+
+    @ApiParam("检验单号")
+    private String oqcNo;
+
+    @ApiParam("抽检数量")
+    private Double spotCheckQty = new Double(1);
+
+    @ApiParam("批次范围")
+    private Double batchLimit = new Double(1);
+
+    @ApiParam("检验类型")
+    private Integer oqcNoType = 10;
+
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    @ApiParam("生产工单")
+    private String workOrderNo;
+
+    @ApiParam("明细分页条件")
+    private Pager pager;
+
+    @ApiParam("不良类型代码")
+    private String badnessTypeCode;
+
+    @ApiParam("不良分类代码")
+    private String badnessClassifyCode;
+
+    @ApiParam("不良分类明细代码")
+    private String badnessClassifyDetailCode;
+
+    @ApiParam("不良分类明细名称")
+    private String badnessClassifyDetailName;
+
+    public String toBaseString() {
+        return "SxBuOqcManageParamModel{" +
+                "organizeCode='" + organizeCode + '\'' +
+                ", userInfo='" + userInfo + '\'' +
+                ", userId='" + userId + '\'' +
+                ", sn='" + sn + '\'' +
+                ", idStr='" + idStr + '\'' +
+                ", oqcNo='" + oqcNo + '\'' +
+                '}';
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuPartModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuPartModel.java
new file mode 100644
index 0000000..517dbbe
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuPartModel.java
@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.qms.model.SxPartModel;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @PROJECT_NAME: i3plus-qms-panasonic
+ * @DESCRIPTION:
+ * @USER: xinwang.yi
+ * @DATE: 2022-06-19 9:29
+ */
+@Data
+@ApiModel("BU物料信息MODEL")
+public class SxBuPartModel implements Serializable {
+    private static final long serialVersionUID = -8353952710034575424L;
+
+    ListPager<SxPartModel> partModelListPager;
+
+    Map<String, List<PartCategoryModel>> partCategoryMap;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuQcSpectacularsModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuQcSpectacularsModel.java
new file mode 100644
index 0000000..2674c3f
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuQcSpectacularsModel.java
@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @description: 受入检验看板model
+ * @author: jiaqi.hou
+ * @date: 2022/06/22
+ */
+@Data
+@Api("受入检验看板model")
+public class SxBuQcSpectacularsModel {
+    @ApiParam(value = "总数量")
+    private String sum;
+
+    @ApiParam(value = "用户名")
+    private String userName;
+
+    @ApiParam(value = "饼状图块名称")
+    private String name;
+
+    @ApiParam(value = "单据数量")
+    private String orderSum;
+
+    @ApiParam(value = "单价百分比")
+    private String orderPercentage;
+
+    @ApiParam(value = "事业别")
+    private String career;
+
+    @ApiParam(value = "供应商简称")
+    private String vendorName;
+
+    @ApiParam(value = "总批次")
+    private Double batchTotal;
+
+    @ApiParam(value = "不良批次")
+    private Double rejectBatch;
+
+    @ApiParam(value = "不良率")
+    private Double rejectRatio;
+
+    @ApiParam("顺序")
+    private Integer serial;
+    public SxBuQcSpectacularsModel() {
+    }
+
+    public SxBuQcSpectacularsModel(String userName, String sum){
+        this.userName = userName;
+        this.sum = sum;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuQmsFileModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuQmsFileModel.java
new file mode 100644
index 0000000..b1bf1f3
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxBuQmsFileModel.java
@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @description: Bu文件模板类
+ * @author: jiaqi.hou
+ * @date: 2022/08/24
+ */
+@Data
+@ApiModel("Bu文件Model")
+public class SxBuQmsFileModel {
+    @ApiParam("文件原名")
+    private String fileOriginName;
+
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @ApiParam("上传时间")
+    private String uploadDatetime;
+
+    @ApiParam("创建人")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("更新人")
+    private String modifyUser;
+
+    @ApiParam("更新日期")
+    private String modifyDatetime;
+
+    @ApiParam("文件格式 前端用")
+    private String fileType;
+
+    @ApiParam("文件名称 前端用")
+    private String fileName;
+
+    public SxBuQmsFileModel() {
+    }
+
+    public SxBuQmsFileModel(String fileOriginName, String fileUrl, String uploadDatetime, String createUser,
+                            String createDatetime, String modifyUser, String modifyDatetime, String fileType, String fileName) {
+        this.fileOriginName = fileOriginName;
+        this.fileUrl = fileUrl;
+        this.uploadDatetime = uploadDatetime;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.fileType = fileType;
+        this.fileName = fileName;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxQmsBuCustomerComplaintModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxQmsBuCustomerComplaintModel.java
new file mode 100644
index 0000000..2e638b6
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxQmsBuCustomerComplaintModel.java
@@ -0,0 +1,298 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Author: jiaqi.hou
+ * @CreateDate: 2022/06/29 02:01 下午
+ * @Description:
+ **/
+@Data
+@ApiModel("Bu客诉记录MODEL")
+public class SxQmsBuCustomerComplaintModel implements Serializable {
+    private static final long serialVersionUID = -3053263203223813977L;
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("客诉单号")
+    private String complaintNo;
+
+    @ApiParam("客诉类型 10-异常联络，20-速报")
+    private Integer complaintType;
+
+    @ApiParam("客诉类型描述")
+    private String complaintTypeName;
+
+    @ApiParam("异常场所 10-市场不良、20-到货不良、30-受入不良、40-工程不良、50-改判")
+    private Integer abnormalSource;
+
+    @ApiParam("异常场所描述")
+    private String abnormalSourceName;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("客户编码")
+    private String customerNo;
+
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @ApiParam("发行日期")
+    private String publishDate;
+
+    @ApiParam("预定回达日")
+    private String planArriveDate;
+
+    @ApiParam("事业部管理NO")
+    private String departmentNo;
+
+    @ApiParam("问题点描述")
+    private String issueDesc;
+
+    @ApiParam("缺陷等级 10-轻度缺陷，20-中度缺陷，30-重度缺陷")
+    private Integer defectLevel;
+
+    @ApiParam("缺陷等级描述")
+    private String defectLevelName;
+
+    @ApiParam("件数")
+    private Integer qty;
+
+    @ApiParam("发生情况 10-初发，20-再发")
+    private Integer situation;
+
+    @ApiParam("不良点")
+    private String badnessCode;
+
+    @ApiParam("不良点")
+    private String badnessName;
+
+    @ApiParam("发生情况描述")
+    private String situationName;
+
+    @ApiParam("生产日期")
+    private String produceDate;
+
+    @ApiParam("客诉单状态 ")
+    private Integer complaintStatus;
+
+    @ApiParam("客诉单状态描述")
+    private String complaintStatusName;
+
+    @ApiParam("文件ID1")
+    private Long fileId1;
+
+    @ApiParam("文件URL1")
+    private String fileUrl1;
+
+    @ApiParam("文件原名1")
+    private String fileOriginName1;
+
+    @ApiParam("文件ID2")
+    private Long fileId2;
+
+    @ApiParam("文件URL2")
+    private String fileUrl2;
+
+    @ApiParam("文件原名2")
+    private String fileOriginName2;
+
+    @ApiParam("对策确认 10-通过，20-不通过")
+    private Integer countermeasureConfirm;
+
+    @ApiParam("整改确认 10-通过，20-不通过")
+    private Integer abarbeitungConfirm;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("有效性")
+    private Integer isValid;
+
+    @ApiParam("是否已删除")
+    private Integer isDeleted;
+
+    @ApiParam("创建用户")
+    private String createUser;
+
+    @ApiParam("创建日期")
+    private String createDatetime;
+
+    @ApiParam("创建日期开始区间")
+    private String createDatetimeStart;
+
+    @ApiParam("创建日期结束区间")
+    private String createDatetimeEnd;
+
+    @ApiParam("更新人")
+    private String modifyUser;
+
+    @ApiParam("更新日期")
+    private String modifyDatetime;
+
+    @ApiParam("责任区分")
+    private String dutyDiff;
+
+    @ApiParam("对策确认描述 10-通过，20-不通过")
+    private String countermeasureConfirmName;
+
+    @ApiParam("整改确认描述 10-通过，20-不通过")
+    private String abarbeitungConfirmName;
+
+    @ApiParam("客诉确认拒绝说明")
+    private String countermeasureNoPassExplain;
+
+    @ApiParam("整改确认拒绝说明")
+    private String abarbeitungNoPassExplain;
+
+    @ApiParam("上传时间")
+    private String uploadDatetime;
+
+    @ApiParam("制造编号")
+    private String manufacturingSerialNo;
+
+    @ApiParam("安装时间")
+    private String installationTime;
+
+    @ApiParam("购机时间")
+    private String theCostOfTime;
+
+    @ApiParam("故障发生时间")
+    private String timeOfFailure;
+
+    @ApiParam("使用时间 故障发生时间-安装时间。单位：月")
+    private Double hoursOfUse;
+
+    @ApiParam("故障现象")
+    private String faultPhenomenon;
+
+    @ApiParam("故障原因")
+    private String failureCause;
+
+    @ApiParam("制造日期")
+    private String manufacturingDate;
+
+    @ApiParam("部品编码")
+    private String departmentOfProductCoding;
+
+    @ApiParam("部品名称")
+    private String departmentOfProductName;
+
+    @ApiParam("单价")
+    private BigDecimal unitPrice;
+
+    @ApiParam("金额")
+    private BigDecimal amount;
+
+    @ApiParam("服务网点")
+    private String serviceNetworkStation;
+
+    @ApiParam("是否二次维修")
+    private Integer whetherSecondaryMaintenance;
+
+    @ApiParam("是否二次维修中文")
+    private String whetherSecondaryMaintenanceName;
+
+    public SxQmsBuCustomerComplaintModel() {
+    }
+
+    public SxQmsBuCustomerComplaintModel(Long id, String complaintNo, Integer complaintType, String complaintTypeName, Integer abnormalSource, String abnormalSourceName, String partNo, String partNameRdd, String customerNo, String customerName, String publishDate, String planArriveDate, String departmentNo, String issueDesc, Integer defectLevel, String defectLevelName, Integer qty, Integer situation, String situationName, String produceDate, Integer complaintStatus, String complaintStatusName, Long fileId1, String fileUrl1, String fileOriginName1, Long fileId2, String fileUrl2, String fileOriginName2, Integer countermeasureConfirm, Integer abarbeitungConfirm, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String createDatetimeStart, String createDatetimeEnd, String modifyUser, String modifyDatetime, String dutyDiff, String countermeasureConfirmName, String abarbeitungConfirmName, String uploadDatetime) {
+        this.id = id;
+        this.complaintNo = complaintNo;
+        this.complaintType = complaintType;
+        this.complaintTypeName = complaintTypeName;
+        this.abnormalSource = abnormalSource;
+        this.abnormalSourceName = abnormalSourceName;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.customerNo = customerNo;
+        this.customerName = customerName;
+        this.publishDate = publishDate;
+        this.planArriveDate = planArriveDate;
+        this.departmentNo = departmentNo;
+        this.issueDesc = issueDesc;
+        this.defectLevel = defectLevel;
+        this.defectLevelName = defectLevelName;
+        this.qty = qty;
+        this.situation = situation;
+        this.situationName = situationName;
+        this.produceDate = produceDate;
+        this.complaintStatus = complaintStatus;
+        this.complaintStatusName = complaintStatusName;
+        this.fileId1 = fileId1;
+        this.fileUrl1 = fileUrl1;
+        this.fileOriginName1 = fileOriginName1;
+        this.fileId2 = fileId2;
+        this.fileUrl2 = fileUrl2;
+        this.fileOriginName2 = fileOriginName2;
+        this.countermeasureConfirm = countermeasureConfirm;
+        this.abarbeitungConfirm = abarbeitungConfirm;
+        this.organizeCode = organizeCode;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.createDatetimeStart = createDatetimeStart;
+        this.createDatetimeEnd = createDatetimeEnd;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.dutyDiff = dutyDiff;
+        this.countermeasureConfirmName = countermeasureConfirmName;
+        this.abarbeitungConfirmName = abarbeitungConfirmName;
+        this.uploadDatetime = uploadDatetime;
+    }
+
+    public SxQmsBuCustomerComplaintModel(Long id, String createDatetime, String createUser , String modifyUser, String modifyDatetime,
+                                         String organizeCode, Long fileId1, String fileOriginName1, Long fileId2, String fileOriginName2,
+                                         String uploadDatetime, Integer isValid, Integer isDeleted, String complaintNo, Integer complaintType, Integer abnormalSource,
+                                         String partNo, String partNameRdd, String customerNo, String customerName,
+                                         String publishDate, String planArriveDate, String departmentNo, String issueDesc,
+                                         Integer defectLevel, Integer qty, Integer situation, String produceDate,
+                                         Integer complaintStatus, String fileUrl1, String fileUrl2, String dutyDiff,
+                                         Integer countermeasureConfirm, Integer abarbeitungConfirm) {
+        this.id = id;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.organizeCode = organizeCode;
+        this.fileId1 = fileId1;
+        this.fileOriginName1 = fileOriginName1;
+        this.fileId2 = fileId2;
+        this.fileOriginName2 = fileOriginName2;
+        this.uploadDatetime = uploadDatetime;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.complaintNo = complaintNo;
+        this.complaintType = complaintType;
+        this.abnormalSource = abnormalSource;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.customerNo = customerNo;
+        this.customerName = customerName;
+        this.publishDate = publishDate;
+        this.planArriveDate = planArriveDate;
+        this.departmentNo = departmentNo;
+        this.issueDesc = issueDesc;
+        this.defectLevel = defectLevel;
+        this.qty = qty;
+        this.situation = situation;
+        this.produceDate = produceDate;
+        this.complaintStatus = complaintStatus;
+        this.fileUrl1 = fileUrl1;
+        this.fileUrl2 = fileUrl2;
+        this.dutyDiff = dutyDiff;
+        this.countermeasureConfirm = countermeasureConfirm;
+        this.abarbeitungConfirm = abarbeitungConfirm;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxQmsFourHourMeetModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxQmsFourHourMeetModel.java
new file mode 100644
index 0000000..90ca5c5
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxQmsFourHourMeetModel.java
@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+
+
+/**
+ * @Description : 四时会议model
+ * @Reference :
+ * @Author : ssl
+ * @CreateDate : 2022-06-30 14:22
+ * @Modify:
+ **/
+@Api("四时会议model")
+@Data
+public class SxQmsFourHourMeetModel {
+
+    @Column(name = "BAD_NATURE")
+    @ApiParam("不良性质")
+    private String badNature;
+
+    @Column(name = "IMPERMANENT_POLICY")
+    @ApiParam("临时对策")
+    private String impermanentPolicy;
+
+    @Column(name = "IS_RELEASE_QUALITY")
+    @ApiParam("是否发行质量异常联络")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    private Integer isReleaseQuality;
+
+    @Column(name = "ACTUAL_REPLY_DATE")
+    @ApiParam("实际回复日")
+    private String actualReplyDate;
+
+    @Column(name = "END_DATE")
+    @ApiParam("完结日")
+    private String endDate;
+
+    @Column(name = "PROGRESS_TRACK")
+    @ApiParam("进度跟踪")
+    private String progressTrack;
+
+    @Column(name = "EFFECT_TRACK")
+    @ApiParam("对策后效果跟踪")
+    private String effectTrack;
+
+    @Column(name = "MEET_PERSONNEL")
+    @ApiParam("与会部门/人员")
+    private String meetPersonnel;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxQmsQCTransDetailsModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxQmsQCTransDetailsModel.java
new file mode 100644
index 0000000..8020ee6
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxQmsQCTransDetailsModel.java
@@ -0,0 +1,180 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.io.Serializable;
+
+/**
+ * 受入检验报表
+ * @author JiaQi.Hou
+ */
+@Data
+@Api("受入检验报表")
+public class SxQmsQCTransDetailsModel implements Serializable {
+
+    private static final long serialVersionUID = 373201307007194297L;
+
+    @ApiParam("ID")
+    private Long id;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("创建人")
+    public String createUser;
+
+    @ApiParam("创建时间")
+    public String createDatetime;
+
+    @ApiParam("修改人")
+    public String modifyUser;
+
+    @ApiParam("修改时间")
+    public String modifyDatetime;
+
+    @ApiParam("单号")
+    private String orderNo;
+
+    @ApiParam("抽检条码")
+    private String sn;
+
+    @ApiParam("抽检数")
+    private Double actQty;
+
+    @ApiParam("检测结果")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer qcStatus;
+
+    @ApiParam("单据类型")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.ITEM_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer itemType;
+
+    @ApiParam("项目类型")
+    private String projectName;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam(value = "关联单号")
+    private String refSrc;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("项目规格")
+    private String checkContent;
+
+    @ApiParam("上限值")
+    private String upLimit;
+
+    @ApiParam("下限值")
+    private String downLimit;
+
+    @ApiParam("测定器")
+    private String checkTool;
+
+    @Column(name = "ACTUAL_VALUE1")
+    @ApiParam("实1")
+    private String actualValue1;
+
+    @Column(name = "ACTUAL_VALUE2")
+    @ApiParam("实2")
+    private String actualValue2;
+
+    @Column(name = "ACTUAL_VALUE3")
+    @ApiParam("实3")
+    private String actualValue3;
+
+    @Column(name = "ACTUAL_VALUE4")
+    @ApiParam("实4")
+    private String actualValue4;
+
+    @Column(name = "ACTUAL_VALUE5")
+    @ApiParam("实5")
+    private String actualValue5;
+
+    @Column(name = "ACTUAL_VALUE6")
+    @ApiParam("实6")
+    private String actualValue6;
+
+    @Column(name = "ACTUAL_VALUE7")
+    @ApiParam("实7")
+    private String actualValue7;
+
+    @Column(name = "ACTUAL_VALUE8")
+    @ApiParam("实8")
+    private String actualValue8;
+
+    @Column(name = "ACTUAL_VALUE9")
+    @ApiParam("实9")
+    private String actualValue9;
+
+    @Column(name = "ACTUAL_VALUE10")
+    @ApiParam("实10")
+    private String actualValue10;
+
+    @ApiParam("检验人")
+    public String checkUser;
+
+    @ApiParam("检验时间")
+    public String checkDatetime;
+
+    @ApiParam("备注")
+    private String remark;
+
+    @ApiParam("控制区域")
+    private String controlArea;
+
+    @ApiParam("上下限预警区域")
+    private String theWarningArea;
+
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QMS_OQC_CHECK_DETAIL_RESULT.class, refForeignKey = "value", value = "description")
+    @ApiParam("检验结果")
+    private Integer checkResult;
+
+    public SxQmsQCTransDetailsModel() {
+    }
+
+    public SxQmsQCTransDetailsModel(String orderNo, String sn, Double actQty, Integer qcStatus, Integer itemType, String projectName, String vendorNo, String refSrc, String vendorName, String partNo, String partNameRdd, String checkContent, String upLimit, String downLimit, String checkTool, String actualValue1, String actualValue2, String actualValue3, String actualValue4, String actualValue5, String actualValue6, String actualValue7, String actualValue8, String actualValue9, String actualValue10, String createUser, String createDatetime, String remark, Integer checkResult) {
+        this.orderNo = orderNo;
+        this.sn = sn;
+        this.actQty = actQty;
+        this.qcStatus = qcStatus;
+        this.itemType = itemType;
+        this.projectName = projectName;
+        this.vendorNo = vendorNo;
+        this.refSrc = refSrc;
+        this.vendorName = vendorName;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.checkContent = checkContent;
+        this.upLimit = upLimit;
+        this.downLimit = downLimit;
+        this.checkTool = checkTool;
+        this.actualValue1 = actualValue1;
+        this.actualValue2 = actualValue2;
+        this.actualValue3 = actualValue3;
+        this.actualValue4 = actualValue4;
+        this.actualValue5 = actualValue5;
+        this.actualValue6 = actualValue6;
+        this.actualValue7 = actualValue7;
+        this.actualValue8 = actualValue8;
+        this.actualValue9 = actualValue9;
+        this.actualValue10 = actualValue10;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.remark = remark;
+        this.checkResult = checkResult;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxQmsQcTemporaryDataModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxQmsQcTemporaryDataModel.java
new file mode 100644
index 0000000..531746e
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxQmsQcTemporaryDataModel.java
@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsQCTransDetails;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * @Description: 检验项目暂存Model
+ * @Author: jiaqi.hou
+ * @date: 2022-08-22
+ */
+@Data
+@Api("检验项目暂存Model")
+public class SxQmsQcTemporaryDataModel extends BaseBean {
+
+    @ApiParam("检验项目暂存值")
+    private List<SxQmsQCTransDetails> sxQmsQCTransSnDetails;
+
+    @ApiParam("质检单号")
+    private String orderNo;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxQualityInspectionSpecificationAndChangeResumeModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxQualityInspectionSpecificationAndChangeResumeModel.java
new file mode 100644
index 0000000..3fcddc9
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/SxQualityInspectionSpecificationAndChangeResumeModel.java
@@ -0,0 +1,67 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @description: 质检规格书与变更履历model
+ * @author: jiaqi.hou
+ */
+@Data
+@ApiModel("质检规格书与变更履历model")
+public class SxQualityInspectionSpecificationAndChangeResumeModel {
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam("出模数")
+    private Integer outQty;
+
+    @ApiParam(value = "抽检数量")
+    private Integer checkQty;
+
+    @ApiParam("变更联络单号")
+    private String changeTheContactNumber;
+
+    @ApiParam("变更时间")
+    private String changeTime;
+
+    @ApiParam("变更内容")
+    private String changeContent;
+
+    @ApiParam("检验作业页面,变更履历底色")
+    private String color;
+
+    @ApiParam("文件ID")
+    private Long fileId;
+
+    @ApiParam("文件源名")
+    private String fileOriginName;
+
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @ApiParam("单据类型")
+    private String itemTypeName;
+
+    @ApiParam("物料数量")
+    private Double partQty;
+
+    @ApiParam("实际变更时间")
+    private String actualChangeTime;
+
+    @ApiParam("图号")
+    private String pictrueNo;
+
+    @ApiParam(value = "机种名称")
+    private String machineName;
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/WmsQCMasterExtModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/WmsQCMasterExtModel.java
new file mode 100644
index 0000000..2ff1843
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/WmsQCMasterExtModel.java
@@ -0,0 +1,169 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.util.List;
+
+/**
+ * @Description: 质检拓展model
+ * @Author: jiaqi.hou
+ * @date: 2022-06-20
+ */
+@Data
+@Api("质检拓展model")
+public class WmsQCMasterExtModel extends BaseBean {
+
+
+    @ApiParam("单号")
+    public String orderNo;
+
+    /**
+     * 业务类型:IQC=进料检验,IPQC=在线检验,
+     * FQC=成品检验,OQC=出货检验
+     */
+    @ApiParam(value = "业务类型", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer orderType;
+
+    /**
+     * 状态:1=创建,5=待处理,10=已完成,90=已关闭,91=已取消
+     */
+    @ApiParam(value = "单据状态", example = "1")
+    @AnnoOutputColumn(refClass = QmsEnumUtil.QC_INFO_STATUS_EXT.class, refForeignKey = "value", value = "description")
+    public Integer orderStatus;
+
+    /**
+     * 状态:10=质检中,20=合格,30=不合格
+     */
+    @ApiParam(value = "质检状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PO_QC_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer qcStatus;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    public String remark;
+
+    @ApiParam("客户编号")
+    public String custNo;
+
+    @ApiParam("供应商编号")
+    public String vendorNo;
+
+    @Column(name = "VERSION")
+    @ApiParam(value = "版本", example = "1")
+    public Integer version;
+
+    @ApiParam("关联单号类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "LINK_ORDER_TYPE")
+    public String refType;
+
+    @ApiParam("关联单号")
+    public String refSrc;
+
+    @ApiParam("PO数量")
+    private Double poQty;
+
+
+    @ApiParam(value = "客户简称")
+    private String custName;
+
+    @ApiParam(value = "供应商全称")
+    private String vendorDesc;
+
+    @ApiParam(value = "是否生产任务", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
+    public Integer isTask;
+
+    @ApiParam(value = "是否散件", example = "2")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    public Integer isPart;
+
+    @ApiParam(value = "ERP单号")
+    public String erpSrcNo;
+
+    @ApiParam(value = "零件号")
+    public String partNo;
+
+    @ApiParam(value = "零件名称")
+    public String partNameRdd;
+
+    @ApiParam(value = "收货数量")
+    public Double qty;
+
+    @ApiParam(value = "供应商批次")
+    private String dateCode;
+
+    @ApiParam(value = "收货日期")
+    private String rcDate;
+
+    @ApiParam(value = "收货数量")
+    private Double rcQty;
+
+    @ApiParam(value = "质检状态")
+    List<Integer> qcStatusList;
+
+    @ApiParam("条码")
+    private String sn;
+
+    public WmsQCMasterExtModel(){}
+
+    public WmsQCMasterExtModel(
+            Long id,
+            String organizeCode,
+            String orderNo,
+            Integer orderType,
+            Integer orderStatus,
+            Integer qcStatus,
+            String remark,
+            String custNo,
+            String vendorNo,
+            Integer version,
+            String refType,
+            String refSrc,
+            String custName,
+            String vendorDesc,
+            Integer isTask,
+            Integer isPart,
+            String partNo,
+            String partNameRdd,
+            String createDatetime,
+            String createUser,
+            String modifyDatetime,
+            String modifyUser,
+            Integer isDeleted,
+            Integer isValid) {
+        this.id = id;
+        this.organizeCode = organizeCode;
+        this.orderNo = orderNo;
+        this.orderType = orderType;
+        this.orderStatus = orderStatus;
+        this.qcStatus = qcStatus;
+        this.remark = remark;
+        this.custNo = custNo;
+        this.vendorNo = vendorNo;
+        this.version = version;
+        this.refType = refType;
+        this.refSrc = refSrc;
+        this.custName = custName;
+        this.vendorDesc = vendorDesc;
+        this.isTask = isTask;
+        this.isPart = isPart;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.createDatetime = createDatetime;
+        this.createUser = createUser;
+        this.modifyDatetime = modifyDatetime;
+        this.modifyUser = modifyUser;
+        this.isDeleted=isDeleted;
+        this.isValid=isValid;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/WmsQCQueryModel.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/WmsQCQueryModel.java
new file mode 100644
index 0000000..152f803
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/model/bu/WmsQCQueryModel.java
@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.qms.model.bu;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+/**
+ * @description:wms质检查询model
+ * @author: jiaqi.hou
+ * @date: 2022/06/23
+ */
+@Data
+@Api("wms质检查询model")
+public class WmsQCQueryModel {
+    private WmsQCMasterExtModel wmsQCMasterExtModel;
+
+    private Pager pager;
+
+    public WmsQCQueryModel() {
+    }
+
+    public WmsQCQueryModel(WmsQCMasterExtModel wmsQCMasterExtModel, Pager pager) {
+        this.wmsQCMasterExtModel = wmsQCMasterExtModel;
+        this.pager = pager;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsAbnormalConfirmRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsAbnormalConfirmRepository.java
new file mode 100644
index 0000000..bc04826
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsAbnormalConfirmRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsAbnormalConfirm;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :异常联络单确认记录
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2022-03-14
+ **/
+@Repository
+public interface SxQmsAbnormalConfirmRepository extends BaseRepository<SxQmsAbnormalConfirm, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsAbnormalDetailRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsAbnormalDetailRepository.java
new file mode 100644
index 0000000..81abd52
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsAbnormalDetailRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsAbnormalDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :异常联络单明细
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2022-03-14
+ **/
+@Repository
+public interface SxQmsAbnormalDetailRepository extends BaseRepository<SxQmsAbnormalDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsAbnormalFourHourMeetRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsAbnormalFourHourMeetRepository.java
new file mode 100644
index 0000000..4e26261
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsAbnormalFourHourMeetRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsAbnormalFourHourMeet;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :四时会议
+ * @Reference :
+ * @Author : ssl
+ * @CreateDate : 2022-06-29
+ **/
+@Repository
+public interface SxQmsAbnormalFourHourMeetRepository extends BaseRepository<SxQmsAbnormalFourHourMeet, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsAbnormalMasterRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsAbnormalMasterRepository.java
new file mode 100644
index 0000000..58de9e3
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsAbnormalMasterRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsAbnormalMaster;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :异常联络单
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2022-03-14
+ **/
+@Repository
+public interface SxQmsAbnormalMasterRepository extends BaseRepository<SxQmsAbnormalMaster, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsAbnormalReplyRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsAbnormalReplyRepository.java
new file mode 100644
index 0000000..aa977d7
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsAbnormalReplyRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsAbnormalReply;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :异常联络单确认回复
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2022-03-14
+ **/
+@Repository
+public interface SxQmsAbnormalReplyRepository extends BaseRepository<SxQmsAbnormalReply, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBadnessRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBadnessRepository.java
new file mode 100644
index 0000000..d8f5edb
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBadnessRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsBadness;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :不良
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2022-02-11
+ **/
+@Repository
+public interface SxQmsBadnessRepository extends BaseRepository<SxQmsBadness, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBasCustomerRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBasCustomerRepository.java
new file mode 100644
index 0000000..1550e0a
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBasCustomerRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsBasCustomer;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :客户信息
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2022-02-11
+ **/
+@Repository
+public interface SxQmsBasCustomerRepository extends BaseRepository<SxQmsBasCustomer, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBasVendorRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBasVendorRepository.java
new file mode 100644
index 0000000..6c57b56
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBasVendorRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsBasVendor;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :供应商信息
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2022-02-11
+ **/
+@Repository
+public interface SxQmsBasVendorRepository extends BaseRepository<SxQmsBasVendor, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuBadnessClassifyDetailRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuBadnessClassifyDetailRepository.java
new file mode 100644
index 0000000..773f9dc
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuBadnessClassifyDetailRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsBuBadnessClassifyDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 不良分类明细
+ * @Reference :
+ * @Author : xinwang.yi
+ * @CreateDate : 2022-06-07
+ **/
+@Repository
+public interface SxQmsBuBadnessClassifyDetailRepository extends BaseRepository<SxQmsBuBadnessClassifyDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuBadnessClassifyRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuBadnessClassifyRepository.java
new file mode 100644
index 0000000..a372760
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuBadnessClassifyRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsBuBadnessClassify;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 不良分类
+ * @Reference :
+ * @Author : xinwang.yi
+ * @CreateDate : 2022-06-07
+ **/
+@Repository
+public interface SxQmsBuBadnessClassifyRepository extends BaseRepository<SxQmsBuBadnessClassify, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuBadnessTypeRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuBadnessTypeRepository.java
new file mode 100644
index 0000000..3b50ddc
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuBadnessTypeRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsBuBadnessType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 不良类型
+ * @Reference :
+ * @Author : xinwang.yi
+ * @CreateDate : 2022-06-06
+ **/
+@Repository
+public interface SxQmsBuBadnessTypeRepository extends BaseRepository<SxQmsBuBadnessType, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuCareerRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuCareerRepository.java
new file mode 100644
index 0000000..cac6221
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuCareerRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsBuCareer;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @description: 事业别RDao
+ * @author: jiaqi.hou
+ * @date: 2022/06/15
+ */
+@Repository
+public interface SxQmsBuCareerRepository  extends BaseRepository<SxQmsBuCareer, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuIqcListRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuIqcListRepository.java
new file mode 100644
index 0000000..bf2680e
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuIqcListRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsBuIqcList;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @description: QMS_BU_免检清单
+ * @author: jiaqi.hou
+ * @date: 2022/07/13
+ */
+@Repository
+public interface SxQmsBuIqcListRepository extends BaseRepository<SxQmsBuIqcList, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuOqcProjectRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuOqcProjectRepository.java
new file mode 100644
index 0000000..8b55f94
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuOqcProjectRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsBuOqcProject;
+
+/**
+ * @Description : 出货检验项目
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2022-03-14
+ **/
+//@Repository
+public interface SxQmsBuOqcProjectRepository extends BaseRepository<SxQmsBuOqcProject, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuOutsourcedCommoditySuppliersRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuOutsourcedCommoditySuppliersRepository.java
new file mode 100644
index 0000000..41d3034
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBuOutsourcedCommoditySuppliersRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsBuOutsourcedCommoditySuppliers;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @description: 委外商品供应商
+ * @author: jiaqi.hou
+ * @date: 2022/07/13
+ */
+@Repository
+public interface SxQmsBuOutsourcedCommoditySuppliersRepository extends BaseRepository<SxQmsBuOutsourcedCommoditySuppliers, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBusiConfigRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBusiConfigRepository.java
new file mode 100644
index 0000000..f24e96f
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsBusiConfigRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsBusiConfig;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @description: SX_QMS_业务配置
+ * @author: jiaqi.hou
+ * @date: 2022/07/12
+ */
+@Repository
+public interface SxQmsBusiConfigRepository extends BaseRepository<SxQmsBusiConfig, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsCauseClassifyRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsCauseClassifyRepository.java
new file mode 100644
index 0000000..a30489f
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsCauseClassifyRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsCauseClassify;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :原因分类
+ * @Reference :
+ * @Author : xinwang.yi
+ * @CreateDate : 2022-06-11
+ **/
+@Repository
+public interface SxQmsCauseClassifyRepository extends BaseRepository<SxQmsCauseClassify, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsChangeResumeRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsChangeResumeRepository.java
new file mode 100644
index 0000000..968f6ad
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsChangeResumeRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsChangeResume;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @description:变更履历
+ * @author: jiaqi.hou
+ */
+@Repository
+public interface SxQmsChangeResumeRepository extends BaseRepository<SxQmsChangeResume, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsConfigRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsConfigRepository.java
new file mode 100644
index 0000000..da498b8
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsConfigRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsConfig;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :系统配置
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2022-02-11
+ **/
+@Repository
+public interface SxQmsConfigRepository extends BaseRepository<SxQmsConfig, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsCustomerComplaintAbarbeitungConfirmRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsCustomerComplaintAbarbeitungConfirmRepository.java
new file mode 100644
index 0000000..4a7b104
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsCustomerComplaintAbarbeitungConfirmRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsCustomerComplaintAbarbeitungConfirm;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Xinwang.Yi
+ * @CreateDate : 2022-02-11
+ **/
+@Repository
+public interface SxQmsCustomerComplaintAbarbeitungConfirmRepository extends BaseRepository<SxQmsCustomerComplaintAbarbeitungConfirm, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsCustomerComplaintAbarbeitungRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsCustomerComplaintAbarbeitungRepository.java
new file mode 100644
index 0000000..0d1da63
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsCustomerComplaintAbarbeitungRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsCustomerComplaintAbarbeitung;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Xinwang.Yi
+ * @CreateDate : 2022-02-11
+ **/
+@Repository
+public interface SxQmsCustomerComplaintAbarbeitungRepository extends BaseRepository<SxQmsCustomerComplaintAbarbeitung, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsCustomerComplaintAnalyseRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsCustomerComplaintAnalyseRepository.java
new file mode 100644
index 0000000..dce69f9
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsCustomerComplaintAnalyseRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsCustomerComplaintAnalyse;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Xinwang.Yi
+ * @CreateDate : 2022-02-11
+ **/
+@Repository
+public interface SxQmsCustomerComplaintAnalyseRepository extends BaseRepository<SxQmsCustomerComplaintAnalyse, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsCustomerComplaintMasterRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsCustomerComplaintMasterRepository.java
new file mode 100644
index 0000000..c237026
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsCustomerComplaintMasterRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsCustomerComplaintMaster;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Xinwang.Yi
+ * @CreateDate : 2022-02-11
+ **/
+@Repository
+public interface SxQmsCustomerComplaintMasterRepository extends BaseRepository<SxQmsCustomerComplaintMaster, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsCustomerComplaintSnRecordRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsCustomerComplaintSnRecordRepository.java
new file mode 100644
index 0000000..ac1bebe
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsCustomerComplaintSnRecordRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsCustomerComplaintSnRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Xinwang.Yi
+ * @CreateDate : 2022-02-11
+ **/
+@Repository
+public interface SxQmsCustomerComplaintSnRecordRepository extends BaseRepository<SxQmsCustomerComplaintSnRecord, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsDefectRateTargetRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsDefectRateTargetRepository.java
new file mode 100644
index 0000000..f431b27
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsDefectRateTargetRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsDefectRateTarget;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :不良率目标维护
+ * @Reference :
+ * @Author : yixinwang
+ * @CreateDate : 2022-03-30
+ **/
+@Repository
+public interface SxQmsDefectRateTargetRepository extends BaseRepository<SxQmsDefectRateTarget, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsEnumRepositpry.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsEnumRepositpry.java
new file mode 100644
index 0000000..3d5c10e
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsEnumRepositpry.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsEnum;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :字典枚举
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-15
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsEnumRepositpry extends BaseRepository<SxQmsEnum, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsErrorLineOffDetailRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsErrorLineOffDetailRepository.java
new file mode 100644
index 0000000..f828717
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsErrorLineOffDetailRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsErrorLineOffDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :异常下线详细表
+ * @Reference :
+ * @Author : xinwang.yi
+ * @CreateDate : 2022-06-09
+ **/
+@Repository
+public interface SxQmsErrorLineOffDetailRepository extends BaseRepository<SxQmsErrorLineOffDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsErrorLineOffRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsErrorLineOffRepository.java
new file mode 100644
index 0000000..99e1c68
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsErrorLineOffRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsErrorLineOff;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :异常下线表
+ * @Reference :
+ * @Author : xinwang.yi
+ * @CreateDate : 2022-06-09
+ **/
+@Repository
+public interface SxQmsErrorLineOffRepository extends BaseRepository<SxQmsErrorLineOff, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsEvaluationManageRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsEvaluationManageRepository.java
new file mode 100644
index 0000000..e20107e
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsEvaluationManageRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsEvaluationManage;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2022-02-15
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsEvaluationManageRepository extends BaseRepository<SxQmsEvaluationManage, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsFileRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsFileRepository.java
new file mode 100644
index 0000000..14a9e41
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsFileRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsFile;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsFileRepository extends BaseRepository<SxQmsFile, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsImprovementExperienceRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsImprovementExperienceRepository.java
new file mode 100644
index 0000000..2f7bf53
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsImprovementExperienceRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsImprovementExperience;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Xinwang.Yi
+ * @CreateDate : 2022-02-11
+ **/
+@Repository
+public interface SxQmsImprovementExperienceRepository extends BaseRepository<SxQmsImprovementExperience, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsInspectionMethodChangeManagementRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsInspectionMethodChangeManagementRepository.java
new file mode 100644
index 0000000..9a298b7
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsInspectionMethodChangeManagementRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsInspectionMethodChangeManagement;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @description:检验方式变更管理表RDao
+ * @author: jiaqi.hou
+ * @date: 2022/04/26
+ */
+@Repository
+public interface SxQmsInspectionMethodChangeManagementRepository extends BaseRepository<SxQmsInspectionMethodChangeManagement, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsKnowhowRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsKnowhowRepository.java
new file mode 100644
index 0000000..05e43b3
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsKnowhowRepository.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsKnowhow;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SxQmsKnowhowRepository extends BaseRepository<SxQmsKnowhow, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsLimitColorCfgRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsLimitColorCfgRepository.java
new file mode 100644
index 0000000..52d7b6e
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsLimitColorCfgRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsLimitColorCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsLimitColorCfgRepository extends BaseRepository<SxQmsLimitColorCfg, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMachineRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMachineRepository.java
new file mode 100644
index 0000000..247e429
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMachineRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsMachine;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :机种信息持久层
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-15
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsMachineRepository extends BaseRepository<SxQmsMachine, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsManagementTestMonitoringRecordRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsManagementTestMonitoringRecordRepository.java
new file mode 100644
index 0000000..1e7783d
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsManagementTestMonitoringRecordRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsManagementTestMonitoringRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2022/5/31 10:46
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsManagementTestMonitoringRecordRepository extends BaseRepository<SxQmsManagementTestMonitoringRecord, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsManagementTestMonitoringRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsManagementTestMonitoringRepository.java
new file mode 100644
index 0000000..d597019
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsManagementTestMonitoringRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsManagementTestMonitoring;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2022/5/31 10:46
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsManagementTestMonitoringRepository extends BaseRepository<SxQmsManagementTestMonitoring, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMiddleCheckDetailsRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMiddleCheckDetailsRepository.java
new file mode 100644
index 0000000..23c4aec
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMiddleCheckDetailsRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsMiddleCheckDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Author : FutureSoldiers
+ * @Create : 2022/10/26 14:00
+ */
+@Repository
+public interface SxQmsMiddleCheckDetailsRepository extends BaseRepository<SxQmsMiddleCheckDetails, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMiddleCheckMasterRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMiddleCheckMasterRepository.java
new file mode 100644
index 0000000..c10770f
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMiddleCheckMasterRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsMiddleCheckMaster;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Author : FutureSoldiers
+ * @Create : 2022/10/26 13:22
+ */
+@Repository
+public interface SxQmsMiddleCheckMasterRepository extends BaseRepository<SxQmsMiddleCheckMaster, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMiddleCheckTaskRecordRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMiddleCheckTaskRecordRepository.java
new file mode 100644
index 0000000..b311e3c
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMiddleCheckTaskRecordRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsMiddleCheckTaskRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Author : FutureSoldiers
+ * @Create : 2022/10/27 10:29
+ */
+@Repository
+public interface SxQmsMiddleCheckTaskRecordRepository extends BaseRepository<SxQmsMiddleCheckTaskRecord, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMiddleCheckTaskRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMiddleCheckTaskRepository.java
new file mode 100644
index 0000000..54e172c
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMiddleCheckTaskRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsMiddleCheckTask;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Author : FutureSoldiers
+ * @Create : 2022/10/26 17:47
+ */
+@Repository
+public interface SxQmsMiddleCheckTaskRepository extends BaseRepository<SxQmsMiddleCheckTask, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsModuleExcelManageRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsModuleExcelManageRepository.java
new file mode 100644
index 0000000..f963d60
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsModuleExcelManageRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsModuleExcelManage;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author yumingxing
+ * @version 1.0
+ * @date 2021/1/29 15:02
+ **/
+@Repository
+public interface SxQmsModuleExcelManageRepository extends BaseRepository<SxQmsModuleExcelManage, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsModuleFileImportLotRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsModuleFileImportLotRepository.java
new file mode 100644
index 0000000..6cdfb26
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsModuleFileImportLotRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsModuleFileImportLot;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/13 9:17
+ **/
+@Repository
+public interface SxQmsModuleFileImportLotRepository extends BaseRepository<SxQmsModuleFileImportLot, Long> {
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMonitorManageRecordRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMonitorManageRecordRepository.java
new file mode 100644
index 0000000..b29653b
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMonitorManageRecordRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsMonitorManageRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2022-02-15
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsMonitorManageRecordRepository extends BaseRepository<SxQmsMonitorManageRecord, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMonitorManageRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMonitorManageRepository.java
new file mode 100644
index 0000000..aa9c437
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsMonitorManageRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsMonitorManage;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2022-02-15
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsMonitorManageRepository extends BaseRepository<SxQmsMonitorManage, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOnSiteOrderDetailRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOnSiteOrderDetailRepository.java
new file mode 100644
index 0000000..bf671d1
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOnSiteOrderDetailRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsOnSiteOrderDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2022/5/27 10:39
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsOnSiteOrderDetailRepository extends BaseRepository<SxQmsOnSiteOrderDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOnSiteOrderRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOnSiteOrderRepository.java
new file mode 100644
index 0000000..3b5e223
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOnSiteOrderRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsOnSiteOrder;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2022/5/27 10:39
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsOnSiteOrderRepository extends BaseRepository<SxQmsOnSiteOrder, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcCheckDetailRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcCheckDetailRepository.java
new file mode 100644
index 0000000..d59e672
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcCheckDetailRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsOqcCheckDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsOqcCheckDetailRepository extends BaseRepository<SxQmsOqcCheckDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcCheckPackageDetailRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcCheckPackageDetailRepository.java
new file mode 100644
index 0000000..13f354b
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcCheckPackageDetailRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsOqcCheckPackageDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsOqcCheckPackageDetailRepository extends BaseRepository<SxQmsOqcCheckPackageDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcCheckPackageDetailTravelRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcCheckPackageDetailTravelRepository.java
new file mode 100644
index 0000000..272ccde
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcCheckPackageDetailTravelRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsOqcCheckPackageDetailTravel;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsOqcCheckPackageDetailTravelRepository extends BaseRepository<SxQmsOqcCheckPackageDetailTravel, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcCheckPackageIfRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcCheckPackageIfRepository.java
new file mode 100644
index 0000000..3a12bfe
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcCheckPackageIfRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsOqcCheckPackageIf;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsOqcCheckPackageIfRepository extends BaseRepository<SxQmsOqcCheckPackageIf, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcCheckRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcCheckRepository.java
new file mode 100644
index 0000000..ad80abc
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcCheckRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsOqcCheck;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsOqcCheckRepository extends BaseRepository<SxQmsOqcCheck, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcLastCheckIfRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcLastCheckIfRepository.java
new file mode 100644
index 0000000..0a2294d
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcLastCheckIfRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsOqcLastCheckIf;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : xinwang.yi
+ * @CreateDate : 2022-06-06
+ **/
+@Repository
+public interface SxQmsOqcLastCheckIfRepository extends BaseRepository<SxQmsOqcLastCheckIf, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcRuleNoteDetailRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcRuleNoteDetailRepository.java
new file mode 100644
index 0000000..684a119
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcRuleNoteDetailRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsOqcRuleNoteDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsOqcRuleNoteDetailRepository extends BaseRepository<SxQmsOqcRuleNoteDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcRuleNoteDetailTravelRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcRuleNoteDetailTravelRepository.java
new file mode 100644
index 0000000..6f210d9
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcRuleNoteDetailTravelRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsOqcRuleNoteDetailTravel;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :出货检验项目履历表
+ * @Reference :
+ * @Author : xinwang.yi
+ * @CreateDate : 2022-06-17
+ **/
+@Repository
+public interface SxQmsOqcRuleNoteDetailTravelRepository extends BaseRepository<SxQmsOqcRuleNoteDetailTravel, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcRuleNoteRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcRuleNoteRepository.java
new file mode 100644
index 0000000..a259f4c
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOqcRuleNoteRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsOqcRuleNote;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsOqcRuleNoteRepository extends BaseRepository<SxQmsOqcRuleNote, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOutPutStatisticsOqcRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOutPutStatisticsOqcRepository.java
new file mode 100644
index 0000000..fab8dcc
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsOutPutStatisticsOqcRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsOutPutStatisticsOqc;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author wangjie
+ * @version 1.0
+ * @date 2021/1/13 9:17
+ **/
+@Repository
+public interface SxQmsOutPutStatisticsOqcRepository extends BaseRepository<SxQmsOutPutStatisticsOqc, Long> {
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsPartExtRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsPartExtRepository.java
new file mode 100644
index 0000000..189e59f
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsPartExtRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsPartExt;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :物料品质属性
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-15
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsPartExtRepository extends BaseRepository<SxQmsPartExt, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsPartRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsPartRepository.java
new file mode 100644
index 0000000..a9278f7
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsPartRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsPart;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :QMS物料
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-15
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsPartRepository extends BaseRepository<SxQmsPart, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsPartWorkCenterRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsPartWorkCenterRepository.java
new file mode 100644
index 0000000..884a296
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsPartWorkCenterRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsPartWorkCenter;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 物料产线Repository
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/5/17 14:44
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsPartWorkCenterRepository extends BaseRepository<SxQmsPartWorkCenter, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProcedureProjectRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProcedureProjectRepository.java
new file mode 100644
index 0000000..1dcf6c3
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProcedureProjectRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsProcedureProject;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2022/5/27 10:53
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsProcedureProjectRepository extends BaseRepository<SxQmsProcedureProject, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProductClassificationRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProductClassificationRepository.java
new file mode 100644
index 0000000..2f6c0c9
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProductClassificationRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsProductClassification;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @description:产品分类表Rdao
+ * @author: jiaqi.hou
+ * @date: 2022/04/26
+ */
+@Repository
+public interface SxQmsProductClassificationRepository extends BaseRepository<SxQmsProductClassification, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProductStopOrderRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProductStopOrderRepository.java
new file mode 100644
index 0000000..596b956
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProductStopOrderRepository.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsProductStopOrder;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SxQmsProductStopOrderRepository extends BaseRepository<SxQmsProductStopOrder, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProjectInspectionDetailsRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProjectInspectionDetailsRepository.java
new file mode 100644
index 0000000..501505d
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProjectInspectionDetailsRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsProjectInspectionDetails;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SxQmsProjectInspectionDetailsRepository extends BaseRepository<SxQmsProjectInspectionDetails, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProjectInspectionMasterRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProjectInspectionMasterRepository.java
new file mode 100644
index 0000000..6a675fe
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProjectInspectionMasterRepository.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsProjectInspectionMaster;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SxQmsProjectInspectionMasterRepository extends BaseRepository<SxQmsProjectInspectionMaster, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProjectInspectionSnRefordRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProjectInspectionSnRefordRepository.java
new file mode 100644
index 0000000..e049b68
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProjectInspectionSnRefordRepository.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsProjectInspectionSnRecord;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SxQmsProjectInspectionSnRefordRepository extends BaseRepository<SxQmsProjectInspectionSnRecord, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProjectInspectionTaskRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProjectInspectionTaskRepository.java
new file mode 100644
index 0000000..ffc987c
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProjectInspectionTaskRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsProjectInspectionTask;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SxQmsProjectInspectionTaskRepository extends BaseRepository<SxQmsProjectInspectionTask, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProjectSortRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProjectSortRepository.java
new file mode 100644
index 0000000..ac9c06c
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProjectSortRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsProjectSort;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2022/5/27 10:53
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsProjectSortRepository extends BaseRepository<SxQmsProjectSort, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProjectTypeRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProjectTypeRepository.java
new file mode 100644
index 0000000..628a9cb
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsProjectTypeRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsProjectType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsProjectTypeRepository extends BaseRepository<SxQmsProjectType, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQCDetailsRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQCDetailsRepository.java
new file mode 100644
index 0000000..498d296
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQCDetailsRepository.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsQCDetails;
+import org.springframework.stereotype.Repository;
+
+
+/**
+ * @Description :质检明细数据数据访问
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-15
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsQCDetailsRepository extends BaseRepository<SxQmsQCDetails, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQCMasterRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQCMasterRepository.java
new file mode 100644
index 0000000..b2a4895
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQCMasterRepository.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsQCMaster;
+import org.springframework.stereotype.Repository;
+
+
+/**
+ * @Description :质检数据数据访问
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-15
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsQCMasterRepository extends BaseRepository<SxQmsQCMaster, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQCSnRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQCSnRepository.java
new file mode 100644
index 0000000..29eecec
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQCSnRepository.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsQCSn;
+import org.springframework.stereotype.Repository;
+
+
+/**
+ * @Description :质检条码数据数据访问
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-15
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsQCSnRepository extends BaseRepository<SxQmsQCSn, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQCTransDetailsRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQCTransDetailsRepository.java
new file mode 100644
index 0000000..94286f2
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQCTransDetailsRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsQCTransDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :质检条码记录结果数据数据访问
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-15
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsQCTransDetailsRepository extends BaseRepository<SxQmsQCTransDetails, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQCTransDetailsSumRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQCTransDetailsSumRepository.java
new file mode 100644
index 0000000..917cc12
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQCTransDetailsSumRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsQCTransDetailsSum;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : SxQmsQCTransDetailsSumRepository
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022/11/4 15:50
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsQCTransDetailsSumRepository extends BaseRepository<SxQmsQCTransDetailsSum, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQCTransSnRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQCTransSnRepository.java
new file mode 100644
index 0000000..430c7be
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQCTransSnRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsQCTransSn;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :质检条码记录数据数据访问
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-15
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsQCTransSnRepository extends BaseRepository<SxQmsQCTransSn, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQualityAbnormalQIRecordDetailRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQualityAbnormalQIRecordDetailRepository.java
new file mode 100644
index 0000000..0ece196
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQualityAbnormalQIRecordDetailRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsQualityAbnormalQIRecordDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :品质异常QI会议记录详细
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2022-03-14
+ **/
+@Repository
+public interface SxQmsQualityAbnormalQIRecordDetailRepository extends BaseRepository<SxQmsQualityAbnormalQIRecordDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQualityAbnormalQIRecordRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQualityAbnormalQIRecordRepository.java
new file mode 100644
index 0000000..f1948fa
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsQualityAbnormalQIRecordRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsQualityAbnormalQIRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :品质异常QI会议记录
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2022-03-14
+ **/
+@Repository
+public interface SxQmsQualityAbnormalQIRecordRepository extends BaseRepository<SxQmsQualityAbnormalQIRecord, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsRcInspectionFreeRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsRcInspectionFreeRepository.java
new file mode 100644
index 0000000..48ca808
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsRcInspectionFreeRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsRcInspectionFree;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :物料品质属性
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-15
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsRcInspectionFreeRepository extends BaseRepository<SxQmsRcInspectionFree, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsRcRuleNoteDetailRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsRcRuleNoteDetailRepository.java
new file mode 100644
index 0000000..14f4132
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsRcRuleNoteDetailRepository.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsRcRuleNoteDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :收货质检样式规格书明细数据访问
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-15
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsRcRuleNoteDetailRepository extends BaseRepository<SxQmsRcRuleNoteDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsRcRuleNoteRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsRcRuleNoteRepository.java
new file mode 100644
index 0000000..0630e24
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsRcRuleNoteRepository.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsRcRuleNote;
+import org.springframework.stereotype.Repository;
+
+
+/**
+ * @Description :收货质检样式规格书数据访问
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-15
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsRcRuleNoteRepository extends BaseRepository<SxQmsRcRuleNote, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsRecheckInstructionRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsRecheckInstructionRepository.java
new file mode 100644
index 0000000..a335b75
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsRecheckInstructionRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsRecheckInstruction;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :再检指示书
+ * @Reference :
+ * @Author : Xinwang.Yi
+ * @CreateDate : 2022-03-15
+ **/
+@Repository
+public interface SxQmsRecheckInstructionRepository extends BaseRepository<SxQmsRecheckInstruction, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsRulesOfDocumentGenerationRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsRulesOfDocumentGenerationRepository.java
new file mode 100644
index 0000000..39f6caf
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsRulesOfDocumentGenerationRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsRulesOfDocumentGeneration;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @description:  ODM/OEM单据生成规则
+ * @author: jiaqi.hou
+ * @date: 2022/07/13
+ */
+@Repository
+public interface SxQmsRulesOfDocumentGenerationRepository extends BaseRepository<SxQmsRulesOfDocumentGeneration, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsShipStopOrderDetailRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsShipStopOrderDetailRepository.java
new file mode 100644
index 0000000..878446c
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsShipStopOrderDetailRepository.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsShipStopOrderDetail;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SxQmsShipStopOrderDetailRepository extends BaseRepository<SxQmsShipStopOrderDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsShipStopOrderRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsShipStopOrderRepository.java
new file mode 100644
index 0000000..9923bb7
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsShipStopOrderRepository.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsShipStopOrder;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SxQmsShipStopOrderRepository extends BaseRepository<SxQmsShipStopOrder, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsShipStopOrderSnRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsShipStopOrderSnRepository.java
new file mode 100644
index 0000000..88fd3de
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsShipStopOrderSnRepository.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsShipStopOrderSn;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SxQmsShipStopOrderSnRepository extends BaseRepository<SxQmsShipStopOrderSn, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsVendorPartRelRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsVendorPartRelRepository.java
new file mode 100644
index 0000000..6585895
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsVendorPartRelRepository.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsVendorPartRel;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SxQmsVendorPartRelRepository extends BaseRepository<SxQmsVendorPartRel, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsVqeAbnormalDetailRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsVqeAbnormalDetailRepository.java
new file mode 100644
index 0000000..8f3958c
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsVqeAbnormalDetailRepository.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsVqeAbnormalDetail;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SxQmsVqeAbnormalDetailRepository extends BaseRepository<SxQmsVqeAbnormalDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsVqeAbnormalMasterRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsVqeAbnormalMasterRepository.java
new file mode 100644
index 0000000..cd648b1
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsVqeAbnormalMasterRepository.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsVqeAbnormalMaster;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SxQmsVqeAbnormalMasterRepository extends BaseRepository<SxQmsVqeAbnormalMaster, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsVqeArtificialPlusMinusRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsVqeArtificialPlusMinusRepository.java
new file mode 100644
index 0000000..fb828e0
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsVqeArtificialPlusMinusRepository.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsVqeArtificialPlusMinus;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SxQmsVqeArtificialPlusMinusRepository extends BaseRepository<SxQmsVqeArtificialPlusMinus, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsVqeDefectGradeScoreRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsVqeDefectGradeScoreRepository.java
new file mode 100644
index 0000000..f7ce58c
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsVqeDefectGradeScoreRepository.java
@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsVqeDefectGradeScore;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SxQmsVqeDefectGradeScoreRepository extends BaseRepository<SxQmsVqeDefectGradeScore, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsVqePlusMinusFormRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsVqePlusMinusFormRepository.java
new file mode 100644
index 0000000..b4ca6c3
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsVqePlusMinusFormRepository.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsVqePlusMinusForm;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SxQmsVqePlusMinusFormRepository extends BaseRepository<SxQmsVqePlusMinusForm, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsWorkCenterRepository.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsWorkCenterRepository.java
new file mode 100644
index 0000000..e150375
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/repository/SxQmsWorkCenterRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.qms.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.qms.bean.SxQmsWorkCenter;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :生产线信息持久层
+ * @Reference :
+ * @Author : puxiao
+ * @CreateDate : 2022-02-15
+ * @Modify:
+ **/
+@Repository
+public interface SxQmsWorkCenterRepository extends BaseRepository<SxQmsWorkCenter, Long> {
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/sqlpack/QmsHqlPack.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/sqlpack/QmsHqlPack.java
new file mode 100644
index 0000000..22ebd56
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/sqlpack/QmsHqlPack.java
@@ -0,0 +1,479 @@
+package cn.estsh.i3plus.pojo.qms.sqlpack;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
+import cn.estsh.i3plus.pojo.qms.bean.*;
+import cn.estsh.i3plus.pojo.qms.model.SxDefectRateTargetModel;
+import cn.estsh.i3plus.pojo.qms.model.SxEvaluationManageModel;
+import cn.estsh.i3plus.pojo.qms.model.SxMonitorManageModel;
+import cn.estsh.i3plus.pojo.qms.model.bu.BuOqcCheckReportModel;
+import cn.estsh.i3plus.pojo.qms.model.bu.SxBuMonitorManageModel;
+import cn.estsh.i3plus.pojo.qms.util.QmsConstWords;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+
+import org.springframework.util.StringUtils;
+
+import java.util.Arrays;
+
+/**
+ * @Description:
+ * @Reference: Qms 条件封装
+ * @Author: wangjie
+ * @CreateDate:2019-04-22-14:58
+ * @Modify:
+ **/
+public class QmsHqlPack {
+
+    public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, QmsConstWords.ORGANIZE_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), QmsConstWords.IS_VALID, packBean);
+        DdlPreparedPack.getNumEqualPack(QmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), QmsConstWords.IS_DELETED, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getAllBaseDataByIsValid(String organizeCode, Integer valid) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, QmsConstWords.ORGANIZE_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(valid, QmsConstWords.IS_VALID, packBean);
+        DdlPreparedPack.getNumEqualPack(QmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), QmsConstWords.IS_DELETED, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getAllBaseData(String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, QmsConstWords.ORGANIZE_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(QmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), QmsConstWords.IS_DELETED, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getAllValidData(String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, QmsConstWords.ORGANIZE_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), QmsConstWords.IS_VALID, packBean);
+        DdlPreparedPack.getNumEqualPack(QmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), QmsConstWords.IS_DELETED, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getModuleFileImportLot(SxQmsModuleFileImportLot moduleFileImportLot) {
+        DdlPackBean packBean = getAllValidData(moduleFileImportLot.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(moduleFileImportLot.getLotNo(), QmsConstWords.LOT_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(moduleFileImportLot.getModule(), QmsConstWords.MODULE, packBean);
+        if (!StringUtils.isEmpty(moduleFileImportLot.getCreateDateTimeStart()) || !StringUtils.isEmpty(moduleFileImportLot.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    moduleFileImportLot.getCreateDateTimeStart(), moduleFileImportLot.getCreateDateTimeEnd(),
+                    QmsConstWords.CREATE_DATE_TIME, packBean, true);
+        }
+        return packBean;
+    }
+
+    public static DdlPackBean getProjectType(SxQmsProjectType projectType) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(projectType, projectType.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(projectType.getProjectCode(), QmsConstWords.PROJECT_CODE, packBean);
+        DdlPreparedPack.getStringLikerPack(projectType.getProjectName(), QmsConstWords.PROJECT_NAME, packBean);
+        DdlPreparedPack.getNumEqualPack(projectType.getModule(), QmsConstWords.MODULE, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getOqcRuleNoteDetail(SxQmsOqcRuleNoteDetail oqcRuleNoteDetail) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(oqcRuleNoteDetail, oqcRuleNoteDetail.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(oqcRuleNoteDetail.getPartNo(), QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getNumEqualPack(oqcRuleNoteDetail.getCheckType(), QmsConstWords.CHECK_TYPE, packBean);
+        DdlPreparedPack.getNumEqualPack(oqcRuleNoteDetail.getIsNecessary(), QmsConstWords.IS_NECESSARY, packBean);
+        DdlPreparedPack.getStringEqualPack(oqcRuleNoteDetail.getProjectCode(), QmsConstWords.PROJECT_CODE, packBean);
+        DdlPreparedPack.getStringLikerPack(oqcRuleNoteDetail.getCheckContent(), QmsConstWords.CHECK_CONTENT, packBean);
+        DdlPreparedPack.getStringLikerPack(oqcRuleNoteDetail.getCheckItem(), QmsConstWords.CHECK_ITEM, packBean);
+        DdlPreparedPack.getStringLikerPack(oqcRuleNoteDetail.getStandard(), QmsConstWords.STANDARD, packBean);
+        DdlPreparedPack.getStringLikerPack(oqcRuleNoteDetail.getCheckTool(), QmsConstWords.CHECK_TOOL, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean packHqlQmsEnum(SxQmsEnum sxQmsEnum) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(sxQmsEnum.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getStringEqualPack(sxQmsEnum.getEnumType(), "enumType", result);
+        DdlPreparedPack.getStringEqualPack(sxQmsEnum.getEnumValue(), "enumValue", result);
+        getStringBuilderPack(sxQmsEnum, result);
+        return result;
+    }
+
+    public static DdlPackBean packHqlBasCustomer(SxQmsBasCustomer basCustomer) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result);
+        DdlPreparedPack.getStringLikerPack(basCustomer.getCustName(), "custName", result);
+        DdlPreparedPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result);
+        getStringBuilderPack(basCustomer, result);
+        return result;
+    }
+
+    public static DdlPackBean packHqlBasVendor(SxQmsBasVendor basVendor) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", result);
+        DdlPreparedPack.getStringLikerPack(basVendor.getVendorName(), "vendorName", result);
+        DdlPreparedPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result);
+        getStringBuilderPack(basVendor, result);
+        return result;
+
+    }
+
+    public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) {
+        if (!StringUtils.isEmpty(bean.getOrganizeCode())) {
+            DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
+        }
+
+        DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr);
+        if (!StringUtils.isEmpty(bean.getCreateDateTimeStart()) && org.apache.commons.lang3.StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true);
+        }
+
+        if (StringUtil.isEmpty(bean.getIsValid())) {
+            DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", hqlStr);
+        } else {
+            DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
+        }
+
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
+        return hqlStr;
+    }
+
+    public static DdlPackBean getConfig(SxQmsConfig cfgCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(cfgCode, cfgCode.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(cfgCode.getCfgCode(), QmsConstWords.CFG_CODE, packBean);
+        DdlPreparedPack.getStringLikerPack(cfgCode.getCfgName(), QmsConstWords.CFG_NAME, packBean);
+        DdlPreparedPack.getStringEqualPack(cfgCode.getCfgKey(), QmsConstWords.CFG_KEY, packBean);
+        DdlPreparedPack.getStringEqualPack(cfgCode.getCfgType(), QmsConstWords.CFG_TYPE, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getSxQmsImprovementExperience(SxQmsImprovementExperience sxQmsImprovementExperience) {
+        DdlPackBean packBean = getAllValidData(sxQmsImprovementExperience.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(sxQmsImprovementExperience.getWorkCenterCode(),QmsConstWords.WORK_CENTER_CODE, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsImprovementExperience.getProblemDesc(), QmsConstWords.PROBLEM_DESC, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsImprovementExperience.getSolution(), QmsConstWords.SOLUTION, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsImprovementExperience.getMachineCode(), QmsConstWords.MACHINE_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(sxQmsImprovementExperience.getImproveType(), QmsConstWords.IMPROVE_TYPE, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getSxQmsBuImprovementExperience(SxQmsImprovementExperience sxQmsImprovementExperience) {
+        DdlPackBean packBean = getAllValidData(sxQmsImprovementExperience.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(sxQmsImprovementExperience.getWorkCenterCode(),QmsConstWords.WORK_CENTER_CODE, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsImprovementExperience.getProblemDesc(), QmsConstWords.PROBLEM_DESC, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsImprovementExperience.getSolution(), QmsConstWords.SOLUTION, packBean);
+        if(!StringUtils.isEmpty(sxQmsImprovementExperience.getMachineCode())){
+            String[] productTypes = sxQmsImprovementExperience.getMachineCode().split(QmsConstWords.COMMA);
+            if(productTypes.length > 1){
+                DdlPreparedPack.getInPackArray(productTypes, QmsConstWords.MACHINE_CODE, packBean);
+            }else{
+                DdlPreparedPack.getStringLikerPack(sxQmsImprovementExperience.getMachineCode(), QmsConstWords.MACHINE_CODE, packBean);
+            }
+        }
+        DdlPreparedPack.getNumEqualPack(sxQmsImprovementExperience.getImproveType(), QmsConstWords.IMPROVE_TYPE, packBean);
+        DdlPreparedPack.getStringLikerPack(sxQmsImprovementExperience.getPartNo(), QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsImprovementExperience.getCategoryCode1(), QmsConstWords.CATEGORY_CODE1, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getOqcCheckPackageDetail(SxQmsOqcCheckPackageDetail oqcCheckPackageDetail) {
+        DdlPackBean packBean = getAllValidData(oqcCheckPackageDetail.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(oqcCheckPackageDetail.getOqcNo(), QmsConstWords.OQC_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(oqcCheckPackageDetail.getSerialNumber(), QmsConstWords.SERIAL_NUMBER, packBean);
+        DdlPreparedPack.getStringLikerPack(oqcCheckPackageDetail.getPackageNo(), QmsConstWords.PACKAGENO, packBean);
+        DdlPreparedPack.getStringEqualPack(oqcCheckPackageDetail.getPartNo(), QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(oqcCheckPackageDetail.getWorkOrderNo(), QmsConstWords.WORK_ORDER_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(oqcCheckPackageDetail.getWorkCenterCode(), QmsConstWords.WORK_CENTER_CODE, packBean);
+        DdlPreparedPack.getStringEqualPack(oqcCheckPackageDetail.getWorkTime(), QmsConstWords.WORK_TIME, packBean);
+        DdlPreparedPack.getStringEqualPack(oqcCheckPackageDetail.getShiftCode(), QmsConstWords.SHIFT_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(oqcCheckPackageDetail.getCheckResult(), QmsConstWords.CHECK_RESULT, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getPartExt(SxQmsPartExt partExt) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(partExt, partExt.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(partExt.getPartNo(), QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(partExt.getPartNameRdd(), QmsConstWords.PART_NAME_RDD, packBean);
+        DdlPreparedPack.getStringEqualPack(partExt.getWorkCenterCode(), QmsConstWords.WORK_CENTER_CODE, packBean);
+        DdlPreparedPack.getStringEqualPack(partExt.getMachineCode(), QmsConstWords.MACHINE_CODE, packBean);
+        DdlPreparedPack.getStringEqualPack(partExt.getVendorNo(), QmsConstWords.VENDOR_NO, packBean);
+        DdlPreparedPack.getNumEqualPack(partExt.getPartType(), QmsConstWords.PART_TYPE, packBean);
+        DdlPreparedPack.getNumEqualPack(partExt.getProductType(), QmsConstWords.PRODUCT_TYPE, packBean);
+        DdlPreparedPack.getNumEqualPack(partExt.getIsOqc(), QmsConstWords.IS_OQC, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getPart(SxQmsPart part) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(part, part.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(part.getPartNo(), QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(part.getPartNameRdd(), QmsConstWords.PART_NAME_RDD, packBean);
+        DdlPreparedPack.getStringEqualPack(part.getCategoryCode1(), QmsConstWords.CATEGORY_CODE1, packBean);
+        DdlPreparedPack.getStringEqualPack(part.getCategoryCode2(), QmsConstWords.CATEGORY_CODE2, packBean);
+        DdlPreparedPack.getStringEqualPack(part.getCategoryCode3(), QmsConstWords.CATEGORY_CODE3, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getMonitorManage(SxMonitorManageModel monitorManage) {
+        DdlPackBean packBean = getAllBaseDataByIsValid(monitorManage.getOrganizeCode(), monitorManage.getIsValid());
+        DdlPreparedPack.getNumEqualPack(monitorManage.getModule(), QmsConstWords.MODULE, packBean);
+        DdlPreparedPack.getStringLikerPack(monitorManage.getManageNo(), QmsConstWords.MANAGE_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(monitorManage.getPartNo(), QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(monitorManage.getVendorNo(), QmsConstWords.VENDOR_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(monitorManage.getMachineCode(), QmsConstWords.MACHINE_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(monitorManage.getProductType(), QmsConstWords.PRODUCT_TYPE, packBean);
+        DdlPreparedPack.getNumEqualPack(monitorManage.getClassify(), QmsConstWords.CLASSIFY, packBean);
+        DdlPreparedPack.getNumEqualPack(monitorManage.getLevel(), QmsConstWords.LEVEL, packBean);
+        DdlPreparedPack.getStringEqualPack(monitorManage.getCategory(), QmsConstWords.CATEGORY, packBean);
+        DdlPreparedPack.getStringEqualPack(monitorManage.getCheckDiff(), QmsConstWords.CHECK_DIFF, packBean);
+        DdlPreparedPack.getStringEqualPack(monitorManage.getProjectName(), QmsConstWords.PROJECT_NAME, packBean);
+        if (!StringUtils.isEmpty(monitorManage.getCheckDatetimeStart()) || !StringUtils.isEmpty(monitorManage.getCheckDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    monitorManage.getCheckDatetimeStart(), monitorManage.getCheckDatetimeEnd(),
+                    QmsConstWords.CHECK_DATE_TIME, packBean, false);
+        }
+        if (!StringUtils.isEmpty(monitorManage.getCheckedDatetimeStart()) || !StringUtils.isEmpty(monitorManage.getCheckedDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    monitorManage.getCheckedDatetimeStart(), monitorManage.getCheckedDatetimeEnd(),
+                    QmsConstWords.CHECKED_DATE_TIME, packBean, false);
+        }
+        return packBean;
+    }
+
+    public static DdlPackBean getMonitorManageRecord(SxMonitorManageModel monitorManage) {
+        DdlPackBean packBean = getAllValidData(monitorManage.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(monitorManage.getManageNo(), QmsConstWords.MANAGE_NO, packBean);
+        if (!StringUtils.isEmpty(monitorManage.getCheckedFreDatetimeStart()) || !StringUtils.isEmpty(monitorManage.getCheckedFreDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    monitorManage.getCheckedFreDatetimeStart(), monitorManage.getCheckedFreDatetimeEnd(),
+                    QmsConstWords.CHECKED_FRE_DATE_TIME, packBean, false);
+        }
+        if (!StringUtils.isEmpty(monitorManage.getCheckedDatetimeStart()) || !StringUtils.isEmpty(monitorManage.getCheckedDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    monitorManage.getCheckedDatetimeStart(), monitorManage.getCheckedDatetimeEnd(),
+                    QmsConstWords.CHECKED_DATE_TIME, packBean, false);
+        }
+        return packBean;
+    }
+
+
+    public static DdlPackBean getEvaluationManage(SxEvaluationManageModel evaluationManage) {
+        DdlPackBean packBean = getAllValidData(evaluationManage.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(evaluationManage.getApplyNo(), QmsConstWords.APPLY_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(evaluationManage.getDepartmentCode(), QmsConstWords.DEPARTMENT_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(evaluationManage.getProductType(), QmsConstWords.PRODUCT_TYPE, packBean);
+        DdlPreparedPack.getNumEqualPack(evaluationManage.getCauseType(), QmsConstWords.CAUSE_TYPE, packBean);
+        DdlPreparedPack.getStringLikerPack(evaluationManage.getVendorNo(), QmsConstWords.VENDOR_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(evaluationManage.getPartNo(), QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(evaluationManage.getRelateNo(), QmsConstWords.RELATE_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(evaluationManage.getApplyUser(), QmsConstWords.APPLY_USER, packBean);
+        DdlPreparedPack.getStringLikerPack(evaluationManage.getEvaluationUser(), QmsConstWords.EVALUATION_USER, packBean);
+        DdlPreparedPack.getStringLikerPack(evaluationManage.getEvaluationContent(), QmsConstWords.EVALUATION_CONTENT, packBean);
+        if (!StringUtils.isEmpty(evaluationManage.getApplyDatetimeStart()) || !StringUtils.isEmpty(evaluationManage.getApplyDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    evaluationManage.getApplyDatetimeStart(), evaluationManage.getApplyDatetimeEnd(),
+                    QmsConstWords.APPLY_DATE_TIME, packBean, false);
+        }
+        if (!StringUtils.isEmpty(evaluationManage.getEvaluationDatetimeStart()) || !StringUtils.isEmpty(evaluationManage.getEvaluationDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    evaluationManage.getEvaluationDatetimeStart(), evaluationManage.getEvaluationDatetimeEnd(),
+                    QmsConstWords.EVALUATION_DATE_TIME, packBean, false);
+        }
+        if (!StringUtils.isEmpty(evaluationManage.getCheckDatetimeStart()) || !StringUtils.isEmpty(evaluationManage.getCheckDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    evaluationManage.getCheckDatetimeStart(), evaluationManage.getCheckDatetimeEnd(),
+                    QmsConstWords.CHECK_DATE_TIME, packBean, false);
+        }
+        return packBean;
+    }
+
+    public static DdlPackBean getSxQmsRecheckInstruction(SxQmsRecheckInstruction sxQmsRecheckInstruction) {
+        DdlPackBean packBean = getAllValidData(sxQmsRecheckInstruction.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(sxQmsRecheckInstruction.getPartNo(),QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsRecheckInstruction.getPartNameRdd(), QmsConstWords.PART_NAME_RDD, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsRecheckInstruction.getMachineCode(), QmsConstWords.MACHINE_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(sxQmsRecheckInstruction.getInstructionStatus(), QmsConstWords.INSTRUCTION_STATUS, packBean);
+        if (!StringUtils.isEmpty(sxQmsRecheckInstruction.getCreateDateTimeStart()) || !StringUtils.isEmpty(sxQmsRecheckInstruction.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    sxQmsRecheckInstruction.getCreateDateTimeStart(), sxQmsRecheckInstruction.getCreateDateTimeEnd(),
+                    QmsConstWords.CREATE_DATE_TIME, packBean, false);
+        }
+        return packBean;
+    }
+
+    public static DdlPackBean getLimitColorCfg(SxQmsLimitColorCfg limitColorCfg) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(limitColorCfg, limitColorCfg.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(limitColorCfg.getModule(), QmsConstWords.MODULE, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getBadness(SxQmsBadness sxQmsBadness) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(sxQmsBadness, sxQmsBadness.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(sxQmsBadness.getBadnessModule(), QmsConstWords.BADNESS_MODULE, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsBadness.getBadnessCode(), QmsConstWords.BADNESS_CODE, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsBadness.getBadnessName(), QmsConstWords.BADNESS_NAME, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getDefectRateTarget(SxQmsDefectRateTarget sxQmsDefectRateTarget) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(sxQmsDefectRateTarget, sxQmsDefectRateTarget.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(sxQmsDefectRateTarget.getDataType(), QmsConstWords.DATA_TYPE, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsDefectRateTarget.getDataValue(), QmsConstWords.DATA_VALUE, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsDefectRateTarget.getTargetTime(), QmsConstWords.TARGET_TIME, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsDefectRateTarget.getTargetType(),QmsConstWords.TARGET_TYPE, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getMachine(SxQmsMachine sxQmsMachine) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(sxQmsMachine, sxQmsMachine.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(sxQmsMachine.getMachineCode(), QmsConstWords.MACHINE_CODE, packBean);
+        DdlPreparedPack.getStringLikerPack(sxQmsMachine.getMachineName(), QmsConstWords.MACHINE_NAME, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getReportDefectRateTarget(SxDefectRateTargetModel model) {
+        DdlPackBean packBean = getAllValidData(model.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(model.getDataType(), QmsConstWords.DATA_TYPE, packBean);
+        DdlPreparedPack.getStringEqualPack(model.getDataValue(), QmsConstWords.DATA_VALUE, packBean);
+        DdlPreparedPack.getStringEqualPack(model.getTargetType(), QmsConstWords.TARGET_TYPE, packBean);
+        if (!StringUtils.isEmpty(model.getTargetTimeStart()) || !StringUtils.isEmpty(model.getTargetTimeEnd())) {
+            DdlPreparedPack.timeBuilder(model.getTargetTimeStart(), model.getTargetTimeEnd(), QmsConstWords.TARGET_TIME, packBean, false);
+        }
+        return packBean;
+    }
+
+    public static DdlPackBean getSxQmsQualityAbnormalQIRecord(SxQmsQualityAbnormalQIRecord sxQmsQualityAbnormalQIRecord) {
+        DdlPackBean packBean = getAllValidData(sxQmsQualityAbnormalQIRecord.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(sxQmsQualityAbnormalQIRecord.getMeetingNo(), QmsConstWords.MEETING_NO, packBean);
+        if (!StringUtils.isEmpty(sxQmsQualityAbnormalQIRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(sxQmsQualityAbnormalQIRecord.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(sxQmsQualityAbnormalQIRecord.getCreateDateTimeStart(), sxQmsQualityAbnormalQIRecord.getCreateDateTimeEnd(), QmsConstWords.TARGET_TIME, packBean, false);
+        }
+        return packBean;
+    }
+
+    public static DdlPackBean getSxQmsQualityAbnormalQIRecordDetail(SxQmsQualityAbnormalQIRecordDetail sxQmsQualityAbnormalQIRecordDetail) {
+        DdlPackBean packBean = getAllValidData(sxQmsQualityAbnormalQIRecordDetail.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(sxQmsQualityAbnormalQIRecordDetail.getMeetingNo(), QmsConstWords.MEETING_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsQualityAbnormalQIRecordDetail.getPartNo(), QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getNumEqualPack(sxQmsQualityAbnormalQIRecordDetail.getDutyDiff(), QmsConstWords.DUTY_DIFF, packBean);
+        return packBean;
+    }
+
+
+    public static DdlPackBean packHqlSxPartWorkCenter(SxQmsPartWorkCenter sxQmsPartWorkCenter) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringRightLikerPack(sxQmsPartWorkCenter.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringLikerPack(sxQmsPartWorkCenter.getPartName(), "partName", result);
+        DdlPreparedPack.getStringLikerPack(sxQmsPartWorkCenter.getWorkCenterCode(), "workCenterCode", result);
+        getStringBuilderPack(sxQmsPartWorkCenter, result);
+        return result;
+    }
+
+
+    public static DdlPackBean getCauseClassify(SxQmsCauseClassify causeClassify) {
+        DdlPackBean packBean = getAllValidData(causeClassify.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(causeClassify.getCauseClassifyCode(), "causeClassifyCode", packBean);
+        DdlPreparedPack.getStringLikerPack(causeClassify.getCauseClassifyName(), "causeClassifyName", packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getMonitorManage(SxBuMonitorManageModel monitorManage) {
+        DdlPackBean packBean = getAllValidData(monitorManage.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(monitorManage.getModule(), QmsConstWords.MODULE, packBean);
+        DdlPreparedPack.getStringLikerPack(monitorManage.getManageNo(), QmsConstWords.MANAGE_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(monitorManage.getPartNo(), QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(monitorManage.getVendorNo(), QmsConstWords.VENDOR_NO, packBean);
+        DdlPreparedPack.getNumEqualPack(monitorManage.getProductType(), QmsConstWords.PRODUCT_TYPE, packBean);
+        DdlPreparedPack.getNumEqualPack(monitorManage.getClassify(), QmsConstWords.CLASSIFY, packBean);
+        DdlPreparedPack.getNumEqualPack(monitorManage.getLevel(), QmsConstWords.LEVEL, packBean);
+        //DdlPreparedPack.getStringEqualPack(monitorManage.getCategory(), QmsConstWords.CATEGORY, packBean);
+        //DdlPreparedPack.getStringEqualPack(monitorManage.getCheckDiff(), QmsConstWords.CHECK_DIFF, packBean);
+        //DdlPreparedPack.getStringEqualPack(monitorManage.getProjectName(), QmsConstWords.PROJECT_NAME, packBean);
+//        if (!StringUtils.isEmpty(monitorManage.getCheckDatetimeStart()) || !StringUtils.isEmpty(monitorManage.getCheckDatetimeEnd())) {
+//            DdlPreparedPack.timeBuilder(
+//                    monitorManage.getCheckDatetimeStart(), monitorManage.getCheckDatetimeEnd(),
+//                    QmsConstWords.CHECK_DATE_TIME, packBean, false);
+//        }
+        if (!StringUtils.isEmpty(monitorManage.getCheckedDatetimeStart()) || !StringUtils.isEmpty(monitorManage.getCheckedDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    monitorManage.getCheckedDatetimeStart(), monitorManage.getCheckedDatetimeEnd(),
+                    QmsConstWords.CHECKED_DATE_TIME, packBean, false);
+        }
+        return packBean;
+    }
+
+    public static DdlPackBean getOqcCheckDetailByOqcNo(SxQmsOqcCheck oqcCheckDb) {
+        DdlPackBean packBean = getAllValidData(oqcCheckDb.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(oqcCheckDb.getOqcNo(), QmsConstWords.OQC_NO, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getBuEvaluationManage(SxEvaluationManageModel evaluationManage) {
+        DdlPackBean packBean = getAllValidData(evaluationManage.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(evaluationManage.getApplyNo(), QmsConstWords.APPLY_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(evaluationManage.getDepartmentCode(), QmsConstWords.DEPARTMENT_CODE, packBean);
+        DdlPreparedPack.getStringEqualPack(evaluationManage.getBuCauseType(), QmsConstWords.BU_CAUSE_TYPE, packBean);
+        DdlPreparedPack.getStringLikerPack(evaluationManage.getVendorNo(), QmsConstWords.VENDOR_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(evaluationManage.getPartNo(), QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(evaluationManage.getRelateNo(), QmsConstWords.RELATE_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(evaluationManage.getApplyUser(), QmsConstWords.APPLY_USER, packBean);
+        DdlPreparedPack.getStringLikerPack(evaluationManage.getEvaluationUser(), QmsConstWords.EVALUATION_USER, packBean);
+        DdlPreparedPack.getStringLikerPack(evaluationManage.getEvaluationContent(), QmsConstWords.EVALUATION_CONTENT, packBean);
+        if (!StringUtils.isEmpty(evaluationManage.getApplyDatetimeStart()) || !StringUtils.isEmpty(evaluationManage.getApplyDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    evaluationManage.getApplyDatetimeStart(), evaluationManage.getApplyDatetimeEnd(),
+                    QmsConstWords.APPLY_DATE_TIME, packBean, false);
+        }
+        if (!StringUtils.isEmpty(evaluationManage.getEvaluationDatetimeStart()) || !StringUtils.isEmpty(evaluationManage.getEvaluationDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    evaluationManage.getEvaluationDatetimeStart(), evaluationManage.getEvaluationDatetimeEnd(),
+                    QmsConstWords.EVALUATION_DATE_TIME, packBean, false);
+        }
+        if (!StringUtils.isEmpty(evaluationManage.getCheckDatetimeStart()) || !StringUtils.isEmpty(evaluationManage.getCheckDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    evaluationManage.getCheckDatetimeStart(), evaluationManage.getCheckDatetimeEnd(),
+                    QmsConstWords.CHECK_DATE_TIME, packBean, false);
+        }
+
+        if(!StringUtils.isEmpty(evaluationManage.getBuProductType())){
+            String[] productTypes = evaluationManage.getBuProductType().split(QmsConstWords.COMMA);
+            if(productTypes.length > 1){
+                DdlPreparedPack.getInPackArray(productTypes, QmsConstWords.BU_PRODUCT_TYPE, packBean);
+            }else{
+                DdlPreparedPack.getStringLikerPack(evaluationManage.getBuProductType(), QmsConstWords.BU_PRODUCT_TYPE, packBean);
+            }
+        }
+
+        return packBean;
+    }
+
+    public static DdlPackBean getOqcCheck(BuOqcCheckReportModel model) {
+        DdlPackBean packBean = getAllValidData(model.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(model.getWorkOrderNo(), QmsConstWords.WORK_ORDER_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(model.getPartNo(), QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(model.getWorkCenterCode(), QmsConstWords.WORK_CENTER_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(model.getOqcType(), QmsConstWords.OQC_TYPE, packBean);
+        DdlPreparedPack.getNumEqualPack(model.getCheckResult(), QmsConstWords.CHECK_RESULT, packBean);
+        DdlPreparedPack.getStringLikerPack(model.getOqcNo(), QmsConstWords.OQC_NO, packBean);
+        DdlPreparedPack.getNumEqualPack(model.getSnType(), QmsConstWords.SN_TYPE, packBean);
+        DdlPreparedPack.getNumEqualPack(model.getOqcNoType(), QmsConstWords.OQC_NO_TYPE, packBean);
+        DdlPreparedPack.getIsNotNull(QmsConstWords.CHECK_RESULT, packBean);
+        if (!StringUtils.isEmpty(model.getCreateDatetimeStart()) || !StringUtils.isEmpty(model.getCreateDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(model.getCreateDatetimeStart(), model.getCreateDatetimeEnd(), QmsConstWords.CREATE_DATE_TIME, packBean, true);
+        }
+        return packBean;
+    }
+
+    public static DdlPackBean getBusiConfig(SxQmsBusiConfig busiConfig) {
+        String[] split = busiConfig.getBusiCode().split(",");
+        DdlPackBean packBean = getAllBaseDataByNormalPro(busiConfig, busiConfig.getOrganizeCode());
+        if (split.length>QmsConstWords.ONE){
+            DdlPreparedPack.getInPackList(Arrays.asList(split), QmsConstWords.BUSI_CODE, packBean);
+        }else {
+            DdlPreparedPack.getStringLikerPack(busiConfig.getBusiCode(), QmsConstWords.BUSI_CODE, packBean);
+        }
+        DdlPreparedPack.getStringLikerPack(busiConfig.getBusiName(), QmsConstWords.BUSI_NAME, packBean);
+        return packBean;
+    }
+
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/sqlpack/bu/QmsBuHqlPack.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/sqlpack/bu/QmsBuHqlPack.java
new file mode 100644
index 0000000..8b5c99d
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/sqlpack/bu/QmsBuHqlPack.java
@@ -0,0 +1,326 @@
+package cn.estsh.i3plus.pojo.qms.sqlpack.bu;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
+import cn.estsh.i3plus.pojo.qms.bean.*;
+import cn.estsh.i3plus.pojo.qms.model.SxEvaluationManageModel;
+import cn.estsh.i3plus.pojo.qms.model.bu.SxBuMonitorManageModel;
+import cn.estsh.i3plus.pojo.qms.util.QmsConstWords;
+import cn.estsh.i3plus.pojo.qms.util.QmsEnumUtil;
+import org.springframework.util.StringUtils;
+
+/**
+ * @Description:
+ * @Reference: Qms-bu条件封装
+ * @Author: jiaqi.Hou
+ * @Modify:
+ **/
+public class QmsBuHqlPack {
+
+    public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, QmsConstWords.ORGANIZE_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), QmsConstWords.IS_VALID, packBean);
+        DdlPreparedPack.getNumEqualPack(QmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), QmsConstWords.IS_DELETED, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getAllBaseData(String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, QmsConstWords.ORGANIZE_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(QmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), QmsConstWords.IS_DELETED, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getAllValidData(String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, QmsConstWords.ORGANIZE_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), QmsConstWords.IS_VALID, packBean);
+        DdlPreparedPack.getNumEqualPack(QmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), QmsConstWords.IS_DELETED, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getModuleFileImportLot(SxQmsModuleFileImportLot moduleFileImportLot) {
+        DdlPackBean packBean = getAllValidData(moduleFileImportLot.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(moduleFileImportLot.getLotNo(), QmsConstWords.LOT_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(moduleFileImportLot.getModule(), QmsConstWords.MODULE, packBean);
+        if (!StringUtils.isEmpty(moduleFileImportLot.getCreateDateTimeStart()) || !StringUtils.isEmpty(moduleFileImportLot.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    moduleFileImportLot.getCreateDateTimeStart(), moduleFileImportLot.getCreateDateTimeEnd(),
+                    QmsConstWords.CREATE_DATE_TIME, packBean, true);
+        }
+        return packBean;
+    }
+
+    public static DdlPackBean getProjectType(SxQmsProjectType projectType) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(projectType, projectType.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(projectType.getProjectCode(), QmsConstWords.PROJECT_CODE, packBean);
+        DdlPreparedPack.getStringLikerPack(projectType.getProjectName(), QmsConstWords.PROJECT_NAME, packBean);
+        DdlPreparedPack.getNumEqualPack(projectType.getModule(), QmsConstWords.MODULE, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getOqcRuleNote(SxQmsOqcRuleNote oqcRuleNote) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(oqcRuleNote, oqcRuleNote.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(oqcRuleNote.getPartNo(), QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(oqcRuleNote.getPartNameRdd(), QmsConstWords.PART_NAME_RDD, packBean);
+        DdlPreparedPack.getStringLikerPack(oqcRuleNote.getCategoryCode(), QmsConstWords.CATEGORY_CODE, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getOqcRuleNoteDetail(SxQmsOqcRuleNoteDetail oqcRuleNoteDetail) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(oqcRuleNoteDetail, oqcRuleNoteDetail.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(oqcRuleNoteDetail.getPartNo(), QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getNumEqualPack(oqcRuleNoteDetail.getCheckType(), QmsConstWords.CHECK_TYPE, packBean);
+        DdlPreparedPack.getStringEqualPack(oqcRuleNoteDetail.getProjectCode(), QmsConstWords.PROJECT_CODE, packBean);
+        DdlPreparedPack.getStringLikerPack(oqcRuleNoteDetail.getCheckContent(), QmsConstWords.CHECK_CONTENT, packBean);
+        DdlPreparedPack.getStringLikerPack(oqcRuleNoteDetail.getCheckItem(), QmsConstWords.CHECK_ITEM, packBean);
+        DdlPreparedPack.getStringLikerPack(oqcRuleNoteDetail.getStandard(), QmsConstWords.STANDARD, packBean);
+        DdlPreparedPack.getStringLikerPack(oqcRuleNoteDetail.getCheckTool(), QmsConstWords.CHECK_TOOL, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean packHqlQmsEnum(SxQmsEnum sxQmsEnum) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(sxQmsEnum.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getStringEqualPack(sxQmsEnum.getEnumType(), "enumType", result);
+        DdlPreparedPack.getStringEqualPack(sxQmsEnum.getEnumValue(), "enumValue", result);
+        getStringBuilderPack(sxQmsEnum, result);
+        return result;
+    }
+
+    public static DdlPackBean packHqlBasCustomer(SxQmsBasCustomer basCustomer) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result);
+        DdlPreparedPack.getStringLikerPack(basCustomer.getCustName(), "custName", result);
+        DdlPreparedPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result);
+        getStringBuilderPack(basCustomer, result);
+        return result;
+    }
+
+    public static DdlPackBean packHqlBasVendor(SxQmsBasVendor basVendor) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", result);
+        DdlPreparedPack.getStringLikerPack(basVendor.getVendorName(), "vendorName", result);
+        getStringBuilderPack(basVendor, result);
+        return result;
+
+    }
+
+    public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) {
+        if (!StringUtils.isEmpty(bean.getOrganizeCode())) {
+            DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
+        }
+
+        DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr);
+        if (!StringUtils.isEmpty(bean.getCreateDateTimeStart()) && org.apache.commons.lang3.StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true);
+        }
+
+        if (StringUtil.isEmpty(bean.getIsValid())) {
+            DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", hqlStr);
+        } else {
+            DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
+        }
+
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
+        return hqlStr;
+    }
+
+    public static DdlPackBean getConfig(SxQmsConfig cfgCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(cfgCode, cfgCode.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(cfgCode.getCfgCode(), QmsConstWords.CFG_CODE, packBean);
+        DdlPreparedPack.getStringLikerPack(cfgCode.getCfgName(), QmsConstWords.CFG_NAME, packBean);
+        DdlPreparedPack.getStringEqualPack(cfgCode.getCfgKey(), QmsConstWords.CFG_KEY, packBean);
+        DdlPreparedPack.getStringEqualPack(cfgCode.getCfgType(), QmsConstWords.CFG_TYPE, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getSxQmsImprovementExperience(SxQmsImprovementExperience sxQmsImprovementExperience) {
+        DdlPackBean packBean = getAllValidData(sxQmsImprovementExperience.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(sxQmsImprovementExperience.getWorkCenterCode(),QmsConstWords.WORK_CENTER_CODE, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsImprovementExperience.getProblemDesc(), QmsConstWords.PROBLEM_DESC, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsImprovementExperience.getSolution(), QmsConstWords.SOLUTION, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsImprovementExperience.getMachineCode(), QmsConstWords.MACHINE_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(sxQmsImprovementExperience.getImproveType(), QmsConstWords.IMPROVE_TYPE, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getOqcCheckPackageDetail(SxQmsOqcCheckPackageDetail oqcCheckPackageDetail) {
+        DdlPackBean packBean = getAllValidData(oqcCheckPackageDetail.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(oqcCheckPackageDetail.getOqcNo(), QmsConstWords.OQC_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(oqcCheckPackageDetail.getSerialNumber(), QmsConstWords.SERIAL_NUMBER, packBean);
+        DdlPreparedPack.getStringLikerPack(oqcCheckPackageDetail.getPackageNo(), QmsConstWords.PACKAGENO, packBean);
+        DdlPreparedPack.getStringEqualPack(oqcCheckPackageDetail.getPartNo(), QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(oqcCheckPackageDetail.getWorkOrderNo(), QmsConstWords.WORK_ORDER_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(oqcCheckPackageDetail.getWorkCenterCode(), QmsConstWords.WORK_CENTER_CODE, packBean);
+        DdlPreparedPack.getStringEqualPack(oqcCheckPackageDetail.getWorkTime(), QmsConstWords.WORK_TIME, packBean);
+        DdlPreparedPack.getStringEqualPack(oqcCheckPackageDetail.getShiftCode(), QmsConstWords.SHIFT_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(oqcCheckPackageDetail.getCheckResult(), QmsConstWords.CHECK_RESULT, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getPartExt(SxQmsPartExt partExt) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(partExt, partExt.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(partExt.getPartNo(), QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(partExt.getPartNameRdd(), QmsConstWords.PART_NAME_RDD, packBean);
+        DdlPreparedPack.getStringEqualPack(partExt.getWorkCenterCode(), QmsConstWords.WORK_CENTER_CODE, packBean);
+        DdlPreparedPack.getStringEqualPack(partExt.getMachineCode(), QmsConstWords.MACHINE_CODE, packBean);
+        DdlPreparedPack.getStringEqualPack(partExt.getVendorNo(), QmsConstWords.VENDOR_NO, packBean);
+        DdlPreparedPack.getNumEqualPack(partExt.getPartType(), QmsConstWords.PART_TYPE, packBean);
+        DdlPreparedPack.getNumEqualPack(partExt.getProductType(), QmsConstWords.PRODUCT_TYPE, packBean);
+        DdlPreparedPack.getNumEqualPack(partExt.getIsOqc(), QmsConstWords.IS_OQC, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getMonitorManage(SxBuMonitorManageModel monitorManage) {
+        DdlPackBean packBean = getAllValidData(monitorManage.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(monitorManage.getModule(), QmsConstWords.MODULE, packBean);
+        DdlPreparedPack.getStringLikerPack(monitorManage.getManageNo(), QmsConstWords.MANAGE_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(monitorManage.getPartNo(), QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(monitorManage.getVendorNo(), QmsConstWords.VENDOR_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(monitorManage.getMachineCode(), QmsConstWords.MACHINE_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(monitorManage.getProductType(), QmsConstWords.PRODUCT_TYPE, packBean);
+        DdlPreparedPack.getNumEqualPack(monitorManage.getClassify(), QmsConstWords.CLASSIFY, packBean);
+        DdlPreparedPack.getNumEqualPack(monitorManage.getLevel(), QmsConstWords.LEVEL, packBean);
+
+        if (!StringUtils.isEmpty(monitorManage.getCheckedDatetimeStart()) || !StringUtils.isEmpty(monitorManage.getCheckedDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    monitorManage.getCheckedDatetimeStart(), monitorManage.getCheckedDatetimeEnd(),
+                    QmsConstWords.CHECKED_DATE_TIME, packBean, false);
+        }
+        return packBean;
+    }
+
+    public static DdlPackBean getMonitorManageRecord(SxBuMonitorManageModel monitorManage) {
+        DdlPackBean packBean = getAllValidData(monitorManage.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(monitorManage.getManageNo(), QmsConstWords.MANAGE_NO, packBean);
+        DdlPreparedPack.getNumEqualPack(monitorManage.getActionType(), QmsConstWords.ACTION_TYPE, packBean);
+        if (!StringUtils.isEmpty(monitorManage.getCheckedDatetimeStart()) || !StringUtils.isEmpty(monitorManage.getCheckedDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    monitorManage.getCheckedFreDatetimeStart(), monitorManage.getCheckedFreDatetimeEnd(),
+                    QmsConstWords.CHECKED_DATE_TIME, packBean, false);
+        }
+        //上一次计划检测日期
+        if (!StringUtils.isEmpty(monitorManage.getLastCheckDatetimeStart()) || !StringUtils.isEmpty(monitorManage.getLastCheckDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    monitorManage.getCheckedDatetimeStart(), monitorManage.getCheckedDatetimeEnd(),
+                    QmsConstWords.LAST_CHECK_DATE_TIME, packBean, false);
+        }
+        //上一次检测确认日期
+        if (!StringUtils.isEmpty(monitorManage.getLastCheckedDatetimeStart()) || !StringUtils.isEmpty(monitorManage.getLastCheckedDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    monitorManage.getCheckedDatetimeStart(), monitorManage.getCheckedDatetimeEnd(),
+                    QmsConstWords.LAST_CHECKED_DATE_TIME, packBean, false);
+        }
+        return packBean;
+    }
+
+
+    public static DdlPackBean getEvaluationManage(SxEvaluationManageModel evaluationManage) {
+        DdlPackBean packBean = getAllValidData(evaluationManage.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(evaluationManage.getApplyNo(), QmsConstWords.APPLY_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(evaluationManage.getDepartmentCode(), QmsConstWords.DEPARTMENT_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(evaluationManage.getProductType(), QmsConstWords.PRODUCT_TYPE, packBean);
+        DdlPreparedPack.getNumEqualPack(evaluationManage.getCauseType(), QmsConstWords.CAUSE_TYPE, packBean);
+        DdlPreparedPack.getStringEqualPack(evaluationManage.getVendorNo(), QmsConstWords.VENDOR_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(evaluationManage.getPartNo(), QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(evaluationManage.getRelateNo(), QmsConstWords.RELATE_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(evaluationManage.getApplyUser(), QmsConstWords.APPLY_USER, packBean);
+        DdlPreparedPack.getStringEqualPack(evaluationManage.getEvaluationUser(), QmsConstWords.EVALUATION_USER, packBean);
+        DdlPreparedPack.getStringLikerPack(evaluationManage.getEvaluationContent(), QmsConstWords.EVALUATION_CONTENT, packBean);
+        if (!StringUtils.isEmpty(evaluationManage.getApplyDatetimeStart()) || !StringUtils.isEmpty(evaluationManage.getApplyDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    evaluationManage.getApplyDatetimeStart(), evaluationManage.getApplyDatetimeEnd(),
+                    QmsConstWords.APPLY_DATE_TIME, packBean, false);
+        }
+        if (!StringUtils.isEmpty(evaluationManage.getEvaluationDatetimeStart()) || !StringUtils.isEmpty(evaluationManage.getEvaluationDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    evaluationManage.getEvaluationDatetimeStart(), evaluationManage.getEvaluationDatetimeEnd(),
+                    QmsConstWords.EVALUATION_DATE_TIME, packBean, false);
+        }
+        if (!StringUtils.isEmpty(evaluationManage.getCheckDatetimeStart()) || !StringUtils.isEmpty(evaluationManage.getCheckDatetimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    evaluationManage.getCheckDatetimeStart(), evaluationManage.getCheckDatetimeEnd(),
+                    QmsConstWords.CHECK_DATE_TIME, packBean, false);
+        }
+        return packBean;
+    }
+
+    public static DdlPackBean getSxQmsRecheckInstruction(SxQmsRecheckInstruction sxQmsRecheckInstruction) {
+        DdlPackBean packBean = getAllValidData(sxQmsRecheckInstruction.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(sxQmsRecheckInstruction.getPartNo(),QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsRecheckInstruction.getPartNameRdd(), QmsConstWords.PART_NAME_RDD, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsRecheckInstruction.getMachineCode(), QmsConstWords.MACHINE_CODE, packBean);
+        DdlPreparedPack.getNumEqualPack(sxQmsRecheckInstruction.getInstructionStatus(), QmsConstWords.INSTRUCTION_STATUS, packBean);
+        if (!StringUtils.isEmpty(sxQmsRecheckInstruction.getCreateDateTimeStart()) || !StringUtils.isEmpty(sxQmsRecheckInstruction.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    sxQmsRecheckInstruction.getCreateDateTimeStart(), sxQmsRecheckInstruction.getCreateDateTimeEnd(),
+                    QmsConstWords.CREATE_DATE_TIME, packBean, false);
+        }
+        return packBean;
+    }
+
+    public static DdlPackBean getLimitColorCfg(SxQmsLimitColorCfg limitColorCfg) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(limitColorCfg, limitColorCfg.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(limitColorCfg.getModule(), QmsConstWords.MODULE, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getBadness(SxQmsBadness sxQmsBadness) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(sxQmsBadness, sxQmsBadness.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(sxQmsBadness.getBadnessModule(), QmsConstWords.BADNESS_MODULE, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsBadness.getBadnessCode(), QmsConstWords.BADNESS_CODE, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsBadness.getBadnessName(), QmsConstWords.BADNESS_NAME, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getDefectRateTarget(SxQmsDefectRateTarget sxQmsDefectRateTarget) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(sxQmsDefectRateTarget, sxQmsDefectRateTarget.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(sxQmsDefectRateTarget.getDataType(), QmsConstWords.DATA_TYPE, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsDefectRateTarget.getDataValue(), QmsConstWords.DATA_VALUE, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsDefectRateTarget.getTargetTime(), QmsConstWords.TARGET_TIME, packBean);
+        DdlPreparedPack.getStringEqualPack(sxQmsDefectRateTarget.getTargetType(),QmsConstWords.TARGET_TYPE, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getMachine(SxQmsMachine sxQmsMachine) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(sxQmsMachine, sxQmsMachine.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(sxQmsMachine.getMachineCode(), QmsConstWords.MACHINE_CODE, packBean);
+        DdlPreparedPack.getStringLikerPack(sxQmsMachine.getMachineName(), QmsConstWords.MACHINE_NAME, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getOqcProject(SxQmsOqcRuleNoteDetail oqcProject) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(oqcProject, oqcProject.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(oqcProject.getCheckItem(), QmsConstWords.CHECK_ITEM, packBean);
+        DdlPreparedPack.getStringLikerPack(oqcProject.getStandard(), QmsConstWords.STANDARD, packBean);
+        DdlPreparedPack.getStringEqualPack(oqcProject.getPartNo(), QmsConstWords.PART_NO, packBean);
+        DdlPreparedPack.getNumEqualPack(oqcProject.getOqcNoType(), QmsConstWords.OQC_NO_TYPE, packBean);
+        DdlPreparedPack.getNumEqualPack(oqcProject.getCheckType(), QmsConstWords.CHECK_TYPE, packBean);
+        DdlPreparedPack.getStringEqualPack(oqcProject.getCategoryCode3(), QmsConstWords.CATEGORY_CODE3, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getSxBadnessClassify(SxQmsBuBadnessClassify badnessClassify) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(badnessClassify, badnessClassify.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(badnessClassify.getBadnessTypeName(), QmsConstWords.BADNESS_TYPE_NAME, packBean);
+        DdlPreparedPack.getStringLikerPack(badnessClassify.getBadnessTypeCode(), QmsConstWords.BADNESS_TYPE_CODE, packBean);
+        DdlPreparedPack.getStringLikerPack(badnessClassify.getBadnessClassifyName(), QmsConstWords.BADNESS_CLASSIFY_NAME, packBean);
+        DdlPreparedPack.getStringLikerPack(badnessClassify.getBadnessClassifyCode(), QmsConstWords.BADNESS_CLASSIFY_CODE, packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getSxBadnessClassifyDetail(SxQmsBuBadnessClassifyDetail badnessClassifyDetail) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(badnessClassifyDetail, badnessClassifyDetail.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(badnessClassifyDetail.getBadnessClassifyName(), QmsConstWords.BADNESS_CLASSIFY_NAME, packBean);
+        DdlPreparedPack.getStringLikerPack(badnessClassifyDetail.getBadnessClassifyDetailName(), QmsConstWords.BADNESS_CLASSIFY_DETAIL_NAME, packBean);
+        DdlPreparedPack.getStringLikerPack(badnessClassifyDetail.getBadnessClassifyCode(), QmsConstWords.BADNESS_CLASSIFY_CODE, packBean);
+        DdlPreparedPack.getStringLikerPack(badnessClassifyDetail.getBadnessClassifyDetailCode(), QmsConstWords.BADNESS_CLASSIFY_DETAIL_CODE, packBean);
+        return packBean;
+    }
+}
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/util/QmsConstWords.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/util/QmsConstWords.java
new file mode 100644
index 0000000..964b570
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/util/QmsConstWords.java
@@ -0,0 +1,1193 @@
+package cn.estsh.i3plus.pojo.qms.util;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2018-10-23 20:41
+ * @Modify:
+ **/
+public class QmsConstWords {
+    //api路径头
+    public static final String BASE_URL_QMS = "/qms";
+    //api-白名单径头
+    public static final String BASE_URL_QMS_WHITE = "/qms/white";
+
+    //网关
+    public static final String GATEWAY_HOST = "GATEWAY_HOST";
+    //PCN地址(EP)
+    public static final String EP_GATEWAY_HOST_PCN = "EP_GATEWAY_HOST_PCN";
+    //PCN地址(BU)
+    public static final String BU_GATEWAY_HOST_PCN = "BU_GATEWAY_HOST_PCN";
+    //JOB
+    public static final String JOB = "JOB";
+    //QMS_REDIS
+    public static final String REDIS_QMS = "redisQms";
+    // id常量
+    public static final String ID = "id";
+    // id常量
+    public static final String ID_STR = "idStr";
+    // PID常量
+    public static final String PID = "pid";
+    // ids
+    public static final String IDS = "ids";
+    //数据值
+    public static final String VALUE = "VALUE";
+    // 工厂的常量
+    public static final String ORGANIZE_CODE = "organizeCode";
+    // listPager
+    public static final String LIST_PAGER = "listPager";
+    // resultObject
+    public static final String RESULT_OBJECT = "resultObject";
+    //产品条码
+    public static final String SERIAL_NUMBER = "serialNumber";
+    // 产线常量
+    public static final String WORK_CENTER_CODE = "workCenterCode";
+    // 产线名称
+    public static final String WORK_CENTER_NAME = "workCenterName";
+    // 工位常量
+    public static final String WORK_CELL_CODE = "workCellCode";
+    // 是否禁用
+    public static final String IS_VALID = "isValid";
+    // 是否禁用
+    public static final String IS_VALID1 = "isValid1";
+    // 是否删除
+    public static final String IS_DELETED = "isDeleted";
+    //今天
+    public static final String TO_DAY = "toDay";
+    // 创建时间
+    public static final String CREATE_DATE_TIME = "createDatetime";
+    // 修改时间
+    public static final String MODIFY_DATE_TIME = "modifyDatetime";
+    // 创建人
+    public static final String CREATE_USER = "createUser";
+    // 修改人
+    public static final String MODIFY_USER = "modifyUser";
+    //出厂报告文件URL
+    public static final String REPORT_FILE_URL = "reportFileUrl";
+    //出厂报告文件名称
+    public static final String REPORT_FILE_ORIGIN_NAME = "reportFileOriginName";
+    //零件号
+    public static final String PART_NO = "partNo";
+    //免检
+    public static final String IQC = "iqc";
+    //批次
+    public static final String DATE_CODE ="dateCode";
+    //质检日期
+    public static final String QC_DATE ="qcDate";
+    //零件名称
+    public static final String PART_NAME = "partName";
+    //上下预警区域
+    public static final String THE_WARNING_AREA = "theWarningArea";
+    //零件名称
+    public static final String PART_NAME_RDD = "partNameRdd";
+    //部品零件号
+    public static final String ITEM_PART_NO = "itemPartNo";
+    //部品零件名称
+    public static final String ITEM_PART_NAME = "itemPartName";
+    //下线时间
+    public static final String OUT_WORK_CENTER_TIME = "outWorkCenterTime";
+    //生产工单号
+    public static final String ORDER_NO = "orderNo";
+    //生产工单号
+    public static final String WORK_ORDER_NO = "workOrderNo";
+    //工单类型
+    public static final String WORK_ORDER_TYPE = "workOrderType";
+    //工单状态
+    public static final String WORK_ORDER_STATUS = "workOrderStatus";
+    //质量状态
+    public static final String QC_STATUS = "qcStatus";
+    //结果类型
+    public static final String QC_Mode = "qcMode";
+    //单据类型
+    public static final String ITEM_TYPE = "itemType";
+    //条码状态
+    public static final String SN_STATUS = "snStatus";
+    //条码类型
+    public static final String SN_TYPE = "snType";
+    // 序号
+    public static final String SEQ = "seq";
+    //作业时间
+    public static final String WORK_TIME = "workTime";
+    //数量
+    public static final String QTY = "qty";
+    //完成数量
+    public static final String COMPLETE_QTY = "completeQty";
+    //区域代码
+    public static final String AREA_CODE = "areaCode";
+    //区域代码
+    public static final String AREA_NAME = "areaName";
+    //班次代码
+    public static final String SHIFT_CODE = "shiftCode";
+    //班次名称
+    public static final String SHIFT_NAME = "shiftName";
+    //批次号
+    public static final String LOT_NO = "lotNo";
+    //模块
+    public static final String MODULE = "module";
+    //模块代码
+    public static final String MODULE_CODE = "moduleCode";
+    //模块名称
+    public static final String MODULE_NAME = "moduleName";
+    //文件地址
+    public static final String FILE_URL = "fileUrl";
+    //上传时间
+    public static final String UPLOAD_DATE_TIME = "uploadDateTime";
+    //文件原名
+    public static final String FILE_ORIGIN_NAME = "fileOriginName";
+    //同步状态
+    public static final String SYNC_STATUS = "syncStatus";
+    //包装编号
+    public static final String PACKAGENO = "packageNo";
+    //项目类型编码
+    public static final String PROJECT_CODE = "projectCode";
+    //项目类型名称
+    public static final String PROJECT_NAME = "projectName";
+    //机种分类
+    public static final String CATEGORY_CODE = "categoryCode";
+    //检查内容
+    public static final String CHECK_CONTENT = "checkContent";
+    //检查项目
+    public static final String CHECK_ITEM = "checkItem";
+    //检测类型
+    public static final String CHECK_TYPE = "checkType";
+    //是否必检
+    public static final String IS_NECESSARY = "isNecessary";
+    //判定基准
+    public static final String STANDARD = "standard";
+    //标准值
+    public static final String STANDARD_VALUE = "standardValue";
+    //上限值
+    public static final String UP_LIMIT = "upLimit";
+    //下限值
+    public static final String DOWN_LIMT = "downLimit";
+    //检查器具
+    public static final String CHECK_TOOL = "checkTool";
+    //作成日期
+    public static final String COMPLATE_DATE = "complateDate";
+    //配置代码
+    public static final String CFG_CODE = "cfgCode";
+    //配置名称
+    public static final String CFG_NAME = "cfgName";
+    //配置KEY
+    public static final String CFG_KEY = "cfgKey";
+    //配置值
+    public static final String CFG_VALUE = "cfgValue";
+    //配置值描述
+    public static final String CFG_VALUE_DESC = "cfgValueDesc";
+    //配置类型
+    public static final String CFG_TYPE = "cfgType";
+    //类型
+    public static final String TYPE = "type";
+    //操作人
+    public static final String USER_INFO = "userInfo";
+    //实现类名称
+    public static final String CLASS_NAME = "className";
+    //出货检验单号
+    public static final String OQC_NO = "oqcNo";
+    //出货检验类型
+    public static final String OQC_TYPE = "oqcType";
+    //出货检验类型
+    public static final String OQC_NO_TYPE = "oqcNoType";
+    //绿色
+    public static final String GREEN = "Green";
+    //红色
+    public static final String RED = "Red";
+    //黄色
+    public static final String YELLOW = "Yellow";
+    //白色
+    public static final String WHITE = "White";
+    //出货检验单号(EP)
+    public static final String EP_QMS_OQC_NO = "EP_QMS_OQC_NO";
+    //出货检验单号(BU)
+    public static final String BU_QMS_OQC_NO = "BU_QMS_OQC_NO";
+    //检测值
+    public static final String CHECK_VALUE = "checkValue";
+    //结果
+    public static final String CHECK_RESULT = "checkResult";
+    //MODEL
+    public static final String MODEL = "MODEL";
+    //PAGER
+    public static final String PAGER = "PAGER";
+    //供应商编码
+    public static final String VENDOR_NO = "vendorNo";
+    //供应商名称
+    public static final String VENDOR_NAME = "vendorName";
+    //供应商全称
+    public static final String VENDOR_DESC = "vendorDesc";
+    //部品分类
+    public static final String PART_TYPE = "partType";
+    //产品分类
+    public static final String PRODUCT_TYPE = "productType";
+    //产品分类
+    public static final String PRODUCT_TYPE_STR = "productTypeStr";
+    //BU产品分类
+    public static final String BU_PRODUCT_TYPE = "buProductType";
+    //是否出货检
+    public static final String IS_OQC = "isOqc";
+    //分类1
+    public static final String CATEGORY_CODE1 = "categoryCode1";
+    //分类2
+    public static final String CATEGORY_CODE2 = "categoryCode2";
+    //部品分类
+    public static final String PART_PRODUCT_TYPE = "partProductType";
+    //编号
+    public static final String MANAGE_NO = "manageNo";
+    //分类
+    public static final String CLASSIFY = "classify";
+    //等级
+    public static final String LEVEL = "level";
+    //检测日期
+    public static final String CHECK_DATE_TIME = "checkDatetime";
+    //检测确认日期
+    public static final String CHECKED_DATE_TIME = "checkedDatetime";
+    //检测确认计划日期
+    public static final String CHECKED_FRE_DATE_TIME = "checkedFreDatetime";
+    //检测频度
+    public static final String CHECK_FREQUENCY = "checkFrequency";
+    //类别
+    public static final String CATEGORY = "category";
+    //检查区分
+    public static final String CHECK_DIFF = "checkDiff";
+    //枚举类型
+    public static final String ENUM_TYPE = "enumType";
+    //枚举值
+    public static final String ENUM_VALUE = "enumValue";
+    //枚举值描述
+    public static final String ENUM_VALUE_DESC = "enumValueDesc";
+    //ROHS检测单号
+    public static final String EP_QMS_ROHS_MANAGE_NO = "EP_QMS_ROHS_MANAGE_NO";
+    //BU_ROHS检测单号
+    public static final String BU_QMS_ROHS_MANAGE_NO = "BU_QMS_ROHS_MANAGE_NO";
+    //管理试验监控单号
+    public static final String EP_QMS_MANAGEMENT_TEST_MANAGE_NO = "EP_QMS_MANAGEMENT_TEST_MANAGE_NO";
+    //BU管理试验监控单号
+    public static final String BU_QMS_MANAGEMENT_TEST_MANAGE_NO = "BU_QMS_MANAGEMENT_TEST_MANAGE_NO";
+    //申请编号
+    public static final String APPLY_NO = "applyNo";
+    //部门代码
+    public static final String DEPARTMENT_CODE = "departmentCode";
+    //管理NO
+    public static final String DEPARTMENT_NO = "departmentNo";
+    //生产日期
+    public static final String PRODUCE_DATE = "produceDate";
+    //安装时间
+    public static final String INSTALLATION_TIME = "installationTime";
+    //故障发生时间
+    public static final String TIME_OF_FAILURE = "timeOfFailure";
+    //制造日期
+    public static final String MANUFACTURING_DATE = "manufacturingDate";
+    //购机时间
+    public static final String THE_COST_OF_TIME = "theCostOfTime";
+    //发生时间
+    public static final String HAPPEN_TIME = "happenTime";
+
+    //原因分类
+    public static final String CAUSE_TYPE = "causeType";
+    //BU原因分类
+    public static final String BU_CAUSE_TYPE = "buCauseType";
+    //关联编号
+    public static final String RELATE_NO = "relateNo";
+    //申请人
+    public static final String APPLY_USER = "applyUser";
+    //评价人
+    public static final String EVALUATION_USER = "evaluationUser";
+    //评价结果
+    public static final String EVALUATION_CONTENT = "evaluationContent";
+    //申请日期
+    public static final String APPLY_DATE_TIME = "applyDatetime";
+    //评价时间
+    public static final String EVALUATION_DATE_TIME = "evaluationDatetime";
+    //评价管理申请编码
+    public static final String EP_QMS_EVALUATION_APPLY_NO = "EP_QMS_EVALUATION_APPLY_NO";
+    //BU评价管理申请编码
+    public static final String BU_QMS_EVALUATION_APPLY_NO = "BU_QMS_EVALUATION_APPLY_NO";
+    //备注
+    public static final String REMARK = "remark";
+    //颜色代码
+    public static final String COLOR_CODE = "colorCode";
+    //查询维度
+    public static final String DIMENSION = "dimension";
+    //查询维度
+    public static final String DIMENSION_1 = "dimension1";
+    //报表"目标"行标志
+    public static final String REPORT_ROW_TARGET = "REPORT_ROW_TARGET";
+    //报表"工程不良"行标志
+    public static final String REPORT_ROW_MAKE = "REPORT_ROW_MAKE";
+    //报表"部品不良"行标志
+    public static final String REPORT_ROW_COMPONENT = "REPORT_ROW_COMPONENT";
+    //报表"技术不良"行标志
+    public static final String REPORT_ROW_TECHNOLOGY = "REPORT_ROW_TECHNOLOGY";
+    //报表"其他不良"行标志
+    public static final String REPORT_ROW_OTHER = "REPORT_ROW_OTHER";
+    //报表"不良批次"行标志
+    public static final String REPORT_ROW_BAD_LOT = "REPORT_ROW_BAD_LOT";
+    //报表"总检批次"行标志
+    public static final String REPORT_ROW_CHECK_LOT = "REPORT_ROW_CHECK_LOT";
+    //报表"检验台数"行标志
+    public static final String REPORT_ROW_CHECK_QTY = "REPORT_ROW_CHECK_QTY";
+    //报表"当年度不良件数"行标志
+    public static final String REPORT_ROW_CUR_YEAR_BAD_QTY = "REPORT_ROW_CUR_YEAR_BAD_QTY";
+    //报表"前年度不良实绩"行标志
+    public static final String REPORT_ROW_LAST_YEAR_BAD_QTY = "REPORT_ROW_LAST_YEAR_BAD_QTY";
+    //报表"达成情况"行标志
+    public static final String REPORT_ROW_RESULT = "REPORT_ROW_RESULT";
+    //报表"总不良率"行标志
+    public static final String REPORT_ROW_TOTAL_BAD_RATE = "REPORT_ROW_TOTAL_BAD_RATE";
+    //报表"工程不良率"行标志
+    public static final String REPORT_ROW_MAKE_RATE = "REPORT_ROW_MAKE_RATE";
+    //报表"部品不良"行标志
+    public static final String REPORT_ROW_COMPONENT_RATE = "REPORT_ROW_COMPONENT_RATE";
+    //报表"技术不良"行标志
+    public static final String REPORT_ROW_TECHNOLOGY_RATE = "REPORT_ROW_TECHNOLOGY_RATE";
+    //报表"其他不良"行标志
+    public static final String REPORT_ROW_OTHER_RATE = "REPORT_ROW_OTHER_RATE";
+    //报表"前年总不良率"行标志
+    public static final String REPORT_ROW_LAST_YEAR_TOTAL_BAD_RATE = "REPORT_ROW_LAST_YEAR_TOTAL_BAD_RATE";
+    //报表"前年比"行标志
+    public static final String REPORT_ROW_LAST_YEAR_RATE = "REPORT_ROW_LAST_YEAR_RATE";
+    //报表"首列"列标志
+    public static final String REPORT_CELL_FIRST_CELL = "firstCell";
+    //报表"项目"列标志
+    public static final String REPORT_CELL_PROJECT_NAME = "projectName";
+    //报表"合计"列标志
+    public static final String REPORT_CELL_AMOUNT = "amount";
+    //报表"月"列标志
+    public static final String REPORT_CELL_MONTH = "month";
+    //报表"日期"列标志
+    public static final String REPORT_CELL_DATE = "date";
+    //检验单号
+    public static final String CHECK_NO = "checkNo";
+    //补件状态
+    public static final String FRE_STATUS = "freStatus";
+    //确认状态
+    public static final String CONFIRM_STATUS = "confirmStatus";
+    //下线时间
+    public static final String OUT_WC_TIME = "outWcTime";
+    //补件时间
+    public static final String FRE_TIME = "freTime";
+    //确认时间
+    public static final String CONFIRM_TIME = "confirmTime";
+
+    //出货检验不良统计目标
+    public static final String OQC_REPORT_BAD_STATISTICS_TARGET = "OQC_REPORT_BAD_STATISTICS_TARGET";
+    //工程品质不良汇总目标
+    public static final String ENGINEERING_QUALITY_BAD_STATISTICS_TARGET = "ENGINEERING_QUALITY_BAD_STATISTICS_TARGET";
+    //当前年度不良数量
+    public static final String CUR_YEAR_BAD_QTY = "curYearBadQty";
+    //前一年度不良数量
+    public static final String LAST_YEAR_BAD_QTY = "lastYearBadQty";
+    //原因区分
+    public static final String DEFECT_TYPE = "defectType";
+    //原因区分
+    public static final String DEFECT_TYPE_NAME = "defectTypeName";
+    //缺陷代码
+    public static final String DEFECT_CODE = "defectCode";
+    //缺陷名称
+    public static final String DEFECT_NAME = "defectName";
+    //发生岗位
+    public static final String HAPPEN_STATION = "happenStation";
+    //维修措施代码
+    public static final String REPAIR_CODE = "repairCode";
+    //维修措施名称
+    public static final String REPAIR_NAME = "repairName";
+
+    //时间[开始/结束]条件
+    public static final String WORK_TIME_START = "workTimeStart";
+    public static final String WORK_TIME_END = "workTimeEnd";
+    public static final String CHECK_TIME_START = "checkTimeStart";
+    public static final String CHECK_TIME_END = "checkTimeEnd";
+    public static final String CUR_CHECK_TIME_START = "curCheckTimeStart";
+    public static final String CUR_CHECK_TIME_END = "curCheckTimeEnd";
+    public static final String LAST_CHECK_TIME_START = "lastCheckTimeStart";
+    public static final String LAST_CHECK_TIME_END = "lastCheckTimeEnd";
+    public static final String CREATE_DATE_TIME_START = "createDatetimeStart";
+    public static final String CREATE_DATE_TIME_END = "createDatetimeEnd";
+    public static final String CREATE_DATE_TIME_START_T = "createDatetTmeStart";
+    public static final String CREATE_DATE_TIME_END_T = "createDateTimeEnd";
+    public static final String MODIFY_DATE_TIME_START = "modifyDatetimeStart";
+    public static final String MODIFY_DATE_TIME_END = "modifyDatetimeEnd";
+    public static final String OUT_WORK_CENTER_TIME_START = "outWorkCenterTimeStart";
+    public static final String OUT_WORK_CENTER_TIME_END = "outWorkCenterTimeEnd";
+    public static final String DEFECT_ACTION_TIME_START = "defectActionTimeStart";
+    public static final String DEFECT_ACTION_TIME_END = "defectActionTimeEnd";
+    public static final String HAPPEN_TIME_START = "happenTimeStart";
+    public static final String HAPPEN_TIME_END = "happenTimeEnd";
+    public static final String OUT_WC_TIME_START = "outWcTimeStart";
+    public static final String OUT_WC_TIME_END = "outWcTimeEnd";
+
+    //空
+    public static final String EMPTY = "";
+    //.
+    public static final String DECIMAL_POINT_STR = ".";
+    //.
+    public static final String DECIMAL_POINT = "\\.";
+    //~
+    public static final String TO = "~";
+    //:
+    public static final String COLON = ":";
+    //英文逗号
+    public static final String COMMA = ",";
+    //%
+    public static final String PERCENT = "%";
+    //&
+    public static final String AND = "&";
+    //空格
+    public static final String ONE_SPACE = " ";
+    //-
+    public static final String HYPHEN = "-";
+    //[
+    public static final String SQUARE_BRACKETS_L = "[";
+    //]
+    public static final String SQUARE_BRACKETS_R = "]";
+    //拼接秒
+    public static final String APPEND_SECONDS = ":00";
+    //拼接0点
+    public static final String APPEND_ZERO_HH_MM_SS = " 00:00:00";
+    //拼接0点
+    public static final String APPEND_ONE_DAY_ZERO_HH_MM_SS = "-01 00:00:00";
+    //拼接0点
+    public static final String APPEND_ONE_DAY = "-01";
+    //拼接4日
+    public static final String APPEND_FOUR_DAY = "-04";
+    //拼接24点
+    public static final String APPEND_24_HH_MM_SS = " 23:59:59";
+    //时间类型
+    public static final String DATETIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+    //时间类型
+    public static final String DATETIME_TRUNCATE_MINUTE_FORMAT = "yyyy-MM-dd HH";
+    //时间类型
+    public static final String TIME_TRUNCATE_SECOND_FORMAT = "HH:mm";
+    //日期类型
+    public static final String TIME_FORMAT_M = "MM";
+    //时间类型
+    public static final String TIME_FORMAT = "HH:mm:ss";
+    //日期类型
+    public static final String DATE_FORMAT = "yyyy-MM-dd";
+    //日期类型
+    public static final String DATE_SERIAL_FORMAT = "yyyyMMdd";
+    //日期类型
+    public static final String DATE_FORMAT_Y_M = "yyyy-MM";
+    //日期类型
+    public static final String DATE_FORMAT_Y_M_WITH_POINT = "yyyy.MM";
+    //日期类型
+    public static final String DATE_FORMAT_Y = "yyyy";
+    //日期类型
+    public static final String DATETIME_FORMAT_CHINA_Y_M = "yyyy年MM月";
+
+    //jpg
+    public static final String JPG =".jpg";
+    //jpeg
+    public static final String JPEG =".jpeg";
+    //png
+    public static final String PNG =".png";
+    //UPPng
+    public static final String UP_PNG =".PNG";
+    //pdf
+    public static final String PDF =".pdf";
+
+    //客诉编号
+    public static final String COMPLAINT_NO = "complaintNo";
+    //客诉类型
+    public static final String COMPLAINT_TYPE = "complaintType";
+    //客诉异常场所
+    public static final String ABNORMAL_SOURCE = "abnormalSource";
+    //客户编码
+    public static final String CUSTOMER_NO = "customerNo";
+    //发行日期
+    public static final String PUBLISH_DATE = "publishDate";
+    //发行日期开始日期
+    public static final String PUBLISH_DATE_START = "publishDateStart";
+    //发行日期结束日期
+    public static final String PUBLISH_DATE_END = "publishDateEnd";
+    //预定回达日
+    public static final String PLAN_ARRIVE_DATE = "planArriveDate";
+    //预定回达日开始日期
+    public static final String PLAN_ARRIVE_DATE_START = "planArriveDateStart";
+    //预定回达日结束日期
+    public static final String PLAN_ARRIVE_DATE_END = "planArriveDateEnd";
+    //缺陷等级
+    public static final String DEFECT_LEVEL = "defectLevel";
+    //发生情况
+    public static final String SITUATION = "situation";
+    //客诉单状态
+    public static final String COMPLAINT_STATUS = "complaintStatus";
+    //异常发行日期
+    public static final String ABNORMAL_RELEASE_DATE = "abnormalReleaseDate";
+    //预定回复日期
+    public static final String EXPECTED_REPLY_DATE = "expectedReplyDate";
+    //对应日期
+    public static final String CORRESPONDING_TO_THE_DATE = "correspondingToTheDate";
+    //实际回答日期
+    public static final String ACTUAL_REPLY_DATE ="actualReplyDate";
+    //客诉单关联条码
+    public static final String SN = "sn";
+    //客诉编号
+    public static final String COMPLAINT_NO_CAPITAL = "COMPLAINT_NO";
+    //加严检单号
+    public static final String STRICTER = "STRICTER";
+    //责任区分
+    public static final String DUTY_DIFF = "dutyDiff";
+    //原因项目
+    public static final String REASON_PROJECT = "reasonProject";
+    //生产日期 开始日期
+    public static final String PRODUCE_DATE_START = "produceDateStart";
+    //生产日期 结束日期
+    public static final String PRODUCE_DATE_END = "produceDateEnd";
+    //实际回答日期 开始日期
+    public static final String ACTUALREPLY_DATE_START = "produceDateStart";
+    //实际回答日期 结束日期
+    public static final String ACTUALREPLY_DATE_END = "produceDateEnd";
+    //生产批量数
+    public static final String WORK_TIMES_QTY = "workTimesQty";
+    //检验批量数
+    public static final String LAST_CHECKED_QTY = "lastCheckedQty";
+    //检验台数
+    public static final String CHECK_AMOUNT_QTY = "checkAmountQty";
+    //抽样率
+    public static final String SAMPLE_RATE = "sampleRate";
+    //不良率
+    public static final String UN_QC_RATE = "unQcRate";
+    //缺点数
+    public static final String UN_QC_QTY = "unQcQty";
+    //明细集合
+    public static final String DETAIL_LIST = "detailList";
+
+    //EP出货检验查询数据接口
+    public static final String EP_OQC_MANAGE_DATA_URL = "EP_OQC_MANAGE_DATA_URL";
+
+    //获取PCN工单分页数据接口
+    public static final String WORK_ORDER_PAGER_DATA_URL = "WORK_ORDER_PAGER_DATA_URL";
+
+    //获取PCN工单分页数据接口
+    public static final String BU_WORK_ORDER_PAGER_DATA_URL = "BU_WORK_ORDER_PAGER_DATA_URL";
+
+    //获取PCN班次信息数据接口
+    public static final String SHIFT_BY_CENTER_DATA_URL = "SHIFT_BY_CENTER_DATA_URL";
+
+    //获取PCN物料分类信息数据接口
+    public static final String CATEGORY_DATA_URL = "CATEGORY_DATA_URL";
+
+    //EP获取PCN班次信息数据接口
+    public static final String EP_SHIFT_LIST_URL = "EP_SHIFT_LIST_URL";
+
+    //EP获取PCN缺陷信息数据接口
+    public static final String EP_DEFECT_LIST_URL = "EP_DEFECT_LIST_URL";
+
+    //EP获取PCN发生岗位分页数据接口
+    public static final String EP_HAPPEN_STATION_PAGER_DATA_URL = "EP_HAPPEN_STATION_PAGER_DATA_URL";
+
+    //EP获取PCN发生维修措施数据接口
+    public static final String EP_REPAIR_EXPEDIENT_PAGER_DATA_URL = "EP_REPAIR_EXPEDIENT_PAGER_DATA_URL";
+
+    //EP获取PCN工位分页数据接口
+    public static final String EP_WORK_CELL_PAGER_DATA_URL = "EP_WORK_CELL_PAGER_DATA_URL";
+
+    //EP获取PCN工位不良明细信息数据接口
+    public static final String EP_BAD_CELL_DETAIL_LIST_URL = "EP_BAD_CELL_DETAIL_LIST_URL";
+
+    //EP获取PCN维修作业单信息数据接口
+    public static final String EP_REPAIR_TASK_LIST_URL = "EP_REPAIR_TASK_LIST_URL";
+
+    //EP获取PCN产量信息数据接口
+    public static final String EP_OUT_PUT_STATISTICS_LIST_URL = "EP_OUT_PUT_STATISTICS_LIST_URL";
+
+    //EP_OQC_MANAGE_DATA
+    public static final String EP_OQC_MANAGE_DATA = "EP_OQC_MANAGE_DATA";
+
+    //BU_OQC_MANAGE_DATA
+    public static final String BU_OQC_MANAGE_DATA = "BU_OQC_MANAGE_DATA";
+
+    //BU出货检验查询数据接口
+    public static final String BU_OQC_MANAGE_DATA_URL = "BU_OQC_MANAGE_DATA_URL";
+
+    //BU获取PCN缺件信息接口
+    public static final String BU_MISS_PART_URL = "BU_MISS_PART_URL";
+
+    //获取PCN产量统计数据接口
+    public static final String BU_OUT_PUT_STATISTIC_DATA_URL = "BU_OUT_PUT_STATISTIC_DATA_URL";
+
+    //BU获取PCN产量班次完工数量数据接口
+    public static final String BU_OUT_PUT_STATISTICS_QTY_URL = "BU_OUT_PUT_STATISTICS_QTY_URL";
+
+    //机种编码类型
+    public static final String MACHINE_CODE_DICTIONARY = "MACHINE_CODE_DICTIONARY";
+
+    //产品分类
+    public static final String PRODUCT_TYPE_DICTIONARY = "PRODUCT_TYPE_DICTIONARY";
+
+    //部门信息字典代码
+    public static final String DEPARTMENT_CODE_DICTIONARY = "DEPARTMENT_CODE_DICTIONARY";
+
+    //检查区分字典代码
+    public static final String CHECK_DIFF_DICTIONARY = "CHECK_DIFF_DICTIONARY";
+
+    //类别字典代码
+    public static final String CATEGORY_DICTIONARY = "CATEGORY_DICTIONARY";
+
+    //WMS2QMS质检单信息
+    public static final String WMS_TO_QMS_RC_QC_QUEUE = "WMS_TO_QMS_RC_QC_QUEUE";
+
+    //同批次质检key
+    public static final String QMS_EP_QC_REDIS_KEY = "QMS:EP_QC:ORGANIZE_CODE:VENDOR_NO:PART_NO:DATE_CODE:RC_DATE";
+
+    //同批次质检状态key
+    public static final String QMS_EP_ORDER_STATUS_REDIS_KEY = "QMS:EP_ORDER_STATUS:ORGANIZE_CODE:VENDOR_NO:PART_NO:DATE_CODE:RC_DATE";
+
+
+    //同批次质检key
+    public static final String QMS_EP_QC_COUNT_REDIS_KEY = "QMS:EP_QC:COUNT:ORGANIZE_CODE:VENDOR_NO:PART_NO:DATE_CODE:RC_DATE";
+
+
+    //工程巡检任务单号
+    public static final String PROJECT_INSPECTION_TASK_ORDER_NO = "SX_QMS_PROJECT_INSPECTION_TASK_ORDER_NO";
+
+    //改善类别
+    public static final String IMPROVE_TYPE = "improveType";
+
+    //机种编码
+    public static final String MACHINE_CODE = "machineCode";
+
+    //机种名称
+    public static final String MACHINE_NAME = "machineName";
+
+    //问题描述
+    public static final String PROBLEM_DESC = "problemDesc";
+
+    //解决方案
+    public static final String SOLUTION = "solution";
+
+    //再检指示书状态
+    public static final String INSTRUCTION_STATUS = "instructionStatus";
+
+    //再检指示书单号
+    public static final String EP_RECHECK_INSTRUCTION_NO = "EP_RECHECK_INSTRUCTION_NO";
+
+    //客诉部门枚举标识
+    public static final String CUSTOMER_COMPLAINT_DEPT = "CUSTOMER_COMPLAINT_DEPT";
+
+    //0
+    public static final int ZERO = 0;
+
+    public static final int ONE = 1;
+
+    public static final int MAX_NUMBER = Integer.MIN_VALUE;
+
+    //"◎"
+    public static final String CONCLUDE_SITUATION_FLAG = "◎";
+
+    //"0"
+    public static final String ZERO_STR = "0";
+
+    //"0.0%"
+    public static final String ZERO_STR_PERCENT = "0.0%";
+
+    //"O"
+    public static final String O_FLAG = "O";
+
+    //◎
+    public static final String OO_FLAG = "◎";
+
+    //"X"
+    public static final String X_FLAG = "X";
+
+    //式样书状态
+    public static final String NOTE_STATUS = "noteStatus";
+
+    //状态
+    public static final String STATUS = "STATUS";
+
+    //目标物料
+    public static final String TARGET_PART_NO = "targetPartNo";
+
+    //目标物料
+    public static final String TARGET_VERDOR_NO = "targetVerdorNo";
+
+    //目标物料名称
+    public static final String TARGET_PART_NAME_RDD = "targetPartNameRdd";
+
+    //不良编码
+    public static final String BADNESS_CODE = "badnessCode";
+
+    //不良名称
+    public static final String BADNESS_NAME = "badnessName";
+
+    //不良模块
+    public static final String BADNESS_MODULE = "badnessModule";
+
+    //异常联络单单号规则
+    public static final String ABNORMAL_ORDER_NO = "ABNORMAL_ORDER_NO";
+
+    //异常联络单单号规则
+    public static final String BU_ABNORMAL_ORDER_NO = "BU_ABNORMAL_ORDER_NO";
+
+    //关联单号
+    public static final String REF_ORDER_NO = "refOrderNo";
+
+    //回复日期
+    public static final String REPLY_END_DATE="replyEndDate";
+
+    //安全判定要求
+    public static final String SAFETY_JUDGE_TYPE = "safetyJudgeType";
+
+    //发行
+    public static final String RECEIVE_CONFIRM ="receiveConfirm";
+
+    //资材确认
+    public static final String MATERIL_CONFIRM  ="materialConfirm";
+
+    //调达确认
+    public static final String REGULATE_CONFIRM ="regulateConfirm";
+
+    //物管确认
+    public static final String MANAGEMENT_CONFIRM = "managementConfirm";
+
+    //单据状态
+    public static final String ORDER_STATUS = "orderStatus";
+
+    public static final String ORDER_RESULT = "orderResult";
+
+    //业务类型
+    public static final String BUSI_TYPE = "busiType";
+
+    public static final String SAFETY_MGR_TYPE = "safetyMgrType";
+
+    //不良项目
+    public static final String ABNORMAL_TYPE ="abnormalType";
+
+    //发生日期
+    public static final String OCCURE_DATE = "occureDate";
+
+    //检查日期
+    public static final String CHECK_DATE = "checkDate";
+
+    //本批次处理意见
+    public static final String CURRENT_BATCH_OPTION = "currentBatchOption";
+
+    public static final String FREQUENCY = "frequency";
+
+    //目标时间
+    public static final String TARGET_TIME = "targetTime";
+
+    //目标类型代码
+    public static final String TARGET_TYPE = "targetType";
+
+    //目标值
+    public static final String TARGET_VALUE = "targetValue";
+
+    //数据类型
+    public static final String DATA_TYPE = "dataType";
+
+    //数据值
+    public static final String DATA_VALUE = "dataValue";
+
+    //目标类别字典代码
+    public static final String TARGET_TYPE_DICTIONARY = "TARGET_TYPE_DICTIONARY";
+
+    //课长-岗位
+    public static final String SUPERVISOR_POSITION_CODE = "SUPERVISOR_POSITION_CODE";
+
+    //品质部长-岗位
+    public static final String QUALITY_DIRECTOR_POSITION_CODE = "QUALITY_DIRECTOR_POSITION_CODE";
+
+    //资材
+    public static final String MATERIL_DEPARTMENT_CODE = "MATERIL_DEPARTMENT_CODE";
+
+    //物管部门
+    public static final String WG_DEPARTMENT_CODE = "WG_DEPARTMENT_CODE";
+
+    //调达部门
+    public static final String TD_DEPARTMENT_CODE = "TD_DEPARTMENT_CODE";
+
+    //受入部门
+    public static final String SR_DEPARTMENT_CODE = "SR_DEPARTMENT_CODE";
+
+    //供应商部门
+    public static final String GYS_DEPARTMENT_CODE = "GYS_DEPARTMENT_CODE";
+
+    //制造部门
+    public static final String ZZ_DEPARTMENT_CODE = "ZZ_DEPARTMENT_CODE";
+
+    //技术部门
+    public static final String JS_DEPARTMENT_CODE = "JS_DEPARTMENT_CODE";
+
+    //EP品质担当
+    public static final String EP_QC_DD_POSITION_CODE = "EP_QC_DD_POSITION_CODE";
+
+    //品质部门
+    public static final String PZ_DEPARTMENT_CODE = "PZ_DEPARTMENT_CODE";
+
+
+
+
+    //检印确认-岗位编码
+    public static final String CHECK_CONFIRM_POSITION_CODE = "CHECK_CONFIRM_POSITION_CODE";
+
+
+    //承认确认-岗位编码
+    public static final String RECOGNIZE_CONFIRM_POSITION_CODE = "RECOGNIZE_CONFIRM_POSITION_CODE";
+
+
+
+
+    //生产停止指令书单号
+    public static final String SX_QMS_PRODUCT_STOP_ORDER_NO = "SX_QMS_PRODUCT_STOP_ORDER_NO";
+
+    //BU生产停止指令书单号
+    public static final String BU_SX_QMS_PRODUCT_STOP_ORDER_NO = "BU_SX_QMS_PRODUCT_STOP_ORDER_NO";
+
+    //出货停止指令书单号
+    public static final String SX_QMS_SHIP_STOP_ORDER_NO = "SX_QMS_SHIP_STOP_ORDER_NO";
+
+    //BU出货停止指令书单号
+    public static final String BU_SX_QMS_SHIP_STOP_ORDER_NO = "BU_SX_QMS_SHIP_STOP_ORDER_NO";
+
+    //客诉不良总目标
+    public static final String KS_TOTAL_BAD_TARGET = "KS_TOTAL_BAD_TARGET";
+    //客诉不良总不良率
+    public static final String TOTAL_BAD_RATE = "TOTAL_BAD_RATE";
+    //客诉制造不良目标
+    public static final String KS_PROJECT_BAD_TARGET = "KS_PROJECT_BAD_TARGET";
+    //客诉制造不良率
+    public static final String PROJECT_BAD_RATE = "PROJECT_BAD_RATE";
+    //客诉部品不良目标
+    public static final String KS_COMPONENT_BAD_TARGET = "KS_COMPONENT_BAD_TARGET";
+    //客诉部品不良率
+    public static final String COMPONENT_BAD_RATE = "COMPONENT_BAD_RATE";
+    //客诉技术不良目标
+    public static final String KS_TECHNOLOGY_BAD_TARGET = "KS_TECHNOLOGY_BAD_TARGET";
+    //客诉技术不良率
+    public static final String TECHNOLOGY_BAD_RATE = "TECHNOLOGY_BAD_RATE";
+    //客诉其他不良总目标
+    public static final String KS_OTHER_BAD_TARGET = "KS_OTHER_BAD_TARGET";
+    //客诉其他不良率
+    public static final String OTHER_BAD_RATE = "OTHER_BAD_RATE";
+    //前年比
+    public static final String YEAR_BEFORE_THAN = "YEAR_BEFORE_THAN";
+    //达成情况
+    public static final String CONCLUDE_SITUATION = "CONCLUDE_SITUATION";
+
+    //去年总不良率
+    public static final String YEAR_BEFORE_TOTAL_BAD_RATE = "YEAR_BEFORE_TOTAL_BAD_RATE";
+
+    //前年月总不良率累计
+    public static final String YEAR_MONTH_BEFORE_TOTAL_BAD_RATE = "YEAR_MONTH_BEFORE_TOTAL_BAD_RATE";
+
+    //产量
+    public static final String OUTPUT = "OUTPUT";
+
+    //工程不良汇总
+    public static final String PROJECT_BAD_COLLECT = "PROJECT_BAD_COLLECT";
+    //部品不良汇总
+    public static final String COMPONENT_BAD_COLLECT = "COMPONENT_BAD_COLLECT";
+    //技术不良汇总
+    public static final String TECHNOLOGY_BAD_COLLECT = "TECHNOLOGY_BAD_COLLECT";
+    //其他不良汇总
+    public static final String OTHER_BAD_COLLECT = "OTHER_BAD_COLLECT";
+
+    //品质指标到货不良目标
+    public static final String QUALITY_AOG_DEFECT = "QUALITY_AOG_DEFECT";
+    //品质指标部品批次不良目标
+    public static final String QUALITY_PRODUCT_BATCHES_DEFECT = "QUALITY_PRODUCT_BATCHES_DEFECT";
+    //品质指标工程不良目标
+    public static final String QUALITY_PROJECT_DEFECT = "QUALITY_PROJECT_DEFECT";
+    //品质指标出货检查指摘率目标
+    public static final String QUALITY_OQC_DEFECT = "QUALITY_OQC_DEFECT";
+
+    public static final String ABARBEITUNG_CONFIRM = "abarbeitungConfirm";
+
+    //年
+    public static final String YEAR = "year";
+    //报表"总分月"列标志
+    public static final String REPORT_CELL_TOTAL_MONTH = "totalMonth";
+    //报表"等级月"列标志
+    public static final String REPORT_CELL_LEVEL_MONTH = "levelMonth";
+    //报表"合计得分"列标志
+    public static final String REPORT_CELL_TOTAL_SCORE = "totalScore";
+    //报表"合计件数"列标志
+    public static final String REPORT_CELL_TOTAL_PIECE = "totalPiece";
+    //报表"评价等级"列标志
+    public static final String REPORT_CELL_EVALUATE_LEVEL = "evaluateLevel";
+
+    //会议号
+    public static final String EP_QMS_MEETING_NO = "EP_QMS_MEETING_NO";
+    public static final String MEETING_NO = "meetingNo";
+    //记录内容
+    public static final String RECORD_CONTENTS =  "recordContents";
+    //处置对策
+    public static final String DISPOSE_METHOD =  "disposeMethod";
+    //缺陷数量
+    public static final String DEFECT_QTY =  "defectQty";
+
+    //月
+    public static final String MONTH = "month";
+    //发生日期
+    public static final String HAPPEN_DATE = "happenDate";
+    //CD等级总目标
+    public static final String CD_TOTAL_BAD_TARGET = "CD_TOTAL_BAD_TARGET";
+    //报表"月度交易日"行标志
+    public static final String REPORT_CELL_CD_MONTH_DEAL = "REPORT_CELL_CD_MONTH_DEAL";
+    //报表"当月厂家数"行标志
+    public static final String REPORT_ROW_CUR_MONTH_VENDOR_NUM = "REPORT_ROW_CUR_MONTH_VENDOR_NUM";
+    //报表"月度累计"行标志
+    public static final String REPORT_ROW_CUR_MONTH_TOTAL = "REPORT_ROW_MONTH_TOTAL";
+    //报表"占比"行标志
+    public static final String REPORT_ROW_MONTH_PROPORTION = "REPORT_ROW_MONTH_PROPORTION";
+    //报表"前年当月厂家数"行标志
+    public static final String REPORT_ROW_LAST_YEAR_MONTH_VENDOR_NUM = "REPORT_ROW_LAST_YEAR_MONTH_VENDOR_NUM";
+    //报表"前年月度累计"行标志
+    public static final String REPORT_ROW_CUR_YEAR_MONTH_TOTAL = "REPORT_ROW_CUR_YEAR_MONTH_TOTAL";
+
+    public static final String CHECK_TIME = "checkTime";
+    public static final String A = "A";
+    public static final String B = "B";
+    public static final String C = "C";
+    public static final String D = "D";
+    //总分
+    public static final String TOTAL_SCORE = "totalScore";
+    //产品阶段
+    public static final String PRODUCT_STAGE =  "productStage";
+
+    //发往BD
+    public static final String SHIPPING_BD ="shippingBd";
+    //对策前/后
+    public static final String COUNTERMEASURE_ACTION = "countermeasureAction";
+
+    public static final Integer FIFTEEN = 15;
+
+    //邻苯是否检测
+    public static final String DODP_CHECK = "phthalatesCheck";
+
+    //邻苯等级
+    public static final String DODP_LEVEL = "phthalatesLevel";
+
+    //邻苯检测频度
+    public static final String DODP_CHECK_FREQUENCY = "phthalatesCheckFrequency";
+
+    //邻苯实际检测日期
+    public static final String DODP_ACTUAL_CHECK_DATE = "phthalatesActualCheckDate";
+
+    //产品代码
+    public static final String PRODUCT_CODE = "productCode";
+
+    //产品名称
+    public static final String PRODUCT_NAME = "productName";
+
+    //是否加严检
+    public static final String IS_STRICTER = "isStricter";
+
+    //是否确认检
+    public static final String IS_CONFIRM = "isConfirm";
+
+    public static final String NOTE_CHECK_RESULT = "noteCheckResult";
+
+    //再检结果
+    public static final String RE_CHECK_RESULTS = "reCheckResults";
+
+    //处置内容
+    public static final String DEAL_CONTEN = "dealConten";
+
+    //解除日期
+    public static final String RELIEVE_DATE ="relieveDate";
+
+    //BU-异常联络单确认校验
+    public static final String BU_ABNORMAL_CONFIRM_VALIDATE = "BU_ABNORMAL_CONFIRM_VALIDATE";
+
+    //BU
+    public static final String BU = "/bu";
+
+    /*BU 出货检验 START*/
+    //类别3
+    public static final String CATEGORY_CODE3 = "categoryCode3";
+    //销售向
+    public static final String SALES_TO = "salesTo";
+    //销售向
+    public static final String SALES_TO_NAME = "salesToName";
+    //检验项目
+    public static final String OQC_PROJECT = "oqcProject";
+    // 值类型
+    public static final String VALUE_TYPE = "valueType";
+    //状态
+    public static final String STATUS_LOWER_CASE = "status";
+    //不良类型编码
+    public static final String BADNESS_TYPE_CODE = "badnessTypeCode";
+    //不良类型名称
+    public static final String BADNESS_TYPE_NAME = "badnessTypeName";
+    //颜色
+    public static final String COLOR = "color";
+    //不良分类代码
+    public static final String BADNESS_CLASSIFY_CODE = "badnessClassifyCode";
+    //不良分类名称
+    public static final String BADNESS_CLASSIFY_NAME = "badnessClassifyName";
+    //不良分类明细编码
+    public static final String BADNESS_CLASSIFY_DETAIL_CODE = "badnessClassifyDetailCode";
+    //不良分类明细名称
+    public static final String BADNESS_CLASSIFY_DETAIL_NAME = "badnessClassifyDetailName";
+
+    //商品码
+    public static final String GOODS_CODE = "goodsCode";
+    //商品码2
+    public static final String GOODS_CODE2 = "goodsCode2";
+    //BU出货检验锁
+    public static final String BU_OQC_MANAGE_LOCK = "BU_OQC_MANAGE:LOCK";
+    //EP出货检验锁
+    public static final String EP_OQC_MANAGE_LOCK = "EP_OQC_MANAGE:LOCK";
+    // 总检验单号 TOQC条码
+    public static final String BU_OQC_TOTAL_CHECK_NO = "BU_OQC_TOTAL_CHECK_NO";
+    /*BU 出货检验 END*/
+
+    // 文件 所属数据ID
+    public static final String MODULE_ID = "moduleId";
+
+    public static final String CAUSE_CLASSIFY_CODE = "causeClassifyCode";
+    public static final String CAUSE_CLASSIFY_NAME = "causeClassifyName";
+
+    //上一次检测确认日期
+    public static final String LAST_CHECKED_DATE_TIME = "lastCheckedDatetime";
+    //上一次检测确认计划日期
+    public static final String LAST_CHECK_DATE_TIME = "lastCheckDatetime";
+
+    //CK 工厂
+    public static final String CK = "CK";
+
+    //负1
+    public static final int MINUS_ONE =  -1;
+
+    //事业别顺序
+    public static final String SERIAL = "serial";
+
+    //事业别编码
+    public static final String CAREER_CODE = "careerCode";
+
+    //事业别名称
+    public static final String CAREER_NAME = "careerName";
+
+    //事业别
+    public static final String CAREER = "career";
+
+
+    //月
+    public static final int MONTHS = 30;
+
+    public static final String ACTION_TYPE = "actionType";
+
+    //10
+    public static final int TEN = 10;
+    //4
+    public static final int FOUR = 4;
+    //ok
+    public static final String OK = "OK";
+    //ng
+    public static final String NG = "NG";
+    //时间维度
+    public static final String REGION = "region";
+    //日
+    public static final String DAY = "day";
+
+    public static final String ORDER_BY_MDT_DESC = " order by modifyDatetime desc ";
+
+    public static final String FILE_MODULE_TYPE =  "fileModuleType";
+
+    public static final String REF_SRC = "refSrc";
+
+    //异常
+    public static final String ABNORMAL = "abnormal";
+
+    //四时会议
+    public static final String FOUR_HOUR_MEET = "fourHourMeet";
+
+    public static final int MINUS_FIFTEEN  = -15;
+
+    public static final int MINUS_THREE  = -3;
+
+    //是否维护品质属性
+    public static final String PART_EXT_MAINTAINED = "partExtMaintained";
+
+    public static final String LEFT_CODE = "leftCode";
+
+    public static final String CHANGE_TIME = "changeTime";
+
+    public static final String CHANGE_THE_CONTACT_NUMBER = "changeTheContactNumber";
+
+    public static final String RC_DATE_TIME = "rcDateTime";
+
+    public static final String CREATE_QTY = "createQty";
+
+    //页面区分
+    public static final String PAGE_TYPE = "pageType";
+
+    //系统同步参数
+    public static final String SYSTEM_SYNC_STATUS = "SYSTEM_SYNC_STATUS";
+
+    //最终检验结果
+    public static final String LAST_CHECK_RESULT = "lastCheckResult";
+
+    //同批次质检key BU
+    public static final String QMS_BU_QC_REDIS_KEY = "QMS:BU_QC:ORGANIZE_CODE:VENDOR_NO:PART_NO:DATE_CODE:RC_DATE";
+
+    //出模数
+    public static final String OUT_QTY = "outQty";
+
+    //抽检数
+    public static final String CHECK_QTY = "checkQty";
+
+    //检验序列号
+    public static final String CHECK_SERIAL = "checkSerial";
+    //是否停止生产
+    public static final String IS_STOP_PRODUCE = "IS_STOP_PRODUCE";
+
+    //其他
+    public static final String OTHER = "QT";
+
+    //配置代码
+    public static final String BUSI_CODE = "busiCode";
+
+    //配置名称
+    public static final String BUSI_NAME = "busiName";
+
+    //配置值
+    public static final String BUSI_VALUE = "busiValue";
+
+    //时间单位
+    public static final String HOURLY_BASIS = "hourlyBasis";
+
+    //BU客诉编号
+    public static final String BU_COMPLAINT_NO_CAPITAL = "BU_COMPLAINT_NO";
+
+    //是否做过异常处理
+    public static final String IS_ABORMAL_HANDLE = "isAbnormalHandle";
+
+    //BU_部品受入检验锁
+    public static final String BU_QC_MANAGE_LOCK = "BU_QC_MANAGE:LOCK:ORGANIZE_CODE:ORDER_NO";
+    //BU_ODM/OEM_出货检验锁
+    public static final String BU_ODM_OEM_QC_MANAGE_LOCK = "BU_ODM_OEM_QC_MANAGE:LOCK:ORGANIZE_CODE:ORDER_NO";
+    //BU检验项目暂存KEY
+    public static final String BU_QC_TEMPORARY_KEY = "BU_QC_TEMPORARY_KEY:ORGANIZE_CODE:ORDER_NO";
+
+    public static final String IS_QC = "isQc";
+    public static final String RC_DATE = "rcDate";
+    public static final String QC_STATUS_RESULT = "qcStatusResult";
+
+    public static final String ACT_QTY = "actQty";
+
+    public static final String[] BASE_BEAN_FIELD = new String[]{"id","organizeCode","isValid","isDeleted","createUser","createDatetime","modifyUser","modifyDatetime"};
+
+    public static final String OQC_CHECK_RESULT_EXPORT_TEMPLATE = "OQC_CHECK_RESULT_EXPORT_TEMPLATE";
+
+    public static final String[] OQC_EXPORT_TABLE_BODY_FIELD = new String[]{"{.projectName}","{.checkContent}","{.checkItem}","{.standard}","{.checkTypeName}","{.upLimit}","{.downLimit}","{.checkTool}","{.checkValue}","{.checkResultCn}"};
+
+    public static final Integer[] OQC_EXPORT_TABLE_BODY_FIELD_INDEX = new Integer[]{0,1,2,3,7,8,9,10,11,12};
+
+    //出货检验导出模板最后行
+    public static final Integer OQC_EXPORT_TEMPLATE_LAST_ROW = 8;
+
+    //项目分类代码
+    public static final String PROJECT_SORT_NO = "projectSortNo";
+
+    //中间检查单号缓存key
+    public static final String CHECK_TASK_EXPIRE_SECOND = "QMS:CHECK_TASK_EXPIRE_SECOND";
+
+    //中间检查任务主表导出模板代码
+    public static final String QMS_MIDDLE_CHECK_MASTER_EXPORT_TEMPLATE = "QMS_MIDDLE_CHECK_MASTER_EXPORT_TEMPLATE";
+}
+
diff --git a/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/util/QmsEnumUtil.java b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/util/QmsEnumUtil.java
new file mode 100644
index 0000000..4cea394
--- /dev/null
+++ b/modules/i3plus-pojo-qms/src/main/java/cn/estsh/i3plus/pojo/qms/util/QmsEnumUtil.java
@@ -0,0 +1,6170 @@
+package cn.estsh.i3plus.pojo.qms.util;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.StringUtils;
+
+import java.util.Objects;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2018-10-23 15:53
+ * @Modify:
+ **/
+
+public class QmsEnumUtil {
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QMS_EXT_EXCEL {
+        SX_QMS_PROJECT_TYPE_RC(10, "sxProjectTypeRcExcelService", "受检项目类型"),
+        SX_QMS_PROJECT_TYPE_OQC(20, "sxProjectTypeOqcExcelService", "出货检验项目类型"),
+        SX_QMS_OQC_RULE_NOTE_DETAIL(30, "sxOqcRuleNoteExcelService", "出货检验式样式明细"),
+        SX_QMS_PART(40, "sxQmsPartExtExcelService", "品质属性"),
+        SX_QMS_RC_INSPECTION_FREE(50, "sxQmsRcInspectionFreeExcelService", "免检清单"),
+        SX_QMS_RC_RULE_NOTE(60, "sxQmsRcRuleNoteExcelService", "收货物料品质规格书"),
+        SX_QMS_IMPROVEMENT_EXPERIENCE(70, "sxQmsImprovementExperienceExcelService", "改善经验库"),
+        SX_QMS_MANAGEMENT_TEST_MONITORING(80, "sxQmsManagementTestMonitoringExcelService", "管理试验监控"),
+        SX_QMS_RECHECK_INSTRUCTION(90, "sxQmsRecheckInstructionExcelService", "再检指示书"),
+        SX_QMS_LIMIT_COLOR_CFG(110, "sxLimitColorCfgExcelService", "上下限颜色配置"),
+        SX_QMS_MONITOR_MANAGE_ROHS(120, "sxMonitorManageRohsExcelService", "RoHS监控管理"),
+        SX_QMS_EVALUATION_MANAGE(130, "sxEvaluationManageExcelService", "评价管理"),
+        SX_QMS_MONITOR_MANAGE_MANAGEMENT_TEST(140, "sxMonitorManageManagementTestExcelService", "管理试验监控管理"),
+        SX_QMS_BADNESS(150, "sxBadnessExcelService", "不良点维护"),
+        SX_QMS_DEFECT_RATE_TARGET(160, "sxDefectRateTargetExcelService", "不良率目标"),
+        SX_QMS_MACHINE(170, "sxQmsMachineExcelService", "机种信息"),
+        SX_QMS_ENUM(180, "sxQmsEnumExcelService", "字典信息"),
+        SX_QMS_PROJECT_INSPECTION_MASTER(190, "sxQmsProjectInspectionMasterExcelService", "工程巡查任务维护"),
+        SX_QMS_PROJECT_INSPECTION_DETAILS(200, "sxQmsProjectInspectionDetailsExcelService", "工程巡查任务维护明细"),
+        SX_QMS_KNOWHOW(210, "sxQmsKnowhowExcelService", "KNOWHOW集"),
+        SX_QMS_PART_WORK_CENTER(220, "sxQmsPartWorkCenterExcelService", "物料产线"),
+        SX_QMS_BU_OQC_PROJECT(230, "sxBuOqcProjectExcelService", "BU出货检验项目"),
+        SX_QMS_BU_BADNESS_TYPE(240, "sxBuBadnessTypeExcelService", "BU不良类型"),
+        SX_QMS_BU_BADNESS_CLASSIFY(250, "sxBuBadnessClassifyExcelService", "BU不良分类"),
+        SX_QMS_BU_BADNESS_CLASSIFY_DETAIL(260, "sxBuBadnessClassifyDetailExcelService", "不良分类明细"),
+        SX_QMS_BU_PART_EXCEL_SERVICE(270, "sxQmsBuPartExcelService", "BU物料信息"),
+        SX_QMS_PRODUCT_CLASSIFICATION_EXCEL_SERVICE(280, "sxQmsBuProductClassificationExcelService", "BU产品分类"),
+        SX_QMS_RC_RULE_NOTE_EXCEL_SERVICE(290, "sxQmsBURcRuleNoteExcelService", "BU零部件检验规格书"),
+        SX_QMS_BU_INSPECTION_METHOD_CHANGE_MANAGEMENT_EXCEL_SERVICE(300, "sxQmsBUInspectionMethodChangeManagementExcelService", "BU检验方式变更管理"),
+        SX_QMS_PROJECT_SORT(310, "sxQmsProcedureProjectExcelService", "质量巡检项目"),
+        SX_QMS_CAUSE_CLASSIFY(320, "sxQmsCauseClassifyExcelService", "原因分类"),
+        SX_QMS_BU_CHANGE_RESUME_EXCEL_SERVICE(330, "sxQmsBUChangeResumeExcelService", "BU变更履历"),
+        SX_BU_QMS_EVALUATION_MANAGE(340, "sxBuEvaluationManageExcelService", "BU评价管理"),
+        SX_BU_QMS_IMPROVEMENT_EXPERIENCE(350, "sxBuQmsImprovementExperienceExcelService", "BU改善经验库"),
+        SX_QMS_BU_CUSTOMER_COMPLAINT_EXCEL_SERVICE(360, "sxQmsBuCustomerComplaintExcelService", "BU客诉导入"),
+        SX_QMS_BU_CAREER_EXCEL_SERVICE(370,"sxQmsBuCareerExcelService","BU事业别导入"),
+        SX_QMS_AFFECTED_MANAGEMENT_TEST_MONITORING_EXCEL_SERVICE(380,"sxQmsAffectedManagementTestMonitoringExcelService","受入管理试验监控导入"),
+        SX_QMS_SHIPMENT_MANAGEMENT_TEST_MONITORING_EXCEL_SERVICE(390,"sxQmsShipmentManagementTestMonitoringExcelService","出货管理试验监控导入"),
+        SX_QMS_ODM_MANAGEMENT_TEST_MONITORING_EXCEL_SERVICE(400,"sxQmsODMManagementTestMonitoringExcelService","ODM管理试验监控导入"),
+        SX_QMS_BU_MONITOR_MANAGE_ROHS(410,"sxBuMonitorManageRohsExcelService","BU-RoHS检测导入"),
+        SX_QMS_BU_PROJECT_TYPE_RC(420, "sxBuProjectTypeRcExcelService", "BU受检项目类型"),
+        SX_QMS_BU_IQC_LIST_EXCEL_SERVICE(430,"sxQmsBuIqcListExcelService","BU免检清单导入"),
+        SX_QMS_RULES_OF_DOCUMENT_GENERATION_EXCEL_SERVICE(440,"sxQmsRulesOfDocumentGenerationExcelService","ODM/OEM单据生成规则导入"),
+        SX_QMS_BU_OUTSOURCED_COMMODITY_SUPPLIERS_EXCEL_SERVICE(450,"sxQmsBuOutsourcedCommoditySuppliersExcelService","委外商品供应商报告导入"),
+        SX_QMS_BU_O_DM_RC_RULE_NOTE_EXCEL_SERVICE(460,"sxQmsBuODMRcRuleNoteExcelService","ODM零部件检验规格书导入"),
+        SX_QMS_BU_O_DM_RC_RULE_NOTE_DETAILS_EXCEL_SERVICE(470,"sxQmsBuODMRcRuleNoteDetailsExcelService","ODM零部件检验项目导入");
+
+
+
+
+
+
+        private int value;
+        private String service;
+        private String description;
+
+        QMS_EXT_EXCEL(int value, String service, String description) {
+            this.value = value;
+            this.service = service;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getService() {
+            return this.service;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static QmsEnumUtil.QMS_EXT_EXCEL getByValue(int value) {
+           QmsEnumUtil.QMS_EXT_EXCEL[] var1 = values();
+            int var2 = var1.length;
+
+            for (int var3 = 0; var3 < var2; ++var3) {
+                QmsEnumUtil.QMS_EXT_EXCEL excel = var1[var3];
+                if (excel.getValue() == value) {
+                    return excel;
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfService(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].service;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public enum BATCH_FILE_IMPORT_MODULE {
+        OQC_RULE_NOTE("OQC_RULE_NOTE", "出货检验式样书"),
+        SX_QMS_RC_RULE_NOTE("SX_QMS_RC_RULE_NOTE", "收货检验式样书"),
+        SX_QMS_ODM_RC_RULE_NOTE("SX_QMS_ODM_RC_RULE_NOTE", "ODM收货检验式样书");
+
+        private String description;
+        private String value;
+
+        private BATCH_FILE_IMPORT_MODULE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+    }
+
+    /**
+     * EP出货检验操作方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EP_QMS_OQC_MANAGE_SN_TYPE {
+        SERIAL_NUMBER("10", "epQmsOqcManageBySerialNumberService", "产品条码"),
+        PACKAGE_NO("20", "epQmsOqcManageByPackageNoService", "包装条码"),
+        MANUAL("30", "epQmsOqcManageByManualService", "手动检验");
+
+        private String value;
+        private String execClass;
+        private String description;
+
+        EP_QMS_OQC_MANAGE_SN_TYPE(String value, String execClass, String description) {
+            this.value = value;
+            this.execClass = execClass;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getExecClass() {
+            return execClass;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfExecClass(String value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].execClass;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(String value) {
+            String description = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(value)) {
+                    description = values()[i].description;
+                }
+            }
+            return description;
+        }
+    }
+
+    /**
+     * BU出货检验操作方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BU_QMS_OQC_MANAGE_ACTION_TYPE {
+        SERIAL_NUMBER("10", "buQmsOqcBySnManageService", "buQmsOqcBySnGenService", "buQmsOqcBySnManualService", "buQmsOqcBySnManualGenService", "成品检验"),
+        ZJ("20", "buQmsOqcByZjManageService", "buQmsOqcByZjGenService", "buQmsOqcByZjManualService", "buQmsOqcByZjManualGenService",  "组件检验");
+
+        private String value;
+        private String queryClass;
+        private String execClass;
+        private String queryClass2;
+        private String execClass2;
+        private String description;
+
+        BU_QMS_OQC_MANAGE_ACTION_TYPE(String value, String queryClass, String execClass, String queryClass2, String execClass2, String description) {
+            this.value = value;
+            this.queryClass = queryClass;
+            this.execClass = execClass;
+            this.queryClass2 = queryClass2;
+            this.execClass2 = execClass2;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getQueryClass() { return queryClass; }
+
+        public String getExecClass() {
+            return execClass;
+        }
+
+        public String getQueryClass2() { return queryClass2; }
+
+        public String getExecClass2() { return execClass2; }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfQueryClass(String value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].queryClass;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfExecClass(String value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].execClass;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfQueryClass2(String value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].queryClass2;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfExecClass2(String value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].execClass2;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(String value) {
+            String description = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(value)) {
+                    description = values()[i].description;
+                }
+            }
+            return description;
+        }
+    }
+
+    /**
+     * 出货检验:检测方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QMS_OQC_TYPE {
+        NORMAL(10, "正常检验"),
+        MANUAL(20, "手动检验");
+
+        private int value;
+        private String description;
+
+        QMS_OQC_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int value) {
+            String description = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == value) {
+                    description = values()[i].description;
+                }
+            }
+            return description;
+        }
+    }
+
+    /**
+     * 出货检验单据结果
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QMS_OQC_CHECK_RESULT {
+        QUALIFIED(10, "合格"),
+        UN_QUALIFIED(20, "不合格");
+
+        private int value;
+        private String description;
+
+        QMS_OQC_CHECK_RESULT(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int value) {
+            String description = "";
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == value) {
+                    description = values()[i].description;
+                }
+            }
+            return description;
+        }
+
+    }
+
+    /**
+     * 出货检验单据检验项结果
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QMS_OQC_CHECK_DETAIL_RESULT {
+        OK(10, "OK"),
+        NG(20, "NG");
+
+        private int value;
+        private String description;
+
+        QMS_OQC_CHECK_DETAIL_RESULT(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int value) {
+            String description = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == value) {
+                    description = values()[i].description;
+                }
+            }
+            return description;
+        }
+
+    }
+
+    /**
+     * 出货检验原因区分
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EP_QMS_OQC_CHECK_DUTY_DIFF {
+        ZZ("10", "制造"),
+        BP("20", "部品"),
+        JS("30", "技术"),
+        QT("40", "其他");
+        private String value;
+        private String description;
+
+        EP_QMS_OQC_CHECK_DUTY_DIFF(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String value) {
+            String description = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(value)) {
+                    description = values()[i].description;
+                }
+            }
+            return description;
+        }
+
+    }
+
+    /**
+     * 工程不良原因区分
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EP_ENGINEERING_DEFECT_TYPE {
+        BP("10", "部品"),
+        GC("20", "工程"),
+        JS("30", "技术"),
+        ZZ("40", "制造"),
+        QT("50", "其他");
+
+        private String value;
+        private String description;
+
+        EP_ENGINEERING_DEFECT_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String value) {
+            String description = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(value)) {
+                    description = values()[i].description;
+                }
+            }
+            return description;
+        }
+
+    }
+
+    /**
+     * 项目类型所属模块类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROJECT_TYPE_MODULE {
+        RC(10, "受入检验"),
+        OQC(20, "出货检验");
+
+        private int value;
+        private String description;
+
+        PROJECT_TYPE_MODULE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * 部品分类
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_PRODUCT_TYPE {
+        SAFE_PARTS(10, "安全部品"),
+        ORDINARY_PARTS(20, "普通部品");
+
+        private int value;
+        private String description;
+
+        PART_PRODUCT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PART_PRODUCT_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String description) {
+            int value = 0;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    value = values()[i].value;
+                }
+            }
+            return value;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 检查区分
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_CHECK_TYPE {
+        INSPECTION_FREE(10, "免检"),
+        NORMAL_INSPECTION(20, "正常检验");
+
+        private int value;
+        private String description;
+
+        PART_CHECK_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PART_CHECK_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String description) {
+            int tmp = 0;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 10-量产品、20新品MP、30-新品前3个月
+     * 产品阶段类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCT_STAGE_TYPE {
+        PRODUCTION(10, "量产品"),
+        NEW_PRODUCTION_MP(20, "新品MP"),
+        NEW_PRODUCTION_BEFORE_THREE_MONTH(30, "新品前3个月");
+
+        private int value;
+        private String description;
+
+        PRODUCT_STAGE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PRODUCT_STAGE_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static int descriptionOfValue(String description) {
+            int tmp = 0;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 式样书状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum NOTE_STATUS_TYPE {
+        EFFECTIVE(10, "有效"),
+        UN_EFFECTIVE(20, "无效");
+
+        private int value;
+        private String description;
+
+        NOTE_STATUS_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static NOTE_STATUS_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String description) {
+            int tmp = -1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+    /**
+     * BU式样书状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BU_NOTE_STATUS_TYPE {
+        CREATING(10, "创建中"),
+        EFFECTIVE(20, "有效");
+
+        private int value;
+        private String description;
+
+        BU_NOTE_STATUS_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static BU_NOTE_STATUS_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String description) {
+            int tmp = -1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 检测结果类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_MODE_TYPE {
+        MAN_QC(10, "人工"),
+        FREE_QC(20, "免检"),
+        SAME_DATE_CODE_QC(30, "同批次应用");
+
+        private int value;
+        private String description;
+
+        QC_MODE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static QC_MODE_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    /**
+     * 检测结果
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_STATUS {
+        INQUALITY(10, "INQUALITY", "质检中"),
+        NORMAL(20, "NORMAL", "OK"),
+        ABNORMAL(30, "ABNORMAL", "NG");
+
+        private int value;
+        private String code;
+        private String description;
+
+        QC_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode(){return code;}
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static QC_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 10-待检中,20-检查中，30-同批次应用
+     * 单据状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_INFO_STATUS {
+        CREATE(10, "待检中"),
+        HANDLEING(20, "检查中"),
+        FINISH(30, "完成"),
+        SECOND_JUDGMENT(80, "二次判定");
+
+        private int value;
+        private String description;
+
+        QC_INFO_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static QC_INFO_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CHECK_JUDGE_TYPE {
+
+        RESULT_TYPE(10, "结果类型"),
+        COMPARE_TYPE(20, "比值类型");
+        private int value;
+        private String description;
+
+        CHECK_JUDGE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 客诉类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COMPLAINT_TYPE {
+
+        ABNORMAL_CONTACT(10, "异常联络"),
+        QUICK_REPORT(20, "速报");
+
+        private int value;
+        private String description;
+
+        COMPLAINT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 异常场所
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ABNORMAL_SOURCE {
+        MARKET_BADNESS(10, "市场不良"),//客诉的单号(市场)
+        AOG_BADNESS(20, "到货不良"),//客诉的单号(到货)
+        OQC_BADNESS(30, "出货检查"),//出货检查
+        RECEIVE_BADNESS(40, "受入检查"),//受入
+        PROJECT_BADNESS(50, "工程不良"),//制造工程
+        JUDGEMENT(60, "改判"),
+        ORTHER(70, "其它");
+        private int value;
+        private String description;
+
+        ABNORMAL_SOURCE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 缺陷等级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DEFECT_LEVEL {
+
+        MINOR_DEFECT(10, "轻度缺陷"),
+        MODERATE_DEFECT(20, "中度缺陷"),
+        SEVERE_DEFECT(30, "重度缺陷");
+
+        private int value;
+        private String description;
+
+        DEFECT_LEVEL(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 发生情况
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SITUATION {
+
+        INCIPIENT(10, "初发"),
+        RECURRENCE(20, "再发");
+
+        private int value;
+        private String description;
+
+        SITUATION(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 客诉单状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COMPLAINT_STATUS {
+
+        CREATED(10, "已创建"),
+        PARSED(20, "已分析"),
+        CHANGED(30, "已整改"),
+        CONFIRMED(40, "已确认");
+
+        private int value;
+        private String description;
+
+        COMPLAINT_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+        public static enum TRUE_OR_FALSE {
+        TRUE(1, "是"),
+        FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        private TRUE_OR_FALSE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public String getValueStr() {
+            return this.value + "";
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = -1;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum SYNC_STATUS {
+        TRUE(1, "是"),
+        FALSE(2, "否"),
+        FAILED(3, "失败");
+
+        private int value;
+        private String description;
+
+        private SYNC_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public String getValueStr() {
+            return this.value + "";
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = -1;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum CONFIRM_STATUS {
+        TRUE(10, "已确认"),
+        FALSE(20, "未确认");
+
+        private int value;
+        private String description;
+
+        private CONFIRM_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = -1;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+    /**
+     * 制造部门、技术部门、品质部门人员
+     * 责任区分
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum DUTY_DIFF {
+        PRODUCE(10, "PRODUCE", "制造"),//制造部门
+        COMPONENT(20, "COMPONENT", "部品"),//物管，调达，受入
+        TECHNOLOGY(30, "TECHNOLOGY", "技术"),///技术部门
+        OTHER(40, "OTHER", "其它");//品质部门人员
+
+        private int value;
+        private String description;
+
+        private DUTY_DIFF(int value, String code, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getValueStr() {
+            return this.value + "";
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static String valueStrOfDescription(String val) {
+            try {
+                return valueOf(Integer.parseInt(val));
+            } catch (NumberFormatException e) {
+                return null;
+            }
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+    /**
+     * 原因项目
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum REASON_PROJECT {
+        MAKE_ASSEMBLAGE(10, "制造-组立"),
+        COMPONENT_MOLDING(20, "部品-成型"),
+        ASSEMBLAGE(30, "组立"),
+        ELECTRIC_FITTING(40, "电装"),
+        WELDING(50, "熔接"),
+        TECHNOLOGY(60, "技术"),
+        DESIGN(70, "设计"),
+        OTHER(80, "其他");
+
+        private int value;
+        private String description;
+
+        private REASON_PROJECT(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+    /**
+     * 费用有无
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum IS_COST {
+        YES(10, "有"),
+        NO(20, "无");
+
+        private int value;
+        private String description;
+
+        private IS_COST(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+    /**
+     * 是否实物返回
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum IS_ENTITY_RETURN {
+        YES(10, "是"),
+        NO(20, "否");
+
+        private int value;
+        private String description;
+
+        private IS_ENTITY_RETURN(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+    /**
+     * 对策前后
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum COUNTERMEASURE_ACTION {
+        BEFORE(10, "前"),
+        AFTER(20, "后");
+
+        private int value;
+        private String description;
+
+        private COUNTERMEASURE_ACTION(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+    /**
+     * 回复状态 10-是，20-否
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum REPLY_STATUS {
+        YES(10, "是"),
+        NO(20, "否");
+
+        private int value;
+        private String description;
+
+        private REPLY_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for(int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+    /**
+     * 发往DB 10-中国语、20-日本语
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum SHIPPING_BD {
+        CHINESE(10, "中国语"),
+        JAPANESE(20, "日本语");
+
+        private int value;
+        private String description;
+
+        private SHIPPING_BD(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 2;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum QC_INFO_TYPE {
+        FEED(10, "来料检验"),
+        ONLINE(20, "在线检验"),
+        EMDPRODUCT(30, "成品检验"),
+        SHIPMENTS(40, "出货检验");
+
+        private int value;
+        private String description;
+
+        private QC_INFO_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 工程巡检任务单据状态
+     */
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum PROJECT_INSPECTION_TASK_ORDER_STATUS {
+        CREATED(10, "已创建"),
+        COMPLETED(20, "已完成");
+
+        private int value;
+        private String description;
+
+        private PROJECT_INSPECTION_TASK_ORDER_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum INSPECTION_FREE_STATUS {
+        EFFECT(1, "生效"),
+        UN_EFFECT(2, "失效");
+
+        private int value;
+        private String description;
+
+        private INSPECTION_FREE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = -1;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum IF_SYNC_STATUS {
+        ALREADY_SYNC(1, "已同步"),
+        NO_SYNC(2, "未同步");
+
+        private int value;
+        private String description;
+
+        private IF_SYNC_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * WORK_ORDER_TYPE 工单类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_TYPE {
+        STANDARD_ORDER(10, "正常工单"),
+        ATTEMPT_ORDER(20, "试制工单"),
+        REWORK_ORDER(30, "返工工单");
+
+        private int value;
+        private String description;
+
+        WORK_ORDER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum PASS_OR_NO_PASS {
+        PASS(10, "通过"),
+        NO_PASS(20, "拒绝");
+
+        private int value;
+        private String description;
+
+        private PASS_OR_NO_PASS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = -1;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum ABNORMAL_ORDER_STATUS {
+        CREATE(10, "创建"),
+        CONFIRMING(20, "确认中"),
+        CONFIRM(30, "发行"),
+        APPLY(40, "回复"),
+        FINISH(50, "完成");
+
+        private int value;
+        private String description;
+
+        private ABNORMAL_ORDER_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = -1;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum SAFETY_MGR_TYPE {
+        NECESSARY(10, "必要"),
+        UNNECESSARY(20, "非必要");
+
+        private int value;
+        private String description;
+
+        private SAFETY_MGR_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = -1;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+
+    /**
+     * 枚举：特采、选别、修正、退货、返工、、出货停止。其他
+     * 处理结果
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum ABNORMAL_DETAIL_OPTION {
+        SPECIAL(10, "特采"),
+        XUANBIE(20, "选别"),
+        REPAIRE(30, "修正"),
+        RETURN(40, "退货"),
+        REWORK(50, "返工"),
+        SHIP_STOP(60, "出货停止"),
+        OTHER(70, "其它");
+
+
+        private int value;
+        private String description;
+
+        private ABNORMAL_DETAIL_OPTION(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = -1;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+    /**
+     * 产品分类
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EP_PRODUCT_TYPE {
+        XYJ(10, "洗衣机"),
+        XWJ(20, "洗碗机"),
+        DFB(30, "电饭煲"),
+        OTHERS(40, "其他");
+
+        private int value;
+        private String description;
+
+        EP_PRODUCT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * ROHS 分类
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MONITOR_MANAGE_CLASSIFY {
+        SL(10, "塑料"),
+        BJ(20, "钣金"),
+        DZ(30, "电子"),
+        YS(40, "印刷"),
+        XJ(50, "橡胶"),
+        OTHER(60, "其他");
+
+        private int value;
+        private String description;
+
+        MONITOR_MANAGE_CLASSIFY(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * ROHS 等级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MONITOR_MANAGE_LEVEL {
+        KA(10, "Ka"),
+        KB1(20, "Kb1"),
+        KB3(30, "Kb3"),
+        KB6(40, "Kb6");
+
+        private int value;
+        private String description;
+
+        MONITOR_MANAGE_LEVEL(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 评价管理 原因分类
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EVALUATION_MANAGE_CAUSE_TYPE {
+        CR(10, "CR"),
+        ZZBG(20, "制造变更"),
+        SJBG(30, "设计变更"),
+        RoHS(40, "RoHS");
+
+        private int value;
+        private String description;
+
+        EVALUATION_MANAGE_CAUSE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 10-物管确认，20-调达确认，30-发行，40-联络单确认，50-联络单确认回复,60-发行部门确认
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ABNORMAL_CONFIRM_TYPE {
+        MANAGEMENT_CONFIRM(10, "物管确认"),
+        TUNE_CONFIRM(20, "调达确认"),
+        RECEIVE_IN_CONFIRM(30, "受入确认"),
+        CONTACT_CONFIRM(40, "联络单确认"),
+        CONTACT_CONFIRM_REPLY(50, "联络单确认回复"),
+        ISSUE_DEPARTMENT_CONFIRM(60, "回复确认"),
+        SUPERVISOR_CONFIRM(70, "课长确认"),
+        QUALITY_DIRECTOR_CONFIRM(80, "品质部长确认"),
+        MATERIL_CONFIRM(90, "资材确认"),
+        CHECK_CONFIRM(100, "检印确认"),
+        RECOGNIZE_CONFIRM(110, "承认确认"),
+        ABNORMAL_APPLY(120, "联络单回复"),
+        DIRECTOR_CONFIRM(130, "部长确认");
+
+        private int value;
+        private String description;
+
+        ABNORMAL_CONFIRM_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 再检指示书
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum INSTRUCTION_STATUS {
+        CREATED(10, "已创建"),
+        COMPLETED(20, "已完成");
+
+        private int value;
+        private String description;
+
+        private INSTRUCTION_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+    /**
+     * 上下限颜色配置模块
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LIMIT_COLOR_MODULE {
+        RoHS(10, "RoHS监控"),
+        MANAGEMENT_TEST(20, "管理试验监控");
+
+        private int value;
+        private String description;
+
+        LIMIT_COLOR_MODULE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * RoHS检测/管理试验监控 模块
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MONITOR_MANAGE_MODULE {
+        ROHS(10, "RoHS监控"),
+        MANAGEMENT_TEST(20, "管理试验监控");
+
+        private int value;
+        private String description;
+
+        MONITOR_MANAGE_MODULE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 上下限颜色配置颜色代码
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COLOR_CODE {
+        RED("Red", "红色"),
+        YELLOW("Yellow", "黄色"),
+        WHITE("White", "白色");
+
+        private String value;
+        private String description;
+
+        COLOR_CODE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 不良模块配置
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BADNESS_MODULE {
+        CUSTOMER_COMPLAIN(10, "客诉");
+
+        private Integer value;
+        private String description;
+
+        BADNESS_MODULE(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 物料类型
+     */
+    public static enum WMS_PART_TYPE_STR {
+        RAW_MATERIAL(10, "原材料"),
+        PARTIALLY_PREPARED_PRODUCTS(20, "半成品"),
+        FINISHED_PRODUCT(30, "成品"),
+        CONTAINER_PRODUCT(40, "容器"),
+        UTENSIL(50, "器具");
+
+        private int value;
+        private String description;
+
+        private WMS_PART_TYPE_STR(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descriptionOfValue(String val) {
+            Integer tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(val)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+
+    /**
+     * 紧急联络会、生产停止、部品全检、其它。
+     * 安全判定要求
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum SAFETY_JUDGE_TYPE {
+        EMERGENCY_CONTACT(10, "紧急联络会"),
+        PRODUCTION_STOP(20, "生产停止"),
+        PART_ALL_CHECK(30, "部品全检"),
+        OTHER(40, "其它");
+
+        private int value;
+        private String description;
+
+        private SAFETY_JUDGE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = -1;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+
+    /**
+     * 文件业务类型
+     */
+    public enum FILE_MODULE_TYPE {
+        ABNORMAL(10, "异常联络单"),
+        IMPROVEMENT_EXPERIENCE_PD(20, "问题描述附件"),//改善经验库
+        IMPROVEMENT_EXPERIENCE_SOLUTION(30, "解决方案附件"),//改善经验库
+        QC_RULE_MOTE(40, "质检规格书"),
+        EVALUATION_MOTE(50, "评价管理"),
+        OUT_SOURCED(60, "委外商品供应商报告");
+
+        private int value;
+        private String description;
+
+        private FILE_MODULE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 异常频次Frequency
+     */
+    public enum ABNORMAL_FREQUENCY {
+        FIRST(10, "初次发生"),
+        AGAIN(20, "再次发生"),
+        MULT(30, "多次发生");
+        private int value;
+        private String description;
+
+        private ABNORMAL_FREQUENCY(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    /**
+     * 加工场所（公司内部、公司外部）
+     */
+    public enum WORK_SITE {
+        IN_CONPANY(10, "公司内部"),
+        OUT_COMPANY(20, "公司外部");
+        private int value;
+        private String description;
+
+        private WORK_SITE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    /**
+     * 原因分析（作业人员、设备/机器、原材料、作业方法、环境因素、管理上不完善、作业指导文件和管理资料不足、其他。）
+     */
+    public enum ABNORMAL_ANALYSIS_CAUSE {
+        OPERATOR(10, "作业人员"),
+        MACHINE(20, "设备/机器"),
+        RAW_MATERIAL(30, "原材料"),
+        OPERATION(40, "作业方法"),
+        ENVIRONMENT(50, "环境因素"),
+        MANAGERMENT(60, "管理上不完善"),
+        INSTRUCTION_AND_MANAGERMENT(70, "作业指导文件和管理资料不足"),
+        OTHER(80, "其它");
+        private int value;
+        private String description;
+
+        private ABNORMAL_ANALYSIS_CAUSE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * //外观(appearance)、尺寸(20)、实验(experiment)
+     * 不良项目 性能和组装
+     */
+    public enum ABNORMAL_TYPE {
+        APPEARANCE(10, "外观"),
+        SIZE(20, "尺寸"),
+        EXPERRIMENT(30, "实验"),
+        PROPERTY(40, "性能"),
+        PACKAGING(50, "组装");
+
+        private int value;
+        private String description;
+
+        private ABNORMAL_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 出货检验月报日报查询维度(数据)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REPORT_DIMENSION_CATEGORY_OR_SALESTO_OR_PART {
+
+        CATEGORY_CODE3(10, "产品类别"),
+        SALES_TO(20, "销售向"),
+        PART_NO(30, "物料编码");
+
+        private int value;
+        private String description;
+
+        REPORT_DIMENSION_CATEGORY_OR_SALESTO_OR_PART(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static QmsEnumUtil.REPORT_DIMENSION_CATEGORY_OR_SALESTO_OR_PART getByValue(int value) {
+            QmsEnumUtil.REPORT_DIMENSION_CATEGORY_OR_SALESTO_OR_PART[] var1 = values();
+            int var2 = var1.length;
+
+            for (int var3 = 0; var3 < var2; ++var3) {
+                QmsEnumUtil.REPORT_DIMENSION_CATEGORY_OR_SALESTO_OR_PART dimension = var1[var3];
+                if (dimension.getValue() == value) {
+                    return dimension;
+                }
+            }
+            return null;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+    }
+
+    /**
+     * 报表查询维度(数据)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REPORT_DIMENSION_DATE_OR_CENTER {
+
+        DATE(10, "日期"),
+        CENTER(20, "生产线");
+
+        private int value;
+        private String description;
+
+        REPORT_DIMENSION_DATE_OR_CENTER(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static QmsEnumUtil.REPORT_DIMENSION_DATE_OR_CENTER getByValue(int value) {
+            QmsEnumUtil.REPORT_DIMENSION_DATE_OR_CENTER[] var1 = values();
+            int var2 = var1.length;
+
+            for (int var3 = 0; var3 < var2; ++var3) {
+                QmsEnumUtil.REPORT_DIMENSION_DATE_OR_CENTER dimension = var1[var3];
+                if (dimension.getValue() == value) {
+                    return dimension;
+                }
+            }
+            return null;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+    }
+
+    /**
+     * 报表查询维度(日期)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REPORT_DIMENSION_DAY_OR_MONTH_OR_YAER {
+
+        YEAR(10, "年"),
+        MONTH(20, "月"),
+        DAY(30, "日");
+
+        private int value;
+        private String description;
+
+        REPORT_DIMENSION_DAY_OR_MONTH_OR_YAER(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+    }
+
+    /**
+     * 报表查询维度(日期)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REPORT_DIMENSION_DAY_OR_MONTH {
+
+        MONTH(10, "月"),
+        DAY(20, "日");
+
+        private int value;
+        private String description;
+
+        REPORT_DIMENSION_DAY_OR_MONTH(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+    }
+
+    /**
+     * 出货检验报表查询维度(数据)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REPORT_DIMENSION_OQC_CEHCK_STATISTICS {
+
+        PRODUCT_TYPE(10, "产品分类"),
+        CATEGORY_CODE(20, "机种分类"),
+        PART_NO(30, "物料编码"),
+        WORK_CENTER_CODE(40, "生产线");
+
+        private int value;
+        private String description;
+
+        REPORT_DIMENSION_OQC_CEHCK_STATISTICS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static QmsEnumUtil.REPORT_DIMENSION_OQC_CEHCK_STATISTICS getByValue(int value) {
+            QmsEnumUtil.REPORT_DIMENSION_OQC_CEHCK_STATISTICS[] var1 = values();
+            int var2 = var1.length;
+
+            for (int var3 = 0; var3 < var2; ++var3) {
+                QmsEnumUtil.REPORT_DIMENSION_OQC_CEHCK_STATISTICS dimension = var1[var3];
+                if (dimension.getValue() == value) {
+                    return dimension;
+                }
+            }
+            return null;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+    }
+
+    /**
+     * 工程不良报表查询维度(数据)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REPORT_DIMENSION_ENGINEERING_BAD {
+
+        DATE(10, "日期"),
+        DUTY_DIFF(20, "原因区分"),
+        DEFECT(30, "缺陷"),
+        HAPPEN_STATION(40, "发生岗位"),
+        REPAIR_CODE(50, "维修措施");
+
+        private int value;
+        private String description;
+
+        REPORT_DIMENSION_ENGINEERING_BAD(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static QmsEnumUtil.REPORT_DIMENSION_ENGINEERING_BAD getByValue(int value) {
+           QmsEnumUtil.REPORT_DIMENSION_ENGINEERING_BAD[] var1 = values();
+            int var2 = var1.length;
+
+            for (int var3 = 0; var3 < var2; ++var3) {
+                QmsEnumUtil.REPORT_DIMENSION_ENGINEERING_BAD dimension = var1[var3];
+                if (dimension.getValue() == value) {
+                    return dimension;
+                }
+            }
+            return null;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+    }
+
+    /**
+     * 不良率目标数据分类
+     */
+    public enum DATA_TYPE {
+        PRODUCT_TYPE(10, "产品分类"),
+        WORK_CENTER(20, "线别"),
+        MACHINE_CODE(30, "机种分类"),
+        NO_TYPE(40, "无类型");
+
+        private int value;
+        private String description;
+
+        private DATA_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(Integer productType, String workCenterCode, String machineCode) {
+            if (!StringUtils.isEmpty(productType)) {
+                return DATA_TYPE.PRODUCT_TYPE.value;
+            } else if (!StringUtils.isEmpty(workCenterCode)) {
+                return DATA_TYPE.WORK_CENTER.value;
+            } else if (!StringUtils.isEmpty(machineCode)) {
+                return DATA_TYPE.MACHINE_CODE.value;
+            } else {
+                return DATA_TYPE.NO_TYPE.value;
+            }
+        }
+    }
+
+    /**
+     * 停止指示书单据状态
+     */
+    public enum STOP_ORDER_STATUS {
+        CREATED(10, "停止"),
+        RELIEVED(20, "解除");
+
+        private int value;
+        private String description;
+
+        STOP_ORDER_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * 出货停止指示书解除对象范围
+     */
+    public enum SHIP_STOP_RELIEVE_RANGE {
+        SAME_MACHINE(10, "和停止时同一机种"),
+        SAME_QUANTITY(20, "同样台数"),
+        REDUCED(30, "由于选别等措施后有所减少");
+
+        private int value;
+        private String description;
+
+        SHIP_STOP_RELIEVE_RANGE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * 出货停止指示书再检方式
+     */
+    public enum SHIP_STOP_RE_CHECK_MODE {
+        SPOT_CHECK(10, "抽检检查"),
+        ALL_CHECK(20, "全数检查");
+
+        private int value;
+        private String description;
+
+        SHIP_STOP_RE_CHECK_MODE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * 生产停止指示书变更内容
+     */
+    public enum PRODUCT_STOP_CHANGE_CONTENT {
+        SPARE_PART_TEST(10, "零部件检验规格书"),
+        PRODUCT_TEST(20, "产品检验规格书"),
+        TASK_INSTRUCTION(30, "作业指导书"),
+        MANAGEMENT_PROCESS(40, "管理工序图");
+
+        private int value;
+        private String description;
+
+        PRODUCT_STOP_CHANGE_CONTENT(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * 异常场所
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum KS_ABNORMAL_SOURCE {
+
+        MARKET_BADNESS(10, "市场不良"),//客诉的单号
+        AOG_BADNESS(20, "到货不良");//受入
+
+        private int value;
+        private String description;
+
+        KS_ABNORMAL_SOURCE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 供应商Q评价-缺陷等级及分数-加减分形式
+     */
+    public enum VQE_PLUS_MINUS_FORM {
+        INCOMING_INSPECTION(10, "受入检查"),
+        MANUFACTURING_ENGINEERING(20, "制造工程"),
+        MARKET_FEEDBACK(30, "市场反馈"),
+        QUALITY_MANAGEMENT(40, "品质管理"),
+        ARTIFICIAL(50, "人工加减分");
+
+        private int value;
+        private String description;
+
+        VQE_PLUS_MINUS_FORM(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static int[] getEnumValue(Integer count) {
+            int[] enumValue = new int[count];
+            for (int i = 0; i < count; i++) {
+                enumValue[i] = values()[i].value;
+            }
+            return enumValue;
+        }
+
+        public static int[] getEnumValue() {
+            int[] enumValue = new int[values().length];
+            for (int i = 0; i < values().length; i++) {
+                enumValue[i] = values()[i].value;
+            }
+            return enumValue;
+        }
+
+    }
+
+    /**
+     * 供应商Q评价-缺陷等级及分数-缺陷等级
+     */
+    public enum VQE_DEFECT_GRADE {
+        MINOR_DEFECT(10, "轻度缺陷"),
+        MODERATE_DEFECT(20, "中度缺陷"),
+        SEVERE_DEFECT(30, "重度缺陷");
+
+        private int value;
+        private String description;
+
+        VQE_DEFECT_GRADE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static int[] getEnumValue() {
+            int[] enumValue = new int[values().length];
+            for (int i = 0; i < values().length; i++) {
+                enumValue[i] = values()[i].value;
+            }
+            return enumValue;
+        }
+
+    }
+
+    /**
+     * 供应商Q评价-缺陷等级及分数-评价等级
+     */
+    public enum VQE_EVALUATION_GRADE {
+        C(10, "C"),
+        B(20, "B"),
+        A(30, "A");
+
+        private int value;
+        private String description;
+
+        VQE_EVALUATION_GRADE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * 供应商Q评价-人工加减分-加减分项
+     */
+    public enum VQE_PLUS_MINUS_ITEM {
+        ROHS_VIOLATION(10, "RoHS违反"),
+        MAJOR_INCIDENT(20, "重大事件发生"),
+        UNAUTHORIZED_CHANGE(30, "4M擅自变更"),
+        OTHER(40, "其他");
+
+        private int value;
+        private String description;
+
+        VQE_PLUS_MINUS_ITEM(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum EXPIRE_TIME {
+        NEVER(-1, "不过期"),
+        ONE_HOUR(3600, "一小时"),
+        HALF_HOUR(1800, "半小时"),
+        ONE_QUARTER(900, "一刻钟"),
+        TEN_MIN(300, "十分钟"),
+        ONE_MIN(60, "一分钟");
+
+        private int value;
+        private String description;
+
+        private EXPIRE_TIME(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * MesOrderJob 单据状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_ORJ_ORDER_STATUS {
+        CREATE(10, "创建"),
+        CHECKING(20, "点检中"),
+        CHECK_COMPLETE(30, "点检完成"),
+        CLOSE(40, "关闭");
+
+        private int value;
+        private String description;
+
+        private MES_ORJ_ORDER_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 指示书条码状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOP_SN_STATUS {
+        STOP(10, "停止"),
+        RELIEVED(20, "解除");
+
+        private int value;
+        private String description;
+
+        STOP_SN_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    //邻苯是否检测
+    public enum DODP_CHECK_TYPE {
+        YES(10, "是"),
+        NO(20, "否");
+
+        private int value;
+        private String description;
+
+        DODP_CHECK_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    //是否加严检
+    public enum IS_STRICTER {
+        YES(10, "是"),
+        NO(20, "否");
+
+        private int value;
+        private String description;
+
+        IS_STRICTER(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    //是否确认检
+    public enum IS_CONFIRM {
+        YES(10, "是"),
+        NO(20, "否");
+
+        private int value;
+        private String description;
+
+        IS_CONFIRM(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * BU产品分类
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BU_PRODUCT_TYPE {
+        XWJ(10, "洗碗机"),
+        XZY(20, "洗澡椅"),
+        ZBQ(30, "座便器"),
+        SLT(40, "水龙头"),
+        LYJ(50, "晾衣架"),
+        JSQ(60, "净水器"),
+        XCQ(70, "吸尘器"),
+        DRG(80, "电饭锅"),
+        RQZ(90, "燃气灶"),
+        QNL(100, "取暖炉"),
+        OTHERS(110, "其他");
+
+        private int value;
+        private String description;
+
+        BU_PRODUCT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    //检验类型
+    public enum TEST_TYPE {
+        NORMAL(10, "正常检验"),
+        SPECIAL(20, "特采");
+
+        private int value;
+        private String description;
+
+        TEST_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    //单据类型
+    public enum ITEM_TYPE {
+        NORMAL(10, "正常检验"),
+        STRICTER(20, "加严检验"),
+        CONFIRM(30, "确认检验"),
+        INSPECTION_FREE(40, "加抽检验");
+
+        private int value;
+        private String description;
+
+        ITEM_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * BU检测类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BU_CHECK_JUDGE_TYPE {
+
+        RESULT_TYPE(10, "结果类型"),
+        COMPARE_TYPE(20, "比值类型"),
+        EQUIVALENCE_TYPE(30, "等值类型");
+        private int value;
+        private String description;
+
+        BU_CHECK_JUDGE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for(int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 出货检验类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OQC_CHECK_TYPE {
+
+        DAILY_INSPECTION(10, "日常检验"),
+        TEARDOWN_INSPECTION(20, "拆机检验"),
+        EMPTY_INSPECTION(30, "空洞检验");
+
+        private int value;
+        private String description;
+
+        OQC_CHECK_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 出货检验 值类型
+     */
+//    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+//    public enum BU_OQC_PROJECT_VALUE_TYPE {
+//
+//        COMPARE_TYPE(10, "比值类型"),
+//        RESULT_TYPE(20, "结果类型"),
+//        EQUAL_TYPE(30, "等值类型");
+//
+//        private int value;
+//        private String description;
+//
+//        BU_OQC_PROJECT_VALUE_TYPE(int value, String description) {
+//            this.value = value;
+//            this.description = description;
+//        }
+//
+//        public int getValue() {
+//            return value;
+//        }
+//
+//        public String getDescription() {
+//            return description;
+//        }
+//
+//        public static String valueOfDescription(int val) {
+//            String tmp = null;
+//            for (int i = 0; i < values().length; i++) {
+//                if (values()[i].value == val) {
+//                    tmp = values()[i].description;
+//                }
+//            }
+//            return tmp;
+//        }
+//
+//        public static Integer descriptionOfValue(String description) {
+//            Integer tmp = null;
+//            for (int i = 0; i < values().length; i++) {
+//                if (values()[i].description.equals(description)) {
+//                    tmp = values()[i].value;
+//                }
+//            }
+//            return tmp;
+//        }
+//    }
+
+    /**
+     * 物料分类1
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CATEGORY_CODE1 {
+
+        RAW_MATERIAL("10", "原材料"),
+        PARTIALLY_PREPARED_PRODUCTS("20", "半成品"),
+        FINISHED_PRODUCT("30", "成品"),
+        CONTAINER("40", "容器"),
+        APPLIANCE("50", "器具"),
+        TRADE_GOODS("60", "贸易品");
+
+
+
+        private String value;
+        private String description;
+
+        CATEGORY_CODE1(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for(int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 物料分类2
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CATEGORY_CODE2 {
+        THE_BUILT_IN_THING("10", "内置件"),
+        EXPORT_COMPONENTS("20", "出口组件");
+
+
+
+        private String value;
+        private String description;
+
+        CATEGORY_CODE2(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for(int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 物料分类3
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CATEGORY_CODE3 {
+        BIK("BIK", "洗碗机"),
+        EB("EB", "座便器"),
+        ZJ("ZJ", "组件"),
+        SK("SK", "水龙头");
+
+        private String value;
+        private String description;
+
+        CATEGORY_CODE3(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for(int i = 0; i < values().length; ++i) {
+                if (Objects.equals(values()[i].value, val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    //是否二次维修
+    public enum WHETHER_SECONDARY_MAINTENANCE {
+        NO(10, "N"),
+        YES(20, "Y");
+
+        private int value;
+        private String description;
+
+        WHETHER_SECONDARY_MAINTENANCE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    /**
+     * BU异常场所
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BU_ABNORMAL_SOURCE {
+        MARKET_BADNESS(10, "市场不良"),//客诉的单号
+        AOG_BADNESS(20, "出货检验"),//受入
+        RECEIVE_BADNESS(30, "受入检查"),//受入
+        PROJECT_BADNESS(40, "工程不良");//制造
+
+        private int value;
+        private String description;
+
+        BU_ABNORMAL_SOURCE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 过程质量巡检检测类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROCEDURE_CHECK_RESULT {
+        OK("OK", "合格"),
+        NG("NG", "不合格");
+
+        private String value;
+        private String description;
+
+        private PROCEDURE_CHECK_RESULT(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+    /**
+     * 过程质量巡检检测类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROCEDURE_CHECK_TYPE {
+        EQUALS(10, "等值类型"),
+        IN(20, "比值类型"),
+        MANUAL(30, "结果类型");
+
+        private int value;
+        private String description;
+
+        private PROCEDURE_CHECK_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+    /**
+     * 管理试验监控类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MANAGEMENT_TEST_MONITORING_TYPE {
+        AFFECTED(1, "受入"),
+        SHIPMENT(2, "出货"),
+        ODM(3, "ODM");
+
+        private int value;
+        private String description;
+
+        private MANAGEMENT_TEST_MONITORING_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+    /**
+     * 试验类型区分
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TEST_TYPE_DISTINGUISH {
+        COMPANY_STANDARD(1, "企业标准"),
+        WATER_EFFECT(2, "能效水效"),
+        ENDURANCE(3, "耐久"),
+        DEGERMING(4, "除菌"),
+        MANAGEMENT_TEST(5, "管理实验"),
+        CONSISTENCY_CONFIRMATION(6, "一致性确认"),
+        CQC(7, "CQC"),
+        CCC(8, "CCC"),
+        EMC(9, "EMC");
+
+        private int value;
+        private String description;
+
+        private TEST_TYPE_DISTINGUISH(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 报表附件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REPORT_ATTACHMENT_TYPE {
+        MANUFACTURER(1, "厂家报表附件"),
+        SELF_CHECK(2, "自检报表附件");
+
+        private int value;
+        private String description;
+
+        private REPORT_ATTACHMENT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 管理试验监控状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MANAGEMENT_TEST_MONITORING_STATUS {
+        CREATE(10, "已创建"),
+        CHECK(20, "已送检"),
+        COMPLETE(30, "已完成");
+
+        private int value;
+        private String description;
+
+        private MANAGEMENT_TEST_MONITORING_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 销售向
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SALES_TO {
+        CHINA_TO("10", "中国向"),
+        JAPAN_TO("20", "日本向"),
+        OTHER("30", "其他");
+
+        private String value;
+        private String description;
+
+        private SALES_TO(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (Objects.equals(values()[i].value, val)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public enum OQC_TOTAL_STATUS {
+        QUALIFIED(10, "合格"),
+        DEFECTED(20, "不合格"),
+        UNTREATED(30, "未检验");
+
+        private int value;
+        private String description;
+
+        OQC_TOTAL_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * ROHS 检测类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MONITOR_MANAGE_ACTION_TYPE {
+        CHECK(10, "普通检查"),
+        DODP_CHECK(20, "邻苯检测");
+
+        private int value;
+        private String description;
+
+        MONITOR_MANAGE_ACTION_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * RoHS 检测结果
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QMS_MONITOR_MANAGE_CHECK_RESULT {
+        QUALIFIED(10, "合格"),
+        UN_QUALIFIED(20, "不合格");
+
+        private int value;
+        private String description;
+
+        QMS_MONITOR_MANAGE_CHECK_RESULT(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int value) {
+            String description = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == value) {
+                    description = values()[i].description;
+                }
+            }
+            return description;
+        }
+
+    }
+
+    /**
+     * BU客诉单状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BU_COMPLAINT_STATUS {
+        CREATED(10, "创建"),
+        PARSED(20, "已分析"),
+        OUTSTANDING(30, "已发行"),//异常联络单创建
+        PROCESSED(40, "已处理"),//异常联络单为完成
+        HAS_THE_RECTIFICATION(50, "已整改"),
+        CONFIRMED(60, "已确认");
+
+        private int value;
+        private String description;
+
+        BU_COMPLAINT_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * MesWorkOrderExt 工单-条码生成状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_SN_CREATE_STATUS {
+
+        UN_CREATE(10, "未生成"),
+        CREATED(20, "已生成"),
+        NO_CREATE(30, "不生成");
+
+        private int value;
+        private String description;
+
+        WORK_ORDER_SN_CREATE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 工单状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_STATUS {
+
+        CREATE(10, "创建"),
+        LANDED(20, "下达"),
+        OPEN(30, "启动"),
+        PAUSE(40, "暂停"),
+        CLOSE(60, "完成"),
+        REMOVE(70, "删除");
+
+        private int value;
+        private String description;
+
+        WORK_ORDER_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum PART_CATEGORY_TYPE {
+        CATEGORY_ONE("Category1", "类型1"),
+        CATEGORY_TWO("Category2", "类型2"),
+        CATEGORY_THREE("Category3", "类型3");
+
+        private String value;
+        private String description;
+
+        private PART_CATEGORY_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+
+            for(int i = 0; i < values().length; ++i) {
+                if (val.equals(values()[i].value)) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 同步WMS质检业务状态枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_INFO_STATUS_EXT {
+        CREATE(10, "新建"),
+        FINISH(20, "处理中"),
+        FAIL(30, "已完成"),
+        CLOSE(40, "已关闭"),
+        CANCEL(50, "已取消"),
+        REJECT(60, "全部退货"),
+        SPECIAL(70, "全部特采");
+
+        private int value;
+        private String description;
+
+        QC_INFO_STATUS_EXT(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+    }
+
+    /**
+     * 产线类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LINE_TYPE {
+
+        ONTOLOGY_LINE("10", "本体线"),
+        COMPONENT_LINE("20", "组件线");
+
+        private String value;
+        private String description;
+
+        LINE_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 要or不要
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum NEED_OR_NO {
+
+        NEED(10, "要"),
+        NO_NEED(20, "不要");
+
+        private int value;
+        private String description;
+
+        NEED_OR_NO(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 要or不要
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ABCD {
+
+        A(10, "A"),
+        B(20, "B"),
+        C(30, "C"),
+        D(40, "D");
+
+        private int value;
+        private String description;
+
+        ABCD(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 10-待检中,20-检查中，30-同批次应用
+     * BU单据状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BU_QC_INFO_STATUS {
+        CREATE(10, "待检中"),
+        HANDLEING(20, "检验中"),
+        FINISH(30, "完成"),
+        SECOND_JUDGMENT(80, "二次判定");
+
+
+        private int value;
+        private String description;
+
+        BU_QC_INFO_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static BU_QC_INFO_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 检查区分
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BU_PART_CHECK_TYPE {
+        INSPECTION_FREE(10, "加抽检"),
+        NORMAL_INSPECTION(20, "正常检验");
+
+        private int value;
+        private String description;
+
+        BU_PART_CHECK_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static BU_PART_CHECK_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String description) {
+            int tmp = 0;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+    /**
+     * Q评价异常联络单回复分类
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum VQE_ABNORMAL_CLASSIFY {
+        QUALITY_TECHNOLOGY(10, "品质技术层原因");
+
+        private int value;
+        private String description;
+
+        VQE_ABNORMAL_CLASSIFY(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 时间单位
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum HOURLY_BASIS {
+        //Year, month, day, time, minute, second
+        Year(10, "年"),
+        month(20, "月"),
+        day(30, "日"),
+        time(40, "时"),
+        minute(50, "分"),
+        second(60, "秒");
+
+        private int value;
+        private String description;
+
+        HOURLY_BASIS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 区分部品和ODM
+     */
+    public enum SX_QMS_RC_RULE_NOTE_MODULE {
+        COMPONENT(10, "零部件校验规格书(部品受入检验)"),
+        ODM(20, "零部件校验规格书(ODM受入检验)");
+
+        private int value;
+        private String description;
+
+        private SX_QMS_RC_RULE_NOTE_MODULE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 文件业务类型
+     */
+    public enum SX_QMS_RC_RULE_NOTE_PAGE {
+        COMPONENT(10, "零部件受检项目页面"),
+        INSPECTION_WORK(20, "检验作业页面");
+
+        private int value;
+        private String description;
+
+        private SX_QMS_RC_RULE_NOTE_PAGE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+    /**
+     * 是否重复扫描
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum IS_EXISTS {
+        YES(10, "YES"),
+        NO(20, "NO");
+
+        private int value;
+        private String description;
+
+        private IS_EXISTS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+    /**
+     * MesProductEncodeCfg 编码匹配类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ENCODE_MATCH_TYPE {
+
+        ORGANIZATION(10, "工厂"),
+        PART(20, "物料"),
+        WORK_CENTER(30, "生产线"),
+        PPT_CODE(40, "产品生产类型"),
+        CATEGORY_CODE1(50, "分类1"),
+        CATEGORY_CODE2(60, "分类2"),
+        CATEGORY_CODE3(70, "分类3");
+
+        private int value;
+        private String description;
+
+        ENCODE_MATCH_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static ENCODE_MATCH_TYPE getByValue(int value) {
+            for (ENCODE_MATCH_TYPE matchType : values()) {
+                if (matchType.getValue() == value) {
+                    return matchType;
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * MesProductEncodeCfg 编码类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ENCODE_CODE_TYPE {
+
+        STANDARD_SERIAL_SN(10, "正常产品条码"),
+        ATTEMPT_SERIAL_SN(20, "试制产品条码"),
+        REWORK_SERIAL_SN(30, "再生产品条码"),
+        PACK_SN(40, "包装条码");
+
+        private int value;
+        private String description;
+
+        ENCODE_CODE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static ENCODE_CODE_TYPE getByValue(int value) {
+            for (ENCODE_CODE_TYPE codeType : values()) {
+                if (codeType.getValue() == value) {
+                    return codeType;
+                }
+            }
+            return null;
+        }
+    }
+
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SOURCE_TYPE {
+
+        QMS(10, "QMS"),
+        SWEB(20, "SWEB");
+        private int value;
+        private String description;
+
+        SOURCE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+
+            return tmp;
+        }
+    }
+
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public static enum QC_SN_STATUS {
+        NG(20, "不合格"),
+        OK(30, "合格"),
+        REBACK(40, "退货"),
+        XUANBIE(50, "选别"),
+        FIX(60, "修正"),
+        SPECIAL(70, "特采");
+        private int value;
+        private String description;
+
+        private QC_SN_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+
+            for(int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 出货停止指示书再检方式
+     */
+    public enum STOP_TYPE {
+        SHIP_STOP(10, "出货停止"),
+        LIBRARY_LOCK(20, "立库锁定");
+
+        private int value;
+        private String description;
+
+        STOP_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * 项目类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROJECT_CODE {
+        s005(40, "s005", "管理试验"),
+        s004(30, "s004", "性能"),
+        s003(50, "s003", "组装确认"),
+        s002(20, "s002", "尺寸"),
+        s001(10, "s001", "外观");
+        private int value;
+        private String code;
+        private String description;
+
+        PROJECT_CODE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode(){return code;}
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PROJECT_CODE codeOf(String code) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equalsIgnoreCase(code)) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+}
diff --git a/pom.xml b/pom.xml
index f75494e..75bef3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,57 +38,86 @@
         <module>modules/i3plus-pojo-mdm</module>
         <module>modules/i3plus-pojo-screen</module>
         <module>modules/i3plus-pojo-bsp</module>
+        <module>modules/i3plus-pojo-cdm</module>
+        <module>modules/i3plus-pojo-qms</module>
+        <module>modules/i3plus-pojo-eam</module>
     </modules>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                    <groupId>org.springframework.boot</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- swagger -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.swagger</groupId>
-                    <artifactId>swagger-models</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.5.21</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-
-        <!-- 简化方法 -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.16.10</version>
-        </dependency>
-    </dependencies>
-
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>i3plus.platform</groupId>
+                <artifactId>i3plus-platform-plugin</artifactId>
+                <version>1.0-TEST-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>impp.framework</groupId>
+                <artifactId>impp-framework-boot</artifactId>
+                <version>1.0-TEST-SNAPSHOT</version>
+                <!-- 不需要引入jpa和mongo -->
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-starter-data-jpa</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-starter-data-mongodb</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
 
             <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>easyexcel-core</artifactId>
+                <version>3.2.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-data-jpa</artifactId>
+                <version>2.0.3.RELEASE</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>spring-boot-starter-logging</artifactId>
+                        <groupId>org.springframework.boot</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <!-- swagger -->
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger2</artifactId>
+                <version>2.9.2</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.swagger</groupId>
+                        <artifactId>swagger-models</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-models</artifactId>
+                <version>1.5.21</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger-ui</artifactId>
+                <version>2.9.2</version>
+            </dependency>
+
+            <!-- 简化方法 -->
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>1.16.10</version>
+            </dependency>
+            <dependency>
                 <groupId>i3plus.pojo</groupId>
                 <artifactId>i3plus-pojo-base</artifactId>
                 <version>${project.version}</version>