Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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>

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";
+}

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;
+}

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;
+
+
+}

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;
+    }
+}

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;
+}

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;
+}

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;
+}

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;
+
+}

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 **/
+}

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;
+}

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;
+}

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;
+}

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() {
+    }
+}

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;
+
+}

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;
+
+}

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;
+    }
+}

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;
+}

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;
+}

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;
+
+}

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;
+}

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;
+}

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;
+
+}

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;
+
+}

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;
+}

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;
+}

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;
+
+}

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;
+
+}

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;
+}

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;
+
+
+}

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;
+}

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;
+    }
+}

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;
+}

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;
+
+}

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 {
+
+}

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{
+
+}

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() {
+    }
+}

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;
+//}

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();
+    }
+}

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;
+}

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() {
+    }
+}

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;
+    }
+}

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;
+    }
+}

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{
+
+}

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;
+
+}

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;
+
+
+}

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;
+
+}

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;
+}

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;
+}

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;
+}

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;
+}

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;
+}

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;
+}

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;
+}

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;
+
+}

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;
+}

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;
+}

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;
+}

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;
+
+}

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;
+
+}

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;
+    }
+}

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;
+}

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;
+
+}

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;
+}

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;
+}

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;
+
+}

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;
+
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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> {
+}

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;
+    }
+}

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";
+
+
+}