提交第一版:完成基本的同步代码

src/main/java/com/jarvis/dataCenter/bean/BeanUtils.java

@@ -4,7 +4,6 @@ import com.jarvis.dataCenter.entity.jws.InvoiceSignEntity;
 import com.jarvis.dataCenter.entity.prod.*;
 import com.jarvis.dataCenter.entity.report.*;
 import com.jarvis.dataCenter.entity.warehouse.*;
-import com.jarvis.lib.common.base.util.JarvisCopyUtils;
 
 /**
  * @author jinzhaopo

src/main/java/com/jarvis/dataCenter/config/OpenReplicatorCofig.java

@@ -3,7 +3,6 @@ package com.jarvis.dataCenter.config;
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
 
 /**
  * @author jinzhaopo

src/main/java/com/jarvis/dataCenter/entity/jws/InvoiceSignEntity.java

 package com.jarvis.dataCenter.entity.jws;
+
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
+import lombok.Data;
 
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 
-
-import lombok.Data;
-
-import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 /**
  * <p>
  * 开票的标记表 ENTITY
@@ -25,88 +23,88 @@ import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 public class InvoiceSignEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     @TableId(value = ID, type = IdType.AUTO)
     private Integer id;
-    
+
     /**
      * 业务ID
      */
     @TableField(BUSINESS_ID)
     private String businessId;
-    
+
     /**
      * '业务类型 PURCHASE:"采购", SELL_OFF: "销退", EXCHANGE: "换货"'
      */
     @TableField(BUSINESS_TYPE)
     private String businessType;
-    
+
     /**
      * 采购订单编号
      */
     @TableField(PO_CODE)
     private String poCode;
-    
+
     /**
      * 销售单号
      */
     @TableField(SO_CODE)
     private String soCode;
-    
+
     /**
      * 发单号
      */
     @TableField(DO_CODE)
     private String doCode;
-    
+
     /**
      * 售后单号
      */
     @TableField(CS_CODE)
     private String csCode;
-    
+
     /**
      * sku编码
      */
     @TableField(SKU_CODE)
     private String skuCode;
-    
+
     /**
      * 发票号
      */
     @TableField(INVOICE_CODE)
     private String invoiceCode;
-    
+
     /**
      * 发票物流号
      */
     @TableField(INVOICE_LOGISTICS_CODE)
     private String invoiceLogisticsCode;
-    
+
     /**
      * 实际开票数量
      */
     @TableField(INVOICE_ACTUAL_QUANTITY)
     private BigDecimal invoiceActualQuantity;
-    
+
     /**
      * 实际开票单价
      */
     @TableField(INVOICE_ACTUAL_PRICE)
     private BigDecimal invoiceActualPrice;
-    
+
     /**
      * 是否已开票的标记:Y已开票，N未开票
      */
     @TableField(INVOICE_SIGN)
     private String invoiceSign;
-    
+
     /**
      * 修改时间
      */
     @TableField(EDIT_TIME)
     private Date editTime;
-    
+
     /**
      * 新增时间
      */
@@ -114,9 +112,8 @@ public class InvoiceSignEntity extends AbstractEntity {
     private Date createTime;
 
 
-
     /**
-     * 
+     *
      */
     public static final String ID = "id";
 

src/main/java/com/jarvis/dataCenter/entity/prod/BusAgencyaddressEntity.java

 package com.jarvis.dataCenter.entity.prod;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 import lombok.Data;
 
-import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
+import java.util.Date;
+
 /**
  * <p>
  * 机构地址表 ENTITY
@@ -25,217 +22,217 @@ import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 public class BusAgencyaddressEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      * 主键 自增长
      */
     @TableId(value = ID, type = IdType.AUTO)
     private Integer id;
-    
+
     /**
      * 机构ID 关联bus_agencyMaster->id
      */
     @TableField(AGENCYID)
     private Integer agencyId;
-    
+
     /**
      * 地址名称 group（集团）、store（门店）
      */
     @TableField(ADDRNAME)
     private String addrName;
-    
+
     /**
      * 基础档案设置 机构地址类型
      */
     @TableField(ADDRTYP)
     private String addrTyp;
-    
+
     /**
      * 开票抬头
      */
     @TableField(INV_TITLE)
     private String invTitle;
-    
+
     /**
      * 国家ID
      */
     @TableField(COUNTRYID)
     private Integer countryId;
-    
+
     /**
      * 国家名称
      */
     @TableField(COUNTRYNAME)
     private String countryName;
-    
+
     /**
      * 省份ID
      */
     @TableField(PROVINCEID)
     private Integer provinceId;
-    
+
     /**
      * 省份名称
      */
     @TableField(PROVINCENAME)
     private String provinceName;
-    
+
     /**
      * 城市ID
      */
     @TableField(CITYID)
     private Integer cityId;
-    
+
     /**
      * 城市名称
      */
     @TableField(CITYNAME)
     private String cityName;
-    
+
     /**
      * 区ID
      */
     @TableField(COUNTYID)
     private Integer countyId;
-    
+
     /**
      * 区名称
      */
     @TableField(COUNTYNAME)
     private String countyName;
-    
+
     /**
      * 详细地址
      */
     @TableField(ADDRESS)
     private String address;
-    
+
     /**
      * 收货人
      */
     @TableField(DELIVERNAME)
     private String deliverName;
-    
+
     /**
      * 手机
      */
     @TableField(DELIVERMOBILE)
     private String deliverMobile;
-    
+
     /**
      * 固定电话
      */
     @TableField(DELIVERPHONE)
     private String deliverPhone;
-    
+
     /**
      * 邮编
      */
     @TableField(POSTCODE)
     private String postCode;
-    
+
     /**
      * 经度
      */
     @TableField(LONGITUDE)
     private String longitude;
-    
+
     /**
      * 纬度
      */
     @TableField(LATITUDE)
     private String latitude;
-    
+
     /**
      * 是否标经纬度 0：否 1：是
      */
     @TableField(LONLATFLG)
     private Integer lonLatFlg;
-    
+
     /**
      * 是否默认
      */
     @TableField(ISDEFAULT)
     private Integer isDefault;
-    
+
     /**
      * 是否作废 0：作废 1：使用
      */
     @TableField(USEFLG)
     private Integer useFlg;
-    
+
     /**
      * 备注
      */
     @TableField(MEMO)
     private String memo;
-    
+
     /**
      * 创建人
      */
     @TableField(CREATOR)
     private String creator;
-    
+
     /**
      * 修改人
      */
     @TableField(EDITOR)
     private String editor;
-    
+
     /**
      * 创建时间
      */
     @TableField(CREATEDTIME)
     private Date createdTime;
-    
+
     /**
      * 更新时间
      */
     @TableField(UPDATEDTIME)
     private Date updatedTime;
-    
+
     /**
      * 税号
      */
     @TableField(DUTYID)
     private String dutyId;
-    
+
     /**
      * 发票类型
      */
     @TableField(INVOICETYPE)
     private String invoiceType;
-    
+
     /**
      * 电子发票email
      */
     @TableField(EMAIL)
     private String email;
-    
+
     /**
      * 注册电话
      */
     @TableField(REGISTEREDMOBILE)
     private String registeredMobile;
-    
+
     /**
      * 银行账号
      */
     @TableField(BANKACCOUNT)
     private String bankAccount;
-    
+
     /**
      * 开户行名称
      */
     @TableField(INVNAME)
     private String invName;
-    
+
     /**
      * 开票地址
      */
     @TableField(INVADDRESS)
     private String invAddress;
-    
+
     /**
      * 发票抬头类型：0单位；1个人
      */
@@ -243,7 +240,6 @@ public class BusAgencyaddressEntity extends AbstractEntity {
     private Integer invTitleType;
 
 
-
     /**
      * 主键 自增长
      */

src/main/java/com/jarvis/dataCenter/entity/prod/BusAgencymasterEntity.java

 package com.jarvis.dataCenter.entity.prod;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 import lombok.Data;
 
-import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
+import java.util.Date;
+
 /**
  * <p>
  * 机构主表 ENTITY
@@ -25,271 +22,271 @@ import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 public class BusAgencymasterEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      * 主键 自增长
      */
     @TableId(value = ID, type = IdType.AUTO)
     private Integer id;
-    
+
     /**
      * 上级机构ID
      */
     @TableField(PARENTID)
     private Integer parentId;
-    
+
     /**
      * 所属集团ID
      */
     @TableField(GROUPID)
     private Integer groupId;
-    
+
     /**
      * 机构编码
      */
     @TableField(AGENCYCODE)
     private String agencyCode;
-    
+
     /**
      * 机构名称
      */
     @TableField(AGENCYNAME)
     private String agencyName;
-    
+
     /**
      * 机构简称
      */
     @TableField(AGENCYSHORTNAME)
     private String agencyShortName;
-    
+
     /**
      * 开票抬头
      */
     @TableField(INV_TITLE)
     private String invTitle;
-    
+
     /**
      * 基础档案设置 (椅位数)(com_sysItem)
      */
     @TableField(QTY_CHAIR)
     private String qtyChair;
-    
+
     /**
      * 基础档案设置 权限级别维度值id
      */
     @TableField(PERMISSIONLEVEL)
     private String permissionLevel;
-    
+
     /**
      * 机构类型(预留)
      */
     @TableField(AGENCYTYPE)
     private String agencyType;
-    
+
     /**
      * 机构分类id 基础多级档案设置：ABC类(com_sysItem)itemGpCode = bus_agencyMaster_agencyCategory
      */
     @TableField(AGENCYCATEGORYID)
     private String agencyCategoryid;
-    
+
     /**
      * 机构分类名称 基础多级档案设置：ABC类(com_sysItem)itemGpCode = bus_agencyMaster_agencyCategoryName
      */
     @TableField(AGENCYCATEGORYNAME)
     private String agencyCategoryName;
-    
+
     /**
      * 基础档案多级 所属区域/子公司id  基础多级档案设置；一个集团总账户，允许建立该集团下的区域及子公司上下级关系
      */
     @TableField(REGIONCOID)
     private String regionCoId;
-    
+
     /**
      * 基础多级档案设置 所属区域/子公司名称
      */
     @TableField(REGIONCONAME)
     private String regionCoName;
-    
+
     /**
      * 国家ID
      */
     @TableField(COUNTRYID)
     private Integer countryId;
-    
+
     /**
      * 国家名称
      */
     @TableField(COUNTRYNAME)
     private String countryName;
-    
+
     /**
      * 省份ID
      */
     @TableField(PROVINCEID)
     private Integer provinceId;
-    
+
     /**
      * 省份名称
      */
     @TableField(PROVINCENAME)
     private String provinceName;
-    
+
     /**
      * 城市ID
      */
     @TableField(CITYID)
     private Integer cityId;
-    
+
     /**
      * 城市名称
      */
     @TableField(CITYNAME)
     private String cityName;
-    
+
     /**
      * 区ID
      */
     @TableField(COUNTYID)
     private Integer countyId;
-    
+
     /**
      * 区名称
      */
     @TableField(COUNTYNAME)
     private String countyName;
-    
+
     /**
      * 详细地址
      */
     @TableField(ADDRESS)
     private String address;
-    
+
     /**
      * 机构负责人姓名
      */
     @TableField(DIRECTOR)
     private String director;
-    
+
     /**
      * 邮编
      */
     @TableField(POSTCODE)
     private String postCode;
-    
+
     /**
      * 固定电话区号
      */
     @TableField(AREACODE)
     private String areaCode;
-    
+
     /**
      * 固定电话
      */
     @TableField(TELPHONE)
     private String telPhone;
-    
+
     /**
      * 经度
      */
     @TableField(LONGITUDE)
     private String longitude;
-    
+
     /**
      * 纬度
      */
     @TableField(LATITUDE)
     private String latitude;
-    
+
     /**
      * 是否标经纬度 0：否 1：是
      */
     @TableField(LONLATFLG)
     private Integer lonLatFlg;
-    
+
     /**
      * 成立日期 格式到年月日
      */
     @TableField(ESTABLISHDATE)
     private Date establishDate;
-    
+
     /**
      * 公司信息ID 关联bus_companyInfo信息
      */
     @TableField(COMPANYINFOID)
     private Integer companyInfoId;
-    
+
     /**
      * 状态 0：禁用 1：启用
      */
     @TableField(USEFLG)
     private Integer useFlg;
-    
+
     /**
      * 备注
      */
     @TableField(MEMO)
     private String memo;
-    
+
     /**
      * 创建人
      */
     @TableField(CREATOR)
     private String creator;
-    
+
     /**
      * 修改人
      */
     @TableField(EDITOR)
     private String editor;
-    
+
     /**
      * 创建时间
      */
     @TableField(CREATEDTIME)
     private Date createdTime;
-    
+
     /**
      * 更新时间
      */
     @TableField(UPDATEDTIME)
     private Date updatedTime;
-    
+
     /**
      * 支付方式：1 全流程 0 精简支付
      */
     @TableField(PAYSTYLE)
     private Integer payStyle;
-    
+
     /**
      * 推荐人
      */
     @TableField(REFEREE)
     private String referee;
-    
+
     /**
      * 是否团购  0：否 1：是
      */
     @TableField(ISGROUPPURCHASE)
     private Integer isGroupPurchase;
-    
+
     /**
      * 报表机构类型(业务不要用):1(测试)2(禁用)3(专用)4(开城)5(大客户)6(金牌100)7(腰部100)8(激活券)9(其他)null未设置
      */
     @TableField(REPORT_FLAG)
     private Integer reportFlag;
-    
+
     /**
      * 1(开城)，2(进销存)，3(大客户)，4(金牌100)，5(腰部100)，6(激活券)，7（瑞尔外部），8（供应商调货），100(未设置)
      */
     @TableField(REPORT_AGENCY_SIGN)
     private Integer reportAgencySign;
-    
+
     /**
      * 是否签署医疗器械产品销售协议  0：否 1：是
      */
     @TableField(ISAGREEMENT)
     private Integer isAgreement;
-    
+
     /**
      * 0：未认证；1：已认证
      */
@@ -297,7 +294,6 @@ public class BusAgencymasterEntity extends AbstractEntity {
     private Integer authentication;
 
 
-
     /**
      * 主键 自增长
      */

src/main/java/com/jarvis/dataCenter/entity/prod/BusMerchandisemasterEntity.java

@@ -12,7 +12,7 @@ import java.util.Date;
 
 /**
  * <p>
- *  ENTITY
+ * ENTITY
  * </p>
  *
  * @author jinzhaopo
@@ -23,355 +23,355 @@ import java.util.Date;
 public class BusMerchandisemasterEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      * 主键 自增长
      */
     @TableId(value = ID, type = IdType.AUTO)
     private Integer id;
-    
+
     /**
      * SKU编号
      */
     @TableField(SKUCODE)
     private String skuCode;
-    
+
     /**
      * 产品ID 关联bus_productMaster->productId
      */
     @TableField(PRODUCTID)
     private Integer productId;
-    
+
     /**
      * 产品规格明细ID 关联bus_productSpec->Id
      */
     @TableField(PRODUCTSPECID)
     private Integer productSpecId;
-    
+
     /**
      * 产品中文名称 关联bus_productMaster->productNameCn
      */
     @TableField(PRODUCTNAMECN)
     private String productNameCn;
-    
+
     /**
      * 内部编码:瑞尔集团内部使用编码，用来做一一对应关系
      */
     @TableField(INSIDECODE)
     private String insideCode;
-    
+
     /**
      * 供应商内部编码
      */
     @TableField(SUPINSIDECODE)
     private String supinsideCode;
-    
+
     /**
      * 产品系列中文名称
      */
     @TableField(PD_SERIESCN)
     private String pdSeriescn;
-    
+
     /**
      * 产品系列英文名称
      */
     @TableField(PD_SERIESEN)
     private String pdSeriesen;
-    
+
     /**
      * 供应商ID 关联po_supliersMaster->id
      */
     @TableField(SUPLIERSID)
     private Integer supliersId;
-    
+
     /**
      * 供应商产品名称(平台采购)
      */
     @TableField(SUPLIERSPRODUCTNAMECN)
     private String supliersProductNameCn;
-    
+
     /**
      * 供应商规格名称
      */
     @TableField(SUPLIERSPRODUCTSPECNAME)
     private String supliersProductSpecName;
-    
+
     /**
      * 供应商子规格名称
      */
     @TableField(SUPLIERSSPECNAMEEXT)
     private String supliersSpecNameExt;
-    
+
     /**
      * 是否是自营sku(y/n)
      */
     @TableField(SELFSELL)
     private String selfSell;
-    
+
     /**
      * 供应商抬头简称 关联po_supliersMaster->supliersShortName
      */
     @TableField(SUPLIERSSHORTNAME)
     private String supliersShortName;
-    
+
     /**
      * 品牌id:关联bus_productBrand->id
      */
     @TableField(BRANDID)
     private Integer brandId;
-    
+
     /**
      * 品牌中文名称:关联bus_productBrand->brandNameCn
      */
     @TableField(BRANDNAMECN)
     private String brandNameCn;
-    
+
     /**
      * 分类id:关联bus_productCategory->id
      */
     @TableField(CATEGORYID)
     private Integer categoryId;
-    
+
     /**
      * 分类名称:关联bus_productCategory->categoryNameCn
      */
     @TableField(CATEGORYNAMECN)
     private String categoryNameCn;
-    
+
     /**
      * 展示分类id:关联bus_productShowCategory->id
      */
     @TableField(SHOWCATEGORYID)
     private Integer showCategoryId;
-    
+
     /**
      * 展示分类名称:关联bus_productShowCategory->categoryNameCn
      */
     @TableField(SHOWCATEGORYNAMECN)
     private String showCategoryNameCn;
-    
+
     /**
      * 规格id 关联 bus_productMasterExtend->extId
      */
     @TableField(EXTID_GP_SPEC)
     private Integer extidGpSpec;
-    
+
     /**
      * 规格名称 关联 bus_productMasterExtend->exName
      */
     @TableField(EXTGPNAME_GP_SPEC)
     private String extgpnameGpSpec;
-    
+
     /**
      * 二级规格id
      */
     @TableField(EXTID_GP_SPECEXT)
     private Integer extidGpSpecext;
-    
+
     /**
      * 二级规格名称
      */
     @TableField(EXTGPNAME_GP_SPECEXT)
     private String extgpnameGpSpecext;
-    
+
     /**
      * 包装单位id 关联 bus_productMasterExtend->extId
      */
     @TableField(EXTID_GP_PKUNIT)
     private Integer extidGpPkunit;
-    
+
     /**
      * 包装单位名称 关联 bus_productMasterExtend->groupName
      */
     @TableField(EXTGPNAME_GP_PKUNIT)
     private String extgpnameGpPkunit;
-    
+
     /**
      * 销售单位id 关联 bus_productMasterExtend->extId
      */
     @TableField(EXTID_GP_SALESUNIT)
     private Integer extidGpSalesunit;
-    
+
     /**
      * 销售单位名称 关联 bus_productMasterExtend->groupName
      */
     @TableField(EXTGPNAME_GP_SALESUNIT)
     private String extgpnameGpSalesunit;
-    
+
     /**
      * 最小使用单位（库存单位）例如：台 支
      */
     @TableField(STOCK_UNIT)
     private String stockUnit;
-    
+
     /**
      * 库存销售单位换算 例如：填写6，表示1个销售单位中对应6个使用单位
      */
     @TableField(STOCK_USE_UNIT)
     private BigDecimal stockUseUnit;
-    
+
     /**
      * 进货单位
      */
     @TableField(PURCHASE_UNIT)
     private String purchaseUnit;
-    
+
     /**
      * 成本价（针对进货单位）
      */
     @TableField(PURCHASE_PRICE)
     private BigDecimal purchasePrice;
-    
+
     /**
      * 进货/销售单位换算
      */
     @TableField(PURCHASE_USE_UNIT)
     private BigDecimal purchaseUseUnit;
-    
+
     /**
      * 商品产地 基本设置(itemGpCode) 进口、国产
      */
     @TableField(PROVENANCETYP)
     private String provenanceTyp;
-    
+
     /**
      * 税率
      */
     @TableField(TAXRATE)
     private BigDecimal taxRate;
-    
+
     /**
      * 网站标准售价
      */
     @TableField(SALEPRICE)
     private BigDecimal salePrice;
-    
+
     /**
      * 市场售价
      */
     @TableField(MARKETPRICE)
     private BigDecimal marketPrice;
-    
+
     /**
      * 商品库存归属 状态 0：否 1：是
      */
     @TableField(STK_ASCRIPTION)
     private Integer stkAscription;
-    
+
     /**
      * 关联仓库 预留字段
      */
     @TableField(WHS_REL)
     private String whsRel;
-    
+
     /**
      * 商品供货属性 基本设置(itemGpCode) itemGpCode = bus_merchandise_provide_typ
      */
     @TableField(SUPPLYATTRIBUTE)
     private String supplyAttribute;
-    
+
     /**
      * 供货天数，仅当商品供货属性=非现货时生效
      */
     @TableField(SUPPLYATTRDAYS)
     private BigDecimal supplyAttrDays;
-    
+
     /**
      * 预留：基本设置(itemGpCode) itemGpCode = bus_merchandise_stock
      */
     @TableField(STATUS_FLG)
     private Integer statusFlg;
-    
+
     /**
      * 商品库存状态 基本设置(itemGpCode) itemGpCode = bus_merchandise_stock
      */
     @TableField(STK_STATUS)
     private Integer stkStatus;
-    
+
     /**
      * 净重
      */
     @TableField(NETWEIGHT)
     private BigDecimal netWeight;
-    
+
     /**
      * 毛重
      */
     @TableField(GROSSWEIGHT)
     private BigDecimal grossWeight;
-    
+
     /**
      * 原产地中文
      */
     @TableField(PROVENANCECN)
     private String provenanceCn;
-    
+
     /**
      * 原产地英文
      */
     @TableField(PROVENANCEEN)
     private String provenanceEn;
-    
+
     /**
      * 审核状态：0：创建，1：待审核，2：已审核，3：驳回，4：关闭
      */
     @TableField(APPSTATUS)
     private Integer appStatus;
-    
+
     /**
      * 上下架状态：0：创建，1：上架，2：下架，3：停售，4：总库未到货
      */
     @TableField(SHELFSTATUS)
     private Integer shelfStatus;
-    
+
     /**
      * 预留1
      */
     @TableField(RESERVEI)
     private String reservei;
-    
+
     /**
      * 预留2
      */
     @TableField(RESERVEII)
     private String reserveii;
-    
+
     /**
      * 商城是否显示  0:商城不显示  1:商城显示
      */
     @TableField(SHOPSHOW)
     private Integer shopShow;
-    
+
     /**
      * 状态 0：禁用 1：启用
      */
     @TableField(USEFLG)
     private Integer useFlg;
-    
+
     /**
      * 备注
      */
     @TableField(MEMO)
     private String memo;
-    
+
     /**
      * 创建人
      */
     @TableField(CREATOR)
     private String creator;
-    
+
     /**
      * 修改人
      */
     @TableField(EDITOR)
     private String editor;
-    
+
     /**
      * 创建时间
      */
     @TableField(CREATEDTIME)
     private Date createdTime;
-    
+
     /**
      * 更新时间
      */
@@ -379,7 +379,6 @@ public class BusMerchandisemasterEntity extends AbstractEntity {
     private Date updatedTime;
 
 
-
     /**
      * 主键 自增长
      */

src/main/java/com/jarvis/dataCenter/entity/prod/BusProductbrandEntity.java

@@ -8,6 +8,7 @@ import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 import lombok.Data;
 
 import java.util.Date;
+
 /**
  * <p>
  * 产品品牌表 ENTITY
@@ -21,115 +22,115 @@ import java.util.Date;
 public class BusProductbrandEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      * 主键 自增长
      */
     @TableId(value = ID, type = IdType.AUTO)
     private Integer id;
-    
+
     /**
      * 品牌中文名称 唯一校验
      */
     @TableField(BRANDNAMECN)
     private String brandNameCn;
-    
+
     /**
      * 品牌英文名称 唯一校验
      */
     @TableField(BRANDNAMEEN)
     private String brandNameEn;
-    
+
     /**
      * 品牌代码  唯一校验
      */
     @TableField(BRANDCODE)
     private String brandCode;
-    
+
     /**
      * 图片url
      */
     @TableField(BRANDIMG1)
     private String brandImg1;
-    
+
     /**
      * 图片url
      */
     @TableField(BRANDIMG2)
     private String brandImg2;
-    
+
     /**
      * 图片url
      */
     @TableField(BRANDIMG3)
     private String brandImg3;
-    
+
     /**
      * 品牌简述
      */
     @TableField(BRANDDESC)
     private String brandDesc;
-    
+
     /**
      * 预留1
      */
     @TableField(RESERVEI)
     private String reservei;
-    
+
     /**
      * 预留2
      */
     @TableField(RESERVEII)
     private String reserveii;
-    
+
     /**
      * 显示排序，品牌显示的排序
      */
     @TableField(ROW_NUM)
     private Integer rowNum;
-    
+
     /**
      * 品牌商城显示的排序
      */
     @TableField(ROW_NUMII)
     private Integer rowNumii;
-    
+
     /**
      * 0：禁用 1：启用
      */
     @TableField(USEFLG)
     private Integer useFlg;
-    
+
     /**
      * 备注
      */
     @TableField(MEMO)
     private String memo;
-    
+
     /**
      * 创建人
      */
     @TableField(CREATOR)
     private String creator;
-    
+
     /**
      * 修改人
      */
     @TableField(EDITOR)
     private String editor;
-    
+
     /**
      * 创建时间
      */
     @TableField(CREATEDTIME)
     private Date createdTime;
-    
+
     /**
      * 更新时间
      */
     @TableField(UPDATEDTIME)
     private Date updatedTime;
-    
+
     /**
      * 0：商城不显示 1：商城显示
      */
@@ -137,7 +138,6 @@ public class BusProductbrandEntity extends AbstractEntity {
     private Integer shopShow;
 
 
-
     /**
      * 主键 自增长
      */

src/main/java/com/jarvis/dataCenter/entity/prod/BusProductcategoryEntity.java

@@ -8,6 +8,7 @@ import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 import lombok.Data;
 
 import java.util.Date;
+
 /**
  * <p>
  * 产品分类表 ENTITY
@@ -21,97 +22,97 @@ import java.util.Date;
 public class BusProductcategoryEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      * 主键 自增长
      */
     @TableId(value = ID, type = IdType.AUTO)
     private Integer id;
-    
+
     /**
      * 上级分类id
      */
     @TableField(PARENTID)
     private Integer parentId;
-    
+
     /**
      * 分类级别 0:项目 1:品类 2:子品类
      */
     @TableField(CATELEVEL)
     private Integer cateLevel;
-    
+
     /**
      * 产品分类中文名称
      */
     @TableField(CATEGORYNAMECN)
     private String categoryNameCn;
-    
+
     /**
      * 产品分类英文名称
      */
     @TableField(CATEGORYNAMEEN)
     private String categoryNameEn;
-    
+
     /**
      * 分类编码 唯一
      */
     @TableField(CATEGORYCODE)
     private String categoryCode;
-    
+
     /**
      * 分类图片
      */
     @TableField(CATEGORYIMG)
     private String categoryImg;
-    
+
     /**
      * 备注
      */
     @TableField(MEMO)
     private String memo;
-    
+
     /**
      * 分类显示的排序
      */
     @TableField(ROW_NUM)
     private Integer rowNum;
-    
+
     /**
      * 分类在商城显示的排序
      */
     @TableField(ROW_NUMII)
     private Integer rowNumii;
-    
+
     /**
      * 状态 0：禁用 1：启用
      */
     @TableField(USEFLG)
     private Integer useFlg;
-    
+
     /**
      * 是否关键 0:否 1：是
      */
     @TableField(IS_KEY)
     private Integer isKey;
-    
+
     /**
      * 创建人
      */
     @TableField(CREATOR)
     private String creator;
-    
+
     /**
      * 修改人
      */
     @TableField(EDITOR)
     private String editor;
-    
+
     /**
      * 创建时间
      */
     @TableField(CREATEDTIME)
     private Date createdTime;
-    
+
     /**
      * 更新时间
      */
@@ -119,7 +120,6 @@ public class BusProductcategoryEntity extends AbstractEntity {
     private Date updatedTime;
 
 
-
     /**
      * 主键 自增长
      */

src/main/java/com/jarvis/dataCenter/entity/prod/BusProductspecEntity.java

@@ -9,9 +9,10 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
+
 /**
  * <p>
- *  ENTITY
+ * ENTITY
  * </p>
  *
  * @author jinzhaopo
@@ -22,217 +23,217 @@ import java.util.Date;
 public class BusProductspecEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      * 主键 产品ID 自增长
      */
     @TableId(value = ID, type = IdType.AUTO)
     private Integer id;
-    
+
     /**
      * 产品ID，bus_productMaster-->id
      */
     @TableField(PRODUCTID)
     private Integer productId;
-    
+
     /**
      * 厂商内部编码
      */
     @TableField(INSIDECODEPROSPEC)
     private String insideCodeProspec;
-    
+
     /**
      * 规格型号，暂存字符
      */
     @TableField(SPECNAME)
     private String specName;
-    
+
     /**
      * 规格描述：富文本格式
      */
     @TableField(SPECNAMEDESC)
     private String specNameDesc;
-    
+
     /**
      * 二级规格型号：辅助属性
      */
     @TableField(SPECNAMEEXT)
     private String specNameExt;
-    
+
     /**
      * 产品俗名
      */
     @TableField(PRODUCTPOPULARNAME)
     private String productpopularName;
-    
+
     /**
      * 包装方式，暂存字符
      */
     @TableField(PACKNAME)
     private String packName;
-    
+
     /**
      * 销售单位，暂存字符
      */
     @TableField(SALESUNIT)
     private String salesUnit;
-    
+
     /**
      * 是否设置销售单位为默认管理单位 0否  1是
      */
     @TableField(DEFAULTSALESUNIT)
     private Integer defaultSalesUnit;
-    
+
     /**
      * 最小使用单位（库存单位），暂存字符
      */
     @TableField(MINUSEUNIT)
     private String minUseunit;
-    
+
     /**
      * 库存/销售单位换算
      */
     @TableField(STOCKVSSALE)
     private BigDecimal stockvssale;
-    
+
     /**
      * 最小单位
      */
     @TableField(SMALLUNIT)
     private String smallUnit;
-    
+
     /**
      * 是否设置最小单位为默认管理单位 0否  1是
      */
     @TableField(DEFAULTSMALLUNIT)
     private Integer defaultSmallUnit;
-    
+
     /**
      * 最小单位/销售单位 换算
      */
     @TableField(SMALLCONVERSION)
     private BigDecimal smallConversion;
-    
+
     /**
      * 市场参考售价
      */
     @TableField(REFERENCEPRICEI)
     private BigDecimal referencePricei;
-    
+
     /**
      * 市场参考售价2
      */
     @TableField(REFERENCEPRICEII)
     private BigDecimal referencePriceii;
-    
+
     /**
      * 税率
      */
     @TableField(TAXI)
     private BigDecimal taxi;
-    
+
     /**
      * 税率2
      */
     @TableField(TAXII)
     private BigDecimal taxii;
-    
+
     /**
      * 保质期
      */
     @TableField(QUALITYPREIOD)
     private String qualityPreiod;
-    
+
     /**
      * 预留1
      */
     @TableField(RESERVEI)
     private String reservei;
-    
+
     /**
      * 预留2
      */
     @TableField(RESERVEII)
     private String reserveii;
-    
+
     /**
      * 预留3
      */
     @TableField(RESERVEIII)
     private String reserveiii;
-    
+
     /**
      * 预留4
      */
     @TableField(RESERVEIV)
     private String reserveiv;
-    
+
     /**
      * 预留5
      */
     @TableField(RESERVEV)
     private String reservev;
-    
+
     /**
      * 预留6
      */
     @TableField(RESERVEVI)
     private String reservevi;
-    
+
     /**
      * 审核状态：0：创建，1：待审核，2：已审核，3：驳回，4：关闭
      */
     @TableField(APPSTATUS)
     private Integer appStatus;
-    
+
     /**
      * 序号：显示排序
      */
     @TableField(ROWNUM)
     private Integer rownum;
-    
+
     /**
      * 状态 0：禁用 1：启用
      */
     @TableField(USEFLG)
     private Integer useFlg;
-    
+
     /**
      * 备注
      */
     @TableField(MEMO)
     private String memo;
-    
+
     /**
      * 创建人
      */
     @TableField(CREATOR)
     private String creator;
-    
+
     /**
      * 修改人
      */
     @TableField(EDITOR)
     private String editor;
-    
+
     /**
      * 创建时间
      */
     @TableField(CREATEDTIME)
     private Date createdTime;
-    
+
     /**
      * 更新时间
      */
     @TableField(UPDATEDTIME)
     private Date updatedTime;
-    
+
     /**
      * 规格排序
      */
     @TableField(SORT)
     private Integer sort;
-    
+
     /**
      * 规格迁移前产品主键
      */
@@ -240,7 +241,6 @@ public class BusProductspecEntity extends AbstractEntity {
     private Integer lastProductId;
 
 
-
     /**
      * 主键 产品ID 自增长
      */

src/main/java/com/jarvis/dataCenter/entity/prod/CsOrderDetailEntity.java

@@ -8,6 +8,7 @@ import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 import lombok.Data;
 
 import java.util.Date;
+
 /**
  * <p>
  * 售后订单详情表 ENTITY
@@ -21,133 +22,133 @@ import java.util.Date;
 public class CsOrderDetailEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      * 售后详情ID
      */
     @TableId(value = CS_DETAIL_ID, type = IdType.AUTO)
     private Integer csDetailId;
-    
+
     /**
      * 售后单号
      */
     @TableField(CS_ORDER_CODE)
     private String csOrderCode;
-    
+
     /**
      * 申请数量
      */
     @TableField(APPLY_CNT)
     private Integer applyCnt;
-    
+
     /**
      * 申请类型：0请选择；1仅退货；2仅退款；3退货退款；4换货；5补发货；6取消
      */
     @TableField(APPLY_TYPE)
     private Integer applyType;
-    
+
     /**
      * 申请原因：0请选择；1质量问题；2收到商品少件；3发错货；4不想要/买错；5其它；6卖家缺货
      */
     @TableField(APPLY_REASON)
     private Integer applyReason;
-    
+
     /**
      * SKU编号
      */
     @TableField(SKU_CODE)
     private String skuCode;
-    
+
     /**
      * 产品中文名
      */
     @TableField(PRODUCT_NAME_CN)
     private String productNameCn;
-    
+
     /**
      * 规格名称
      */
     @TableField(SPEC_NAME)
     private String specName;
-    
+
     /**
      * 子规格名称
      */
     @TableField(SPEC_NAME_EXT)
     private String specNameExt;
-    
+
     /**
      * 中文品牌名称
      */
     @TableField(BRAND_NAME_CN)
     private String brandNameCn;
-    
+
     /**
      * 英文品牌名称
      */
     @TableField(BRAND_NAME_EN)
     private String brandNameEn;
-    
+
     /**
      * 销售单位
      */
     @TableField(SALE_UNIT)
     private String saleUnit;
-    
+
     /**
      * 关联仓库：-1总仓发货
      */
     @TableField(WHS_REL)
     private String whsRel;
-    
+
     /**
      * 发货数量
      */
     @TableField(DELIVERY_CNT)
     private Integer deliveryCnt;
-    
+
     /**
      * 实拍图片
      */
     @TableField(IMGS_URL)
     private String imgsUrl;
-    
+
     /**
      * 描述
      */
     @TableField(DESCRIPTION)
     private String description;
-    
+
     /**
      * 备注
      */
     @TableField(REMARK)
     private String remark;
-    
+
     /**
      * 客服内部备注
      */
     @TableField(INTERNAL_REMARK)
     private String internalRemark;
-    
+
     /**
      * 创建人
      */
     @TableField(CREATOR)
     private String creator;
-    
+
     /**
      * 修改人
      */
     @TableField(EDITOR)
     private String editor;
-    
+
     /**
      * 创建时间
      */
     @TableField(CREATED_TIME)
     private Date createdTime;
-    
+
     /**
      * 更新时间
      */
@@ -155,7 +156,6 @@ public class CsOrderDetailEntity extends AbstractEntity {
     private Date updatedTime;
 
 
-
     /**
      * 售后详情ID
      */

src/main/java/com/jarvis/dataCenter/entity/prod/CsOrderEntity.java

@@ -9,6 +9,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
+
 /**
  * <p>
  * 售后订单表 ENTITY
@@ -22,133 +23,133 @@ import java.util.Date;
 public class CsOrderEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      * 售后ID
      */
     @TableId(value = CS_ID, type = IdType.AUTO)
     private Integer csId;
-    
+
     /**
      * 售后单号
      */
     @TableField(CS_ORDER_CODE)
     private String csOrderCode;
-    
+
     /**
      * 采购单号
      */
     @TableField(PO_ORDER_CODE)
     private String poOrderCode;
-    
+
     /**
      * 销售单号
      */
     @TableField(SO_ORDER_CODE)
     private String soOrderCode;
-    
+
     /**
      * 发货单号
      */
     @TableField(DO_ORDER_CODE)
     private String doOrderCode;
-    
+
     /**
      * 草稿单号
      */
     @TableField(DF_ORDER_CODE)
     private String dfOrderCode;
-    
+
     /**
      * 换货商品价值
      */
     @TableField(BARTER_VALUE)
     private BigDecimal barterValue;
-    
+
     /**
      * 退货单号
      */
     @TableField(R_ORDER_CODE)
     private String rOrderCode;
-    
+
     /**
      * 退款单号
      */
     @TableField(RM_ORDER_CODE)
     private String rmOrderCode;
-    
+
     /**
      * 缺货编号
      */
     @TableField(STOCKOUT_CODE)
     private String stockoutCode;
-    
+
     /**
      * 售后单类型：0待收货；1关闭缺货记录；2待处理；3已完成
      */
     @TableField(CS_TYPE)
     private Integer csType;
-    
+
     /**
      * 售后状态：0售后待审核；1售后处理中；2售后关闭；3售后完成
      */
     @TableField(STATUS)
     private Integer status;
-    
+
     /**
      * 收货机构ID
      */
     @TableField(AGENCY_ID)
     private Integer agencyId;
-    
+
     /**
      * 收货机构名称
      */
     @TableField(AGENCY_NAME)
     private String agencyName;
-    
+
     /**
      * 收货机构简称
      */
     @TableField(AGENCY_SHORT_NAME)
     private String agencyShortName;
-    
+
     /**
      * 供应商ID
      */
     @TableField(SUPPLIER_ID)
     private Integer supplierId;
-    
+
     /**
      * 供应商名称
      */
     @TableField(SUPPLIER_NAME)
     private String supplierName;
-    
+
     /**
      * 供应商简称
      */
     @TableField(SUPPLIER_SHORT_NAME)
     private String supplierShortName;
-    
+
     /**
      * 创建人
      */
     @TableField(CREATOR)
     private String creator;
-    
+
     /**
      * 修改人
      */
     @TableField(EDITOR)
     private String editor;
-    
+
     /**
      * 创建时间
      */
     @TableField(CREATED_TIME)
     private Date createdTime;
-    
+
     /**
      * 更新时间
      */
@@ -156,7 +157,6 @@ public class CsOrderEntity extends AbstractEntity {
     private Date updatedTime;
 
 
-
     /**
      * 售后ID
      */

src/main/java/com/jarvis/dataCenter/entity/prod/PoCoupondetailEntity.java

@@ -9,6 +9,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
+
 /**
  * <p>
  * 优惠券明细表 ENTITY
@@ -22,103 +23,103 @@ import java.util.Date;
 public class PoCoupondetailEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      * 主键 自增长
      */
     @TableId(value = ID, type = IdType.AUTO)
     private Integer id;
-    
+
     /**
      * 优惠券主id
      */
     @TableField(COUNPONID)
     private Integer counponid;
-    
+
     /**
      * 集团id
      */
     @TableField(GROUPID)
     private Integer groupid;
-    
+
     /**
      * 诊所id
      */
     @TableField(CHILDID)
     private Integer childid;
-    
+
     /**
      * 销售主单编号
      */
     @TableField(ORDERMASTERCODE)
     private String orderMasterCode;
-    
+
     /**
      * 实际立减金额
      */
     @TableField(DEDUCTIONACT)
     private BigDecimal deductionAct;
-    
+
     /**
      * 优惠券来源 1：正常 2：售后返回
      */
     @TableField(COUPONSOURCE)
     private Integer couponSource;
-    
+
     /**
      * 返券来源单号
      */
     @TableField(SOURCENUMBER)
     private String sourceNumber;
-    
+
     /**
      * 使用状态 0：未使用 1：已冻结 2：已使用
      */
     @TableField(STATUS)
     private Integer status;
-    
+
     /**
      * 状态 0：禁用 1：启用
      */
     @TableField(USEFLG)
     private Integer useFlg;
-    
+
     /**
      * 备注
      */
     @TableField(MEMO)
     private String memo;
-    
+
     /**
      * 创建人
      */
     @TableField(CREATOR)
     private String creator;
-    
+
     /**
      * 修改人
      */
     @TableField(EDITOR)
     private String editor;
-    
+
     /**
      * 创建时间
      */
     @TableField(CREATEDTIME)
     private Date createdTime;
-    
+
     /**
      * 更新时间
      */
     @TableField(UPDATEDTIME)
     private Date updatedTime;
-    
+
     /**
      * 结束时间
      */
     @TableField(ENDTIME)
     private Date endTime;
-    
+
     /**
      * 起始时间
      */
@@ -126,7 +127,6 @@ public class PoCoupondetailEntity extends AbstractEntity {
     private Date beginTime;
 
 
-
     /**
      * 主键 自增长
      */

src/main/java/com/jarvis/dataCenter/entity/prod/PoCouponmasterEntity.java

@@ -9,6 +9,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
+
 /**
  * <p>
  * 优惠券主表 ENTITY
@@ -22,144 +23,143 @@ import java.util.Date;
 public class PoCouponmasterEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      * 主键 自增长
      */
     @TableId(value = ID, type = IdType.AUTO)
     private Integer id;
-    
+
     /**
      * 优惠券名称
      */
     @TableField(COUPONNAME)
     private String couponName;
-    
+
     /**
      * 优惠券显示名称
      */
     @TableField(COUPONDISPLAYNAME)
     private String couponDisplayName;
-    
+
     /**
      * 满额条件
      */
     @TableField(SATISFYCONDITION)
     private BigDecimal satisfyCondition;
-    
+
     /**
      * 立减金额
      */
     @TableField(DEDUCTION)
     private BigDecimal deduction;
-    
+
     /**
      * 是否新用户 0：否 1：是
      */
     @TableField(IS_NEW)
     private Integer isNew;
-    
+
     /**
      * 指定商品
      */
     @TableField(SKUCODE)
     private String skucode;
-    
+
     @TableField(PUBCODE)
     private String pubcode;
-    
+
     /**
      * 0：全场券 1：公共券2：特殊券
      */
     @TableField(CODETYPE)
     private Integer codetype;
-    
+
     /**
      * 创建时间
      */
     @TableField(CREATEDTIME)
     private Date createdTime;
-    
+
     /**
      * 更新时间
      */
     @TableField(UPDATEDTIME)
     private Date updatedTime;
-    
+
     /**
      * 活动BannerPc
      */
     @TableField(BANNERPC)
     private String bannerPc;
-    
+
     /**
      * 活动BannerWap
      */
     @TableField(BANNERWAP)
     private String bannerWap;
-    
+
     /**
      * 活动链接Pc
      */
     @TableField(URLPC)
     private String urlPc;
-    
+
     /**
      * 活动链接Wap
      */
     @TableField(URLWAP)
     private String urlWap;
-    
+
     /**
      * 活动标识符
      */
     @TableField(URLHASH)
     private String urlhash;
-    
+
     /**
      * 1：按固定有效时间；2：按发放时间
      */
     @TableField(TIMETYPE)
     private Integer timeType;
-    
+
     /**
      * 按发放时间天数
      */
     @TableField(LOCALTIME)
     private BigDecimal localTime;
-    
+
     /**
      * 状态 0：禁用 1：启用
      */
     @TableField(USEFLG)
     private Integer useFlg;
-    
+
     /**
      * 备注
      */
     @TableField(MEMO)
     private String memo;
-    
+
     /**
      * 创建人
      */
     @TableField(CREATOR)
     private String creator;
-    
+
     /**
      * 修改人
      */
     @TableField(EDITOR)
     private String editor;
-    
+
     @TableField(ENDTIME)
     private Date endTime;
-    
+
     @TableField(BEGINTIME)
     private Date beginTime;
 
 
-
     /**
      * 主键 自增长
      */
@@ -196,7 +196,7 @@ public class PoCouponmasterEntity extends AbstractEntity {
     public static final String SKUCODE = "skucode";
 
     /**
-     * 
+     *
      */
     public static final String PUBCODE = "pubcode";
 
@@ -271,12 +271,12 @@ public class PoCouponmasterEntity extends AbstractEntity {
     public static final String EDITOR = "editor";
 
     /**
-     * 
+     *
      */
     public static final String ENDTIME = "endTime";
 
     /**
-     * 
+     *
      */
     public static final String BEGINTIME = "beginTime";
 

src/main/java/com/jarvis/dataCenter/entity/prod/PoOrdermasterEntity.java

@@ -9,9 +9,10 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
+
 /**
  * <p>
- *  ENTITY
+ * ENTITY
  * </p>
  *
  * @author jinzhaopo
@@ -22,289 +23,289 @@ import java.util.Date;
 public class PoOrdermasterEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      * 自增长
      */
     @TableId(value = ID, type = IdType.AUTO)
     private Integer id;
-    
+
     /**
      * PO+2位年+2位月+2位日+4位流水
      */
     @TableField(ORDERMASTERCODE)
     private String orderMasterCode;
-    
+
     /**
      * 订单名称
      */
     @TableField(ORDERMASTERNAME)
     private String orderMasterName;
-    
+
     /**
      * 下单机构id
      */
     @TableField(AGENCYID)
     private Integer agencyId;
-    
+
     /**
      * 采购订单状态 20未支付，30已支付，31部分支付，35已取消，40已处理，41部分处理，50已发货，51部分发货，61部分收货，70已完成
      */
     @TableField(ORDERSTATUS)
     private Integer orderStatus;
-    
+
     /**
      * 审核时间
      */
     @TableField(REVIEWTIME)
     private Date reviewTime;
-    
+
     /**
      * 审核人
      */
     @TableField(REVIEWER)
     private String reviewer;
-    
+
     /**
      * 驳回原因
      */
     @TableField(REJECTION)
     private String rejection;
-    
+
     /**
      * 总金额 整笔采购订单，金额总计
      */
     @TableField(TOTALAMOUNT)
     private BigDecimal totalAmount;
-    
+
     /**
      * 商品总计种类 整笔采购订单，sku的计数，不重复
      */
     @TableField(SKUKINDCNT)
     private Integer skuKindCnt;
-    
+
     /**
      * 商品总计数量 整笔采购订单，订货数量汇总
      */
     @TableField(SKUCNT)
     private Integer skuCnt;
-    
+
     /**
      * 备注
      */
     @TableField(MEMO)
     private String memo;
-    
+
     /**
      * 是否紧急 0:否 1:是
      */
     @TableField(ISURGENT)
     private Integer isUrgent;
-    
+
     /**
      * 收发票地址id
      */
     @TableField(AGENCYADDRESSID)
     private Integer agencyAddressId;
-    
+
     /**
      * 国家ID
      */
     @TableField(COUNTRYID)
     private Integer countryId;
-    
+
     /**
      * 国家名称
      */
     @TableField(COUNTRYNAME)
     private String countryName;
-    
+
     /**
      * 省份ID
      */
     @TableField(PROVINCEID)
     private Integer provinceId;
-    
+
     /**
      * 省份名称
      */
     @TableField(PROVINCENAME)
     private String provinceName;
-    
+
     /**
      * 城市ID
      */
     @TableField(CITYID)
     private Integer cityId;
-    
+
     /**
      * 城市名称
      */
     @TableField(CITYNAME)
     private String cityName;
-    
+
     /**
      * 区ID
      */
     @TableField(COUNTYID)
     private Integer countyId;
-    
+
     /**
      * 区名称
      */
     @TableField(COUNTYNAME)
     private String countyName;
-    
+
     /**
      * 详细地址
      */
     @TableField(ADDRESS)
     private String address;
-    
+
     /**
      * 收货人姓名
      */
     @TableField(DELIVERNAME)
     private String deliverName;
-    
+
     /**
      * 收货人手机
      */
     @TableField(DELIVERMOBILE)
     private String deliverMobile;
-    
+
     /**
      * 固定电话
      */
     @TableField(DELIVERPHONE)
     private String deliverPhone;
-    
+
     /**
      * 邮编1
      */
     @TableField(POSTCODE)
     private String postCode;
-    
+
     /**
      * 经度
      */
     @TableField(LONGITUDE)
     private String longitude;
-    
+
     /**
      * 纬度
      */
     @TableField(LATITUDE)
     private String latitude;
-    
+
     /**
      * 来源类型 1.人工创建 2.下级机构上推 3.历史订单复制 4.垃圾草稿复制 5.赠品 6.换货
      */
     @TableField(SOURCETYP)
     private Integer sourceTyp;
-    
+
     /**
      * 订单提交人
      */
     @TableField(COMMITOR)
     private String commitor;
-    
+
     /**
      * 订单提交时间
      */
     @TableField(COMMITTIME)
     private Date commitTime;
-    
+
     /**
      * 创建人
      */
     @TableField(CREATOR)
     private String creator;
-    
+
     /**
      * 修改人
      */
     @TableField(EDITOR)
     private String editor;
-    
+
     /**
      * 创建时间
      */
     @TableField(CREATEDTIME)
     private Date createdTime;
-    
+
     /**
      * 更新时间
      */
     @TableField(UPDATEDTIME)
     private Date updatedTime;
-    
+
     /**
      * 发票类型：po_receipt->com_system
      */
     @TableField(RECEIPT)
     private String receipt;
-    
+
     /**
      * 优惠金额
      */
     @TableField(DELPROMOTION)
     private BigDecimal delPromotion;
-    
+
     /**
      * 应付金额
      */
     @TableField(REALAMOUNT)
     private BigDecimal realAmount;
-    
+
     /**
      * 账期金额
      */
     @TableField(CREDITAMOUT)
     private BigDecimal creditAmout;
-    
+
     /**
      * 草稿补货类型 0采购草稿 1补货草稿
      */
     @TableField(REPLENISHMENTTYPE)
     private Integer replenishmentType;
-    
+
     /**
      * 运费金额
      */
     @TableField(FREIGHT)
     private BigDecimal freight;
-    
+
     /**
      * 补货订单是否关联采购订单：0不关联；1关联
      */
     @TableField(ISRELATION)
     private Integer isRelation;
-    
+
     /**
      * 活动优惠
      */
     @TableField(ACTIVEPRICE)
     private BigDecimal activePrice;
-    
+
     /**
      * 换货商品价值
      */
     @TableField(BARTER_VALUE)
     private BigDecimal barterValue;
-    
+
     /**
      * 商品优惠备注
      */
     @TableField(PROMOTIONSNAPSHOT)
     private String promotionSnapshot;
-    
+
     /**
      * 满返活动备注
      */
     @TableField(ACTIVESNAPSHOT)
     private String activeSnapshot;
-    
+
     /**
      * 备注状态：0未创建；1处理中；2已完成
      */
@@ -312,7 +313,6 @@ public class PoOrdermasterEntity extends AbstractEntity {
     private Integer remarkStatus;
 
 
-
     /**
      * 自增长
      */

src/main/java/com/jarvis/dataCenter/entity/prod/PoSupliersmasterEntity.java

@@ -8,6 +8,7 @@ import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 import lombok.Data;
 
 import java.util.Date;
+
 /**
  * <p>
  * 供应商主表 ENTITY
@@ -21,397 +22,397 @@ import java.util.Date;
 public class PoSupliersmasterEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      * 自增长
      */
     @TableId(value = ID, type = IdType.AUTO)
     private Integer id;
-    
+
     /**
      * 供应商抬头
      */
     @TableField(SUPLIERSNAME)
     private String supliersName;
-    
+
     /**
      * 供应商抬头(简称) 抬头简称，供显示供应商抬头用
      */
     @TableField(SUPLIERSSHORTNAME)
     private String supliersShortName;
-    
+
     /**
      * 供应商类型 基础档案设置 com_sysItem->itemGpCode = 'po_supliers_typ'
      */
     @TableField(SUPLIERSTYPE)
     private String supliersType;
-    
+
     /**
      * 上级供应商id
      */
     @TableField(PARENTSUPLIERSID)
     private Integer parentsupliersId;
-    
+
     /**
      * 供应商编号
      */
     @TableField(SUPLIERSCODE)
     private String supliersCode;
-    
+
     /**
      * 供应商内部编号
      */
     @TableField(INSIDECODE)
     private String insideCode;
-    
+
     /**
      * 供应商等级
      */
     @TableField(LEVEL)
     private Integer level;
-    
+
     /**
      * 是否使用平台仓库 0：否 1：是
      */
     @TableField(USE_WHS_SERVICE)
     private Integer useWhsService;
-    
+
     /**
      * 供应商系统类型，基础档案设置
      */
     @TableField(SUPLIERSSYSTYPE)
     private String supliersSysType;
-    
+
     /**
      * 法人姓名
      */
     @TableField(LEGALPERSON)
     private String legalPerson;
-    
+
     /**
      * 法人身份证
      */
     @TableField(IDCARD)
     private String idCard;
-    
+
     /**
      * 国家ID
      */
     @TableField(COUNTRYID)
     private Integer countryId;
-    
+
     /**
      * 国家名称
      */
     @TableField(COUNTRYNAME)
     private String countryName;
-    
+
     /**
      * 省份ID
      */
     @TableField(PROVINCEID)
     private Integer provinceId;
-    
+
     /**
      * 省份名称
      */
     @TableField(PROVINCENAME)
     private String provinceName;
-    
+
     /**
      * 城市ID
      */
     @TableField(CITYID)
     private Integer cityId;
-    
+
     /**
      * 城市名称
      */
     @TableField(CITYNAME)
     private String cityName;
-    
+
     /**
      * 区ID
      */
     @TableField(COUNTYID)
     private Integer countyId;
-    
+
     /**
      * 区名称
      */
     @TableField(COUNTYNAME)
     private String countyName;
-    
+
     /**
      * 详细地址
      */
     @TableField(ADDRESS)
     private String address;
-    
+
     /**
      * 邮编
      */
     @TableField(POSTCODE)
     private String postCode;
-    
+
     /**
      * 经度
      */
     @TableField(LONGITUDE)
     private String longitude;
-    
+
     /**
      * 纬度
      */
     @TableField(LATITUDE)
     private String latitude;
-    
+
     /**
      * 是否标经纬度 0：否 1：是
      */
     @TableField(LONLATFLG)
     private Integer lonLatFlg;
-    
+
     /**
      * 主联系人姓名
      */
     @TableField(CONTACTS)
     private String contacts;
-    
+
     /**
      * 主联系人手机
      */
     @TableField(MOBILE)
     private String mobile;
-    
+
     /**
      * 固定电话区号
      */
     @TableField(AREACODE)
     private String areaCode;
-    
+
     /**
      * 固定电话
      */
     @TableField(TELPHONE)
     private String telPhone;
-    
+
     /**
      * 主联系人邮箱
      */
     @TableField(MAIL)
     private String mail;
-    
+
     /**
      * 传真区号
      */
     @TableField(FAXCODE)
     private String faxCode;
-    
+
     /**
      * 传真电话
      */
     @TableField(FAXPHONE)
     private String faxPhone;
-    
+
     /**
      * 税务登记证号
      */
     @TableField(TAXRCCODE)
     private String taxRCCode;
-    
+
     /**
      * 组织机构代码证号,营业执照上的三证合一代码(做唯一校验)
      */
     @TableField(CREDITCODE)
     private String creditCode;
-    
+
     /**
      * 成立日期
      */
     @TableField(ESTDATE)
     private Date estDate;
-    
+
     /**
      * 营业执照编号
      */
     @TableField(BUSINESSLICCODE)
     private String businessLicCode;
-    
+
     /**
      * 经营范围
      */
     @TableField(BUSINESSSCOPE)
     private String businessScope;
-    
+
     /**
      * 注册日期 格式到年月日
      */
     @TableField(REGISTDATE)
     private Date registDate;
-    
+
     /**
      * 注册结束日期 格式到年月日
      */
     @TableField(REGISTDATE_END)
     private Date registdateEnd;
-    
+
     /**
      * 医疗器械经营许可证编号
      */
     @TableField(MEDICALCODE)
     private String Medicalcode;
-    
+
     /**
      * 医疗器械经营范围
      */
     @TableField(MEDICALSCOPE)
     private String Medicalscope;
-    
+
     /**
      * 注册开始日期 格式到年月日
      */
     @TableField(MEDICALSCOPEDATE_BEGIN)
     private Date medicalscopedateBegin;
-    
+
     /**
      * 注册结束日期 格式到年月日
      */
     @TableField(MEDICALSCOPEDATE_END)
     private Date medicalscopedateEnd;
-    
+
     /**
      * 附加服务
      */
     @TableField(ADDSERVICES)
     private String addServices;
-    
+
     /**
      * 主要供货/服务地区
      */
     @TableField(SERVICEAREA)
     private String servicearea;
-    
+
     /**
      * 三证合一证照 内部图片存放路径(主路径设置+相对路径)
      */
     @TableField(PHOTOMAIN)
     private String photoMain;
-    
+
     /**
      * 税务登记证 内部图片存放路径
      */
     @TableField(PHOTOINFO1)
     private String photoInfo1;
-    
+
     /**
      * 组织机构代码证 内部图片存放路径
      */
     @TableField(PHOTOINFO2)
     private String photoInfo2;
-    
+
     /**
      * 营业执照信息 内部图片存放路径
      */
     @TableField(PHOTOINFO3)
     private String photoInfo3;
-    
+
     /**
      * 医疗器械经营范围内信息 内部图片存放路径
      */
     @TableField(PHOTOINFO4)
     private String photoInfo4;
-    
+
     /**
      * 预留1
      */
     @TableField(RESERVEI)
     private String reservei;
-    
+
     /**
      * 预留2
      */
     @TableField(RESERVEII)
     private String reserveii;
-    
+
     /**
      * 显示排序
      */
     @TableField(ROW_NUM)
     private Integer rowNum;
-    
+
     /**
      * 状态 0：禁用(拉黑) 1：启用
      */
     @TableField(USEFLG)
     private Integer useFlg;
-    
+
     /**
      * 备注
      */
     @TableField(MEMO)
     private String memo;
-    
+
     /**
      * 创建人
      */
     @TableField(CREATOR)
     private String creator;
-    
+
     /**
      * 修改人
      */
     @TableField(EDITOR)
     private String editor;
-    
+
     /**
      * 创建时间
      */
     @TableField(CREATEDTIME)
     private Date createdTime;
-    
+
     /**
      * 更新时间
      */
     @TableField(UPDATEDTIME)
     private Date updatedTime;
-    
+
     /**
      * 定价方式 1分区定价 2客户分类定价 默认无
      */
     @TableField(PRICEOPT)
     private Integer priceOpt;
-    
+
     /**
      * 是否线下由平台代收  1：是 0：否
      */
     @TableField(ISJWS)
     private Integer isjws;
-    
+
     /**
      * 公司账户名
      */
     @TableField(COMPANYNAME)
     private String companyName;
-    
+
     /**
      * 开户行
      */
     @TableField(BANK)
     private String bank;
-    
+
     /**
      * 账号
      */
     @TableField(ACCNUM)
     private String accNum;
-    
+
     /**
      * 供应商签约类型 0 签约 1 私有
      */
     @TableField(SUPLIERSIGNTYPE)
     private Integer suplierSignType;
-    
+
     /**
      * 供应商来源：0线上供应商；1线下供应商
      */
@@ -419,7 +420,6 @@ public class PoSupliersmasterEntity extends AbstractEntity {
     private Integer supplierSource;
 
 
-
     /**
      * 自增长
      */

src/main/java/com/jarvis/dataCenter/entity/prod/SoOrderdetailEntity.java

@@ -9,9 +9,10 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
+
 /**
  * <p>
- *  ENTITY
+ * ENTITY
  * </p>
  *
  * @author jinzhaopo
@@ -22,235 +23,235 @@ import java.util.Date;
 public class SoOrderdetailEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      * 自增长
      */
     @TableId(value = ID, type = IdType.AUTO)
     private Integer id;
-    
+
     /**
      * 销售订单编号
      */
     @TableField(ORDERMASTERCODE)
     private String orderMasterCode;
-    
+
     /**
      * 发货单编号 SO+2位年+2位月+2位日+4位流水+2位流水（已作废）
      */
     @TableField(INVOICECODE)
     private String invoiceCode;
-    
+
     /**
      * sku编号
      */
     @TableField(SKUCODE)
     private String skuCode;
-    
+
     /**
      * 单价
      */
     @TableField(PRICE)
     private BigDecimal price;
-    
+
     /**
      * 订货数量
      */
     @TableField(ORDERCNT)
     private Integer orderCnt;
-    
+
     /**
      * 预计发货数量（已作废）
      */
     @TableField(TEMPCNT)
     private Integer tempCnt;
-    
+
     /**
      * 发货数量
      */
     @TableField(DELIVERYCNT)
     private Integer deliveryCnt;
-    
+
     /**
      * 收货数量
      */
     @TableField(RECEIVECNT)
     private Integer receiveCnt;
-    
+
     /**
      * 缺货数量
      */
     @TableField(OUTAGE_QUANTITY)
     private Integer outageQuantity;
-    
+
     /**
      * 取消数量
      */
     @TableField(REJECTED_QUANTITY)
     private Integer rejectedQuantity;
-    
+
     /**
      * 已处理数量
      */
     @TableField(PENDINGCNT)
     private Integer pendingCnt;
-    
+
     /**
      * 补货数量
      */
     @TableField(REDELIVERY_QUANTITY)
     private Integer redeliveryQuantity;
-    
+
     /**
      * 缺货售后数量
      */
     @TableField(CS_STOCKOUT_CNT)
     private Integer csStockoutCnt;
-    
+
     /**
      * 待处理售后数量
      */
     @TableField(CS_PENDING_CNT)
     private Integer csPendingCnt;
-    
+
     /**
      * 待收货售后数量
      */
     @TableField(CS_DELIVERY_CNT)
     private Integer csDeliveryCnt;
-    
+
     /**
      * 已完成售后数量
      */
     @TableField(CS_RECEIVE_CNT)
     private Integer csReceiveCnt;
-    
+
     /**
      * 备注
      */
     @TableField(MEMO)
     private String memo;
-    
+
     /**
      * 是否关闭
      */
     @TableField(ISCLOSE)
     private Integer isClose;
-    
+
     /**
      * 售后单号
      */
     @TableField(CSORDERCODE)
     private String csOrderCode;
-    
+
     /**
      * 补货订单和采购订单互相关联的销售单号
      */
     @TableField(RELATION_SO_CODE)
     private String relationSoCode;
-    
+
     /**
      * 创建人
      */
     @TableField(CREATOR)
     private String creator;
-    
+
     /**
      * 修改人
      */
     @TableField(EDITOR)
     private String editor;
-    
+
     /**
      * 创建时间
      */
     @TableField(CREATEDTIME)
     private Date createdTime;
-    
+
     /**
      * 更新时间
      */
     @TableField(UPDATEDTIME)
     private Date updatedTime;
-    
+
     /**
      * 促销分摊金额
      */
     @TableField(PROPRICE)
     private BigDecimal proPrice;
-    
+
     /**
      * 促销标记 0:不显示 1:显示
      */
     @TableField(PROTYPE)
     private Integer proType;
-    
+
     /**
      * 补货订单和采购订单互相关联的发货单号
      */
     @TableField(RELATIONINVOICECODE)
     private String relationInvoiceCode;
-    
+
     /**
      * 客服备注
      */
     @TableField(CUSTOMERSERVICEREMARK)
     private String customerServiceRemark;
-    
+
     /**
      * bus_promotionmaster->id, 促销活动主表Id
      */
     @TableField(PROMOTIONID)
     private Integer promotionId;
-    
+
     /**
      * 优惠券分摊金额
      */
     @TableField(PROMOTIONPRICE)
     private BigDecimal promotionPrice;
-    
+
     /**
      * 商品优惠明细备注
      */
     @TableField(PROMOTIONREMARK)
     private String promotionRemark;
-    
+
     /**
      * 换货商品价值
      */
     @TableField(BARTER_VALUE)
     private BigDecimal barterValue;
-    
+
     /**
      * 充值卡分摊金额
      */
     @TableField(RECHARGECARDPRICE)
     private BigDecimal rechargeCardPrice;
-    
+
     /**
      * 商品优惠明细备注
      */
     @TableField(PROMOTIONSNAPSHOT)
     private String promotionSnapshot;
-    
+
     /**
      * 新发货数据迁移脚本标记(so单标记)
      */
     @TableField(RECOVER_MEMO)
     private String recoverMemo;
-    
+
     /**
      * 新发货数据迁移脚本标记(详情关闭标记)
      */
     @TableField(RECOVER_CLOSE)
     private String recoverClose;
-    
+
     /**
      * 新发货数据迁移脚本标记(重复单据合并)
      */
     @TableField(REAPT_FLAG)
     private String reaptFlag;
-    
+
     /**
      * 新发货数据迁移脚本标记(新增详情备注)
      */
@@ -258,7 +259,6 @@ public class SoOrderdetailEntity extends AbstractEntity {
     private String newDetailFlag;
 
 
-
     /**
      * 自增长
      */

src/main/java/com/jarvis/dataCenter/entity/prod/SoOrdermasterEntity.java

@@ -9,9 +9,10 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
+
 /**
  * <p>
- *  ENTITY
+ * ENTITY
  * </p>
  *
  * @author jinzhaopo
@@ -22,349 +23,349 @@ import java.util.Date;
 public class SoOrdermasterEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      * 自增长
      */
     @TableId(value = ID, type = IdType.AUTO)
     private Integer id;
-    
+
     /**
      * 销售订单编号
      */
     @TableField(ORDERMASTERCODE)
     private String orderMasterCode;
-    
+
     /**
      * 上级采购主订单code
      */
     @TableField(POORDERMASTERCODE)
     private String poOrderMasterCode;
-    
+
     /**
      * 供应商机构id
      */
     @TableField(SUPLIERID)
     private Integer suplierId;
-    
+
     /**
      * 收货机构id
      */
     @TableField(RECEIVEAGENCYID)
     private Integer receiveAgencyId;
-    
+
     /**
      * 下单机构id
      */
     @TableField(AGENCYID)
     private Integer agencyId;
-    
+
     /**
      * 20待支付、30待处理、35取消、40待发货、60已发货、70已完成、80缺货
      */
     @TableField(ORDERSTATUS)
     private Integer orderStatus;
-    
+
     /**
      * 处理状态 0未处理、40已处理
      */
     @TableField(PROCESSSTATUS)
     private Integer processStatus;
-    
+
     /**
      * 挂起状态：0正常, 1挂起
      */
     @TableField(LOCKSTATUS)
     private Integer lockStatus;
-    
+
     /**
      * 0:未支付，30:已支付，31部分支付，35已取消
      */
     @TableField(PAYSTATUS)
     private Integer payStatus;
-    
+
     /**
      * 销售订单主状态 0未发货、51部分发货、50全部发货
      */
     @TableField(ISSUANCESTATUS)
     private Integer issuanceStatus;
-    
+
     /**
      * 0未收货、61部分收货、70全部收货
      */
     @TableField(RECEIVESTATUS)
     private Integer receiveStatus;
-    
+
     /**
      * 收款信息
      */
     @TableField(RECEIVABLESINFO)
     private String receivablesInfo;
-    
+
     /**
      * 收款时间 收款时间=客户付款时间，界面显示为【销售订单生成时间】
      */
     @TableField(RECEIVABLESTIME)
     private Date receivablesTime;
-    
+
     /**
      * 处理时间
      */
     @TableField(PROCESSTIME)
     private Date processTime;
-    
+
     /**
      * 处理人
      */
     @TableField(PROCESSER)
     private String processer;
-    
+
     /**
      * 销售订单金额 整笔销售订单，金额总计
      */
     @TableField(TOTALAMOUNT)
     private BigDecimal totalAmount;
-    
+
     /**
      * 商品种类 整笔销售订单，sku的计数，不重复
      */
     @TableField(SKUKINDCNT)
     private Integer skuKindCnt;
-    
+
     /**
      * 商品数量 整笔销售订单，订货数量汇总
      */
     @TableField(SKUCNT)
     private Integer skuCnt;
-    
+
     /**
      * 备注
      */
     @TableField(MEMO)
     private String memo;
-    
+
     /**
      * 收发票地址id
      */
     @TableField(AGENCYADDRESSID)
     private Integer agencyAddressId;
-    
+
     /**
      * 国家ID
      */
     @TableField(COUNTRYID)
     private Integer countryId;
-    
+
     /**
      * 国家名称
      */
     @TableField(COUNTRYNAME)
     private String countryName;
-    
+
     /**
      * 省份ID
      */
     @TableField(PROVINCEID)
     private Integer provinceId;
-    
+
     /**
      * 省份名称
      */
     @TableField(PROVINCENAME)
     private String provinceName;
-    
+
     /**
      * 城市ID
      */
     @TableField(CITYID)
     private Integer cityId;
-    
+
     /**
      * 城市名称
      */
     @TableField(CITYNAME)
     private String cityName;
-    
+
     /**
      * 区ID
      */
     @TableField(COUNTYID)
     private Integer countyId;
-    
+
     /**
      * 区名称
      */
     @TableField(COUNTYNAME)
     private String countyName;
-    
+
     /**
      * 详细地址
      */
     @TableField(ADDRESS)
     private String address;
-    
+
     /**
      * 收件人姓名
      */
     @TableField(DELIVERNAME)
     private String deliverName;
-    
+
     /**
      * 收件人手机
      */
     @TableField(DELIVERMOBILE)
     private String deliverMobile;
-    
+
     /**
      * 固定电话
      */
     @TableField(DELIVERPHONE)
     private String deliverPhone;
-    
+
     /**
      * 邮编
      */
     @TableField(POSTCODE)
     private String postCode;
-    
+
     /**
      * 经度
      */
     @TableField(LONGITUDE)
     private String longitude;
-    
+
     /**
      * 纬度
      */
     @TableField(LATITUDE)
     private String latitude;
-    
+
     /**
      * 支付人，支付时记录
      */
     @TableField(PAYER)
     private String payer;
-    
+
     /**
      * 支付时记录
      */
     @TableField(PAYTIME)
     private Date payTime;
-    
+
     /**
      * 创建人
      */
     @TableField(CREATOR)
     private String creator;
-    
+
     /**
      * 修改人
      */
     @TableField(EDITOR)
     private String editor;
-    
+
     /**
      * 创建时间
      */
     @TableField(CREATEDTIME)
     private Date createdTime;
-    
+
     /**
      * 更新时间
      */
     @TableField(UPDATEDTIME)
     private Date updatedTime;
-    
+
     /**
      * 是否紧急 0:否 1:是
      */
     @TableField(ISURGENT)
     private Integer isUrgent;
-    
+
     /**
      * 0：线下支付，1:线上, 2:无
      */
     @TableField(PAYSTYLE)
     private Integer paystyle;
-    
+
     /**
      * 0线下支付；1联动支付；2银行卡；3微信；4支付宝；5账户余额; 6.无
      */
     @TableField(PAY_TYPE)
     private Integer payType;
-    
+
     /**
      * 订单来源类型: 1.人工创建 2.下级机构上推 3.智能柜订单4.寄售订单
      */
     @TableField(SOURCETYPE)
     private Integer sourceType;
-    
+
     /**
      * 优惠金额
      */
     @TableField(PROMOTIONPRICE)
     private BigDecimal promotionPrice;
-    
+
     /**
      * 异常状态 0无异常，1申请缺货
      */
     @TableField(ERRORSTATUS)
     private Integer errorStatus;
-    
+
     /**
      * 申诉状态 0无申诉，1申诉申请，2申诉回复，3申诉完成
      */
     @TableField(APPEALSTATUS)
     private Integer appealStatus;
-    
+
     /**
      * 自营状态 0非自营，1自营
      */
     @TableField(SELFSUPPORT)
     private Integer selfSupport;
-    
+
     /**
      * 是否关闭：0不关闭；1关闭
      */
     @TableField(IS_CLOSE)
     private Integer isClose;
-    
+
     /**
      * 补货订单和采购订单互相关联的销售单号
      */
     @TableField(RELATION_SO_CODE)
     private String relationSoCode;
-    
+
     /**
      * 关联关闭的销售单
      */
     @TableField(RELATION_CLOSE_SO)
     private String relationCloseSo;
-    
+
     /**
      * 是否生成发货单：0不生成；1生成
      */
     @TableField(CREATE_DO)
     private Integer createDo;
-    
+
     /**
      * 订单类型：0采购订单；1补货订单
      */
     @TableField(ORDER_TYPE)
     private Integer orderType;
-    
+
     /**
      * 新发货数据处理标识历史订单；1：历史订单，0非历史订单
      */
     @TableField(HISTORY_CLOSE)
     private Integer historyClose;
-    
+
     /**
      * 数据迁移标记字段(新增拆出来的发货单)
      */
     @TableField(CREATE_FLAG)
     private String createFlag;
-    
+
     /**
      * 是否余额支付限制
      */
@@ -372,7 +373,6 @@ public class SoOrdermasterEntity extends AbstractEntity {
     private Integer hasPayLimit;
 
 
-
     /**
      * 自增长
      */

src/main/java/com/jarvis/dataCenter/entity/report/ReportAddressInfo.java

 package com.jarvis.dataCenter.entity.report;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 import lombok.Data;

src/main/java/com/jarvis/dataCenter/entity/report/ReportAgencyInfo.java

 package com.jarvis.dataCenter.entity.report;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 import lombok.Data;

src/main/java/com/jarvis/dataCenter/entity/report/ReportDoInfo.java

@@ -423,14 +423,12 @@ public class ReportDoInfo extends AbstractEntity {
     private Integer stockContainerversion;
 
 
-
-
     //-------------stock_allocation
 
     /**
      * 发货单id
      */
-    private Long  stockAllocationdeliveryOrderId;
+    private Long stockAllocationdeliveryOrderId;
 
     /**
      * 发货明细id
@@ -549,7 +547,6 @@ public class ReportDoInfo extends AbstractEntity {
     private Integer stockAllocationversion;
 
 
-
 //    //---------------licence
 //
 //

src/main/java/com/jarvis/dataCenter/entity/report/ReportInvoiceInfo.java

 package com.jarvis.dataCenter.entity.report;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 import lombok.Data;

src/main/java/com/jarvis/dataCenter/entity/warehouse/DeliveryLicenceEntity.java

 package com.jarvis.dataCenter.entity.warehouse;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
-
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 import lombok.Data;
 
-import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
+import java.util.Date;
+
 /**
  * <p>
- *  ENTITY
+ * ENTITY
  * </p>
  *
  * @author jinzhaopo
@@ -24,59 +22,58 @@ import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 public class DeliveryLicenceEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     @TableId(value = ID, type = IdType.AUTO)
     private Long id;
-    
+
     /**
      * 发货单号
      */
     @TableField(DO_CODE)
     private String doCode;
-    
+
     /**
      * 供应商id
      */
     @TableField(SUPPLIER_ID)
     private Long supplierId;
-    
+
     /**
      * 机构id
      */
     @TableField(AGENCY_ID)
     private Long agencyId;
-    
+
     /**
      * 集团id
      */
     @TableField(GROUP_ID)
     private Long groupId;
-    
+
     /**
      * 证照类型
      */
     @TableField(LICENCE_TYPE)
     private String licenceType;
-    
+
     /**
      * 产品id
      */
     @TableField(PRODUCT_ID)
     private Long productId;
-    
+
     @TableField(CREATED_TIME)
     private Date createdTime;
-    
+
     @TableField(UPDATED_TIME)
     private Date updatedTime;
-    
+
     @TableField(VERSION)
     private Integer version;
 
 
-
     /**
-     * 
+     *
      */
     public static final String ID = "id";
 
@@ -111,17 +108,17 @@ public class DeliveryLicenceEntity extends AbstractEntity {
     public static final String PRODUCT_ID = "product_id";
 
     /**
-     * 
+     *
      */
     public static final String CREATED_TIME = "created_time";
 
     /**
-     * 
+     *
      */
     public static final String UPDATED_TIME = "updated_time";
 
     /**
-     * 
+     *
      */
     public static final String VERSION = "version";
 

src/main/java/com/jarvis/dataCenter/entity/warehouse/DeliveryOrderDetailEntity.java

 package com.jarvis.dataCenter.entity.warehouse;
+
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
+import lombok.Data;
 
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
 
-import lombok.Data;
-
-import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 /**
  * <p>
  * 发货单详情 ENTITY
@@ -25,185 +23,184 @@ import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 public class DeliveryOrderDetailEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     @TableId(value = ID, type = IdType.AUTO)
     private Long id;
-    
+
     /**
      * 发货单id
      */
     @TableField(DELIVERY_ORDER_ID)
     private Long deliveryOrderId;
-    
+
     /**
      * po单号
      */
     @TableField(PO_CODE)
     private String poCode;
-    
+
     /**
      * so单号
      */
     @TableField(SO_CODE)
     private String soCode;
-    
+
     /**
      * 发货单号
      */
     @TableField(DO_CODE)
     private String doCode;
-    
+
     /**
      * sku编号
      */
     @TableField(SKU_CODE)
     private String skuCode;
-    
+
     /**
      * 供应商id
      */
     @TableField(SUPPLIER_ID)
     private Long supplierId;
-    
+
     /**
      * 供应商名称
      */
     @TableField(SUPPLIER_NAME)
     private String supplierName;
-    
+
     /**
      * 供应商简称
      */
     @TableField(SUPPLIER_SHORT_NAME)
     private String supplierShortName;
-    
+
     /**
      * 产品id
      */
     @TableField(PRODUCT_ID)
     private Long productId;
-    
+
     /**
      * 产品名称
      */
     @TableField(PRODUCT_NAME)
     private String productName;
-    
+
     /**
      * 规格id
      */
     @TableField(SPEC_ID)
     private Long specId;
-    
+
     /**
      * 规格名称
      */
     @TableField(SPEC_NAME)
     private String specName;
-    
+
     /**
      * 子规格名称
      */
     @TableField(SPEC_NAME_EXT)
     private String specNameExt;
-    
+
     /**
      * 销售单位
      */
     @TableField(SALES_UNIT)
     private String salesUnit;
-    
+
     /**
      * 品牌id
      */
     @TableField(BRAND_ID)
     private Long brandId;
-    
+
     /**
      * 物料品牌
      */
     @TableField(BRAND_NAME)
     private String brandName;
-    
+
     /**
      * 发货仓ID
      */
     @TableField(SUPPLIER_WAREHOUSE_ID)
     private Long supplierWarehouseId;
-    
+
     /**
      * 发货仓
      */
     @TableField(SUPPLIER_WAREHOUSE_NAME)
     private String supplierWarehouseName;
-    
+
     /**
      * 产商商品编码
      */
     @TableField(PRODUCER_PROD_CODE)
     private String producerProdCode;
-    
+
     /**
      * 客户商品编码
      */
     @TableField(CUSTOMER_PROD_CODE)
     private String customerProdCode;
-    
+
     /**
      * 供应商商品编码
      */
     @TableField(SUPPLIER_PROD_CODE)
     private String supplierProdCode;
-    
+
     /**
      * 期望发货数量
      */
     @TableField(EXPECT_QUANTITY)
     private BigDecimal expectQuantity;
-    
+
     /**
      * 缺货数量
      */
     @TableField(OUTAGE_QUANTITY)
     private BigDecimal outageQuantity;
-    
+
     /**
      * 实际发货数量
      */
     @TableField(ACTUAL_QUANTITY)
     private BigDecimal actualQuantity;
-    
+
     /**
      * 客户备注
      */
     @TableField(CUSTOMER_MEMO)
     private String customerMemo;
-    
+
     /**
      * 客服备注
      */
     @TableField(CUSTOMER_SERVICE_MEMO)
     private String customerServiceMemo;
-    
+
     /**
      * 0未拼团；1拼团中；2拼团完成；3 拼团失败
      */
     @TableField(GROUP_BUY_STATUS)
     private String groupBuyStatus;
-    
+
     @TableField(CREATED_TIME)
     private Date createdTime;
-    
+
     @TableField(UPDATED_TIME)
     private Date updatedTime;
-    
+
     @TableField(VERSION)
     private Integer version;
 
 
-
     /**
-     * 
+     *
      */
     public static final String ID = "id";
 
@@ -343,17 +340,17 @@ public class DeliveryOrderDetailEntity extends AbstractEntity {
     public static final String GROUP_BUY_STATUS = "group_buy_status";
 
     /**
-     * 
+     *
      */
     public static final String CREATED_TIME = "created_time";
 
     /**
-     * 
+     *
      */
     public static final String UPDATED_TIME = "updated_time";
 
     /**
-     * 
+     *
      */
     public static final String VERSION = "version";
 

src/main/java/com/jarvis/dataCenter/entity/warehouse/DeliveryOrderEntity.java

 package com.jarvis.dataCenter.entity.warehouse;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
-
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 import lombok.Data;
 
-import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
+import java.util.Date;
+
 /**
  * <p>
  * 发货单 ENTITY
@@ -24,269 +22,268 @@ import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 public class DeliveryOrderEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     @TableId(value = ID, type = IdType.AUTO)
     private Long id;
-    
+
     /**
      * 发货单编号
      */
     @TableField(CODE)
     private String code;
-    
+
     /**
      * 订单类型，NORMAL：普通发货单, CONSIGNMENT：寄售单, REPLENISHMENT：补货单,SMART_BOX: 智能柜
      */
     @TableField(TYPE)
     private String type;
-    
+
     /**
      * po编号
      */
     @TableField(PO_CODE)
     private String poCode;
-    
+
     /**
      * 物流公司id
      */
     @TableField(LOGISTICS_COMPANY_ID)
     private Long logisticsCompanyId;
-    
+
     /**
      * 物流单号
      */
     @TableField(LOGISTICS_CODE)
     private String logisticsCode;
-    
+
     /**
      * 发货日期
      */
     @TableField(DELIVERED_DATE)
     private Date deliveredDate;
-    
+
     /**
      * 发货单状态,WAIT：待发货，DELIVERED：已发货，RECEIVED：已收货，CLOSED：已关闭
      */
     @TableField(STATUS)
     private String status;
-    
+
     /**
      * 备注状态：0未创建；1处理中；2已完成
      */
     @TableField(REMARK_STATUS)
     private Integer remarkStatus;
-    
+
     /**
      * 发货仓库id
      */
     @TableField(WAREHOUSE_ID)
     private Long warehouseId;
-    
+
     /**
      * 归属供应商id
      */
     @TableField(SUPPLIER_ID)
     private Long supplierId;
-    
+
     /**
      * 归属供应商名称
      */
     @TableField(SUPPLIER_NAME)
     private String supplierName;
-    
+
     /**
      * 归属供应商简称
      */
     @TableField(SUPPLIER_SHORT_NAME)
     private String supplierShortName;
-    
+
     /**
      * 订货集团id
      */
     @TableField(PURCHASE_GROUP_ID)
     private Long purchaseGroupId;
-    
+
     /**
      * 订货集团
      */
     @TableField(PURCHASE_GROUP_NAME)
     private String purchaseGroupName;
-    
+
     /**
      * 订货集团简称
      */
     @TableField(PURCHASE_GROUP_SHORT_NAME)
     private String purchaseGroupShortName;
-    
+
     /**
      * 订货机构id
      */
     @TableField(PURCHASE_AGENCY_ID)
     private Long purchaseAgencyId;
-    
+
     /**
      * 订货机构
      */
     @TableField(PURCHASE_AGENCY_NAME)
     private String purchaseAgencyName;
-    
+
     /**
      * 订货机构简称
      */
     @TableField(PURCHASE_AGENCY_SHORT_NAME)
     private String purchaseAgencyShortName;
-    
+
     /**
      * 订货人
      */
     @TableField(PURCHASE_USER)
     private String purchaseUser;
-    
+
     /**
      * 订货人手机号
      */
     @TableField(PURCHASE_USER_MOBILE)
     private String purchaseUserMobile;
-    
+
     /**
      * 智能柜编号
      */
     @TableField(CABINET_ID)
     private String cabinetId;
-    
+
     /**
      * 收货机构id
      */
     @TableField(DELIVERY_AGENCY_ID)
     private Long deliveryAgencyId;
-    
+
     /**
      * 收货机构
      */
     @TableField(DELIVERY_AGENCY_NAME)
     private String deliveryAgencyName;
-    
+
     /**
      * 收货机构简称
      */
     @TableField(DELIVERY_AGENCY_SHORT_NAME)
     private String deliveryAgencyShortName;
-    
+
     /**
      * 收货地址id
      */
     @TableField(ADDRESS_ID)
     private Long addressId;
-    
+
     /**
      * 邮政编码
      */
     @TableField(POSTCODE)
     private String postcode;
-    
+
     /**
      * 国家
      */
     @TableField(COUNTRY_NAME)
     private String countryName;
-    
+
     /**
      * 省份
      */
     @TableField(PROVINCE_NAME)
     private String provinceName;
-    
+
     /**
      * 城市
      */
     @TableField(CITY_NAME)
     private String cityName;
-    
+
     /**
      * 区
      */
     @TableField(DISTRICT_NAME)
     private String districtName;
-    
+
     /**
      * 详细地址
      */
     @TableField(ADDRESS)
     private String address;
-    
+
     /**
      * 创建用户
      */
     @TableField(CREATED_USER)
     private String createdUser;
-    
+
     /**
      * 收货人
      */
     @TableField(RECEIVER_NAME)
     private String receiverName;
-    
+
     /**
      * 收货人手机
      */
     @TableField(RECEIVER_MOBILE)
     private String receiverMobile;
-    
+
     /**
      * 收货人电话
      */
     @TableField(RECEIVER_PHONE)
     private String receiverPhone;
-    
+
     /**
      * 发货人
      */
     @TableField(DELIVERY_USER)
     private String deliveryUser;
-    
+
     /**
      * 关联补货单
      */
     @TableField(REFER_DO_CODE)
     private String referDoCode;
-    
+
     /**
      * 合并后的发货单号
      */
     @TableField(MERGE_DO_CODE)
     private String mergeDoCode;
-    
+
     /**
      * 通知状态:Y已通知,N未通知
      */
     @TableField(NOTICE_STATUS)
     private String noticeStatus;
-    
+
     /**
      * 备注
      */
     @TableField(MEMO)
     private String memo;
-    
+
     /**
      * 出库备注
      */
     @TableField(CHECK_OUT_MEMO)
     private String checkOutMemo;
-    
+
     @TableField(CREATED_TIME)
     private Date createdTime;
-    
+
     @TableField(UPDATED_TIME)
     private Date updatedTime;
-    
+
     @TableField(VERSION)
     private Integer version;
 
 
-
     /**
-     * 
+     *
      */
     public static final String ID = "id";
 
@@ -496,17 +493,17 @@ public class DeliveryOrderEntity extends AbstractEntity {
     public static final String CHECK_OUT_MEMO = "check_out_memo";
 
     /**
-     * 
+     *
      */
     public static final String CREATED_TIME = "created_time";
 
     /**
-     * 
+     *
      */
     public static final String UPDATED_TIME = "updated_time";
 
     /**
-     * 
+     *
      */
     public static final String VERSION = "version";
 

src/main/java/com/jarvis/dataCenter/entity/warehouse/DeliveryOrderReceiptEntity.java

 package com.jarvis.dataCenter.entity.warehouse;
+
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
+import lombok.Data;
 
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
 
-import lombok.Data;
-
-import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 /**
  * <p>
  * 收货记录表 ENTITY
@@ -25,101 +23,100 @@ import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 public class DeliveryOrderReceiptEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     @TableId(value = ID, type = IdType.AUTO)
     private Long id;
-    
+
     /**
      * 收货记录编码
      */
     @TableField(RR_CODE)
     private String rrCode;
-    
+
     /**
      * 发货单号
      */
     @TableField(DO_CODE)
     private String doCode;
-    
+
     /**
      * 销售单号
      */
     @TableField(SO_CODE)
     private String soCode;
-    
+
     /**
      * 采购单号
      */
     @TableField(PO_CODE)
     private String poCode;
-    
+
     /**
      * Sku编码
      */
     @TableField(SKU_CODE)
     private String skuCode;
-    
+
     /**
      * 规格ID
      */
     @TableField(SPEC_ID)
     private Long specId;
-    
+
     /**
      * 批号
      */
     @TableField(BATCH_CODE)
     private String batchCode;
-    
+
     /**
      * 序列号
      */
     @TableField(SERIAL_CODE)
     private String serialCode;
-    
+
     /**
      * 寄售唯一码
      */
     @TableField(RF_ID)
     private String rfId;
-    
+
     /**
      * 已收货数量
      */
     @TableField(RECEIPT_QUANTITY)
     private BigDecimal receiptQuantity;
-    
+
     /**
      * 收货人
      */
     @TableField(RECEIVE_USER_NAME)
     private String receiveUserName;
-    
+
     /**
      * 收货人手机号
      */
     @TableField(RECEIVE_USER_MOBILE)
     private String receiveUserMobile;
-    
+
     /**
      * 备注
      */
     @TableField(MEMO)
     private String memo;
-    
+
     @TableField(CREATED_TIME)
     private Date createdTime;
-    
+
     @TableField(UPDATED_TIME)
     private Date updatedTime;
-    
+
     @TableField(VERSION)
     private Integer version;
 
 
-
     /**
-     * 
+     *
      */
     public static final String ID = "id";
 
@@ -189,17 +186,17 @@ public class DeliveryOrderReceiptEntity extends AbstractEntity {
     public static final String MEMO = "memo";
 
     /**
-     * 
+     *
      */
     public static final String CREATED_TIME = "created_time";
 
     /**
-     * 
+     *
      */
     public static final String UPDATED_TIME = "updated_time";
 
     /**
-     * 
+     *
      */
     public static final String VERSION = "version";
 

src/main/java/com/jarvis/dataCenter/entity/warehouse/StockAllocationEntity.java

 package com.jarvis.dataCenter.entity.warehouse;
+
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
+import lombok.Data;
 
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
-
-import lombok.Data;
 
-import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 /**
  * <p>
  * 库存分配记录表 ENTITY
@@ -25,161 +23,160 @@ import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 public class StockAllocationEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     @TableId(value = ID, type = IdType.AUTO)
     private Long id;
-    
+
     /**
      * 发货单id
      */
     @TableField(DELIVERY_ORDER_ID)
     private Long deliveryOrderId;
-    
+
     /**
      * 发货明细id
      */
     @TableField(DELIVERY_DETAIL_ID)
     private Long deliveryDetailId;
-    
+
     /**
      * 仓库id 为0是私有供应商的分配记录
      */
     @TableField(WAREHOUSE_ID)
     private Long warehouseId;
-    
+
     /**
      * 库位id 为0是私有供应商的分配记录
      */
     @TableField(CONTAINER_ID)
     private Long containerId;
-    
+
     /**
      * 库存id 为0是私有供应商的分配记录
      */
     @TableField(STOCK_ID)
     private Long stockId;
-    
+
     /**
      * sku编号
      */
     @TableField(SKU_CODE)
     private String skuCode;
-    
+
     /**
      * 批次号
      */
     @TableField(BATCH_CODE)
     private String batchCode;
-    
+
     /**
      * 序列号
      */
     @TableField(SERIAL_CODE)
     private String serialCode;
-    
+
     /**
      * 寄售唯一码
      */
     @TableField(RF_ID)
     private String rfId;
-    
+
     /**
      * 到期日
      */
     @TableField(EXPIRY_DATE)
     private Date expiryDate;
-    
+
     /**
      * 是否长期有效 是:Y,否:N
      */
     @TableField(ETERNAL_ITEM)
     private String eternalItem;
-    
+
     /**
      * 分配数量
      */
     @TableField(QUANTITY)
     private BigDecimal quantity;
-    
+
     /**
      * 分配状态，UN_CHECK_OUT：未发货，CHECK_OUT：已发货，CANCELED：已取消
      */
     @TableField(STATUS)
     private String status;
-    
+
     @TableField(CREATED_TIME)
     private Date createdTime;
-    
+
     /**
      * 级别
      */
     @TableField(LEVEL)
     private String level;
-    
+
     /**
      * 消毒灭菌日期
      */
     @TableField(STERILIZATION_TIME)
     private Date sterilizationTime;
-    
+
     /**
      * 型号
      */
     @TableField(MODEL)
     private String model;
-    
+
     /**
      * 生产厂商
      */
     @TableField(MANUFACTURER)
     private String manufacturer;
-    
+
     /**
      * 材质
      */
     @TableField(MATERIAL_QUALITY)
     private String materialQuality;
-    
+
     /**
      * 医用耗材类别
      */
     @TableField(MEDICAL_CATEGORY)
     private String medicalCategory;
-    
+
     /**
      * 功能
      */
     @TableField(ACTION)
     private String action;
-    
+
     /**
      * 用途
      */
     @TableField(PURPOSE)
     private String purpose;
-    
+
     /**
      * 注册证类别
      */
     @TableField(REGISTRATION_CATEGORY)
     private String registrationCategory;
-    
+
     /**
      * 风险级别
      */
     @TableField(RISK_LEVEL)
     private String riskLevel;
-    
+
     @TableField(UPDATED_TIME)
     private Date updatedTime;
-    
+
     @TableField(VERSION)
     private Integer version;
 
 
-
     /**
-     * 
+     *
      */
     public static final String ID = "id";
 
@@ -249,7 +246,7 @@ public class StockAllocationEntity extends AbstractEntity {
     public static final String STATUS = "status";
 
     /**
-     * 
+     *
      */
     public static final String CREATED_TIME = "created_time";
 
@@ -304,12 +301,12 @@ public class StockAllocationEntity extends AbstractEntity {
     public static final String RISK_LEVEL = "risk_level";
 
     /**
-     * 
+     *
      */
     public static final String UPDATED_TIME = "updated_time";
 
     /**
-     * 
+     *
      */
     public static final String VERSION = "version";
 

src/main/java/com/jarvis/dataCenter/entity/warehouse/StockContainerEntity.java

 package com.jarvis.dataCenter.entity.warehouse;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
-
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 import lombok.Data;
 
-import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
+import java.util.Date;
+
 /**
  * <p>
  * 库位表 ENTITY
@@ -24,59 +22,58 @@ import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 public class StockContainerEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     @TableId(value = ID, type = IdType.AUTO)
     private Long id;
-    
+
     /**
      * 仓库id
      */
     @TableField(WAREHOUSE_ID)
     private Long warehouseId;
-    
+
     /**
      * 名称
      */
     @TableField(NAME)
     private String name;
-    
+
     /**
      * 编号
      */
     @TableField(CODE)
     private String code;
-    
+
     /**
      * 容器类型
      */
     @TableField(CONTAINER_TYPE)
     private String containerType;
-    
+
     /**
      * 容量
      */
     @TableField(CAPACITY)
     private Integer capacity;
-    
+
     /**
      * 是否启用
      */
     @TableField(ENABLED)
     private String enabled;
-    
+
     @TableField(CREATED_TIME)
     private Date createdTime;
-    
+
     @TableField(UPDATED_TIME)
     private Date updatedTime;
-    
+
     @TableField(VERSION)
     private Integer version;
 
 
-
     /**
-     * 
+     *
      */
     public static final String ID = "id";
 
@@ -111,17 +108,17 @@ public class StockContainerEntity extends AbstractEntity {
     public static final String ENABLED = "enabled";
 
     /**
-     * 
+     *
      */
     public static final String CREATED_TIME = "created_time";
 
     /**
-     * 
+     *
      */
     public static final String UPDATED_TIME = "updated_time";
 
     /**
-     * 
+     *
      */
     public static final String VERSION = "version";
 

src/main/java/com/jarvis/dataCenter/entity/warehouse/WarehouseEntity.java

 package com.jarvis.dataCenter.entity.warehouse;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
-
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 import lombok.Data;
 
-import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
+import java.util.Date;
+
 /**
  * <p>
  * 仓库表 ENTITY
@@ -24,77 +22,76 @@ import com.jarvis.lib.common.mybatisplus.entity.AbstractEntity;
 public class WarehouseEntity extends AbstractEntity {
 
     private static final long serialVersionUID = 1L;
-    
+
     @TableId(value = ID, type = IdType.AUTO)
     private Long id;
-    
+
     /**
      * 名称
      */
     @TableField(NAME)
     private String name;
-    
+
     /**
      * 编号
      */
     @TableField(CODE)
     private String code;
-    
+
     /**
      * 锁定仓库
      */
     @TableField(LOCKED)
     private String locked;
-    
+
     /**
      * 出库排序
      */
     @TableField(CHECK_OUT_SORT)
     private Integer checkOutSort;
-    
+
     /**
      * 是否启用
      */
     @TableField(ENABLED)
     private String enabled;
-    
+
     /**
      * 联系人
      */
     @TableField(CONTACT)
     private String contact;
-    
+
     /**
      * 联系人
      */
     @TableField(USER_NAME)
     private String userName;
-    
+
     /**
      * 地址
      */
     @TableField(ADDRESS)
     private String address;
-    
+
     /**
      * 手机号
      */
     @TableField(MOBILE)
     private String mobile;
-    
+
     @TableField(CREATED_TIME)
     private Date createdTime;
-    
+
     @TableField(UPDATED_TIME)
     private Date updatedTime;
-    
+
     @TableField(VERSION)
     private Integer version;
 
 
-
     /**
-     * 
+     *
      */
     public static final String ID = "id";
 
@@ -144,17 +141,17 @@ public class WarehouseEntity extends AbstractEntity {
     public static final String MOBILE = "mobile";
 
     /**
-     * 
+     *
      */
     public static final String CREATED_TIME = "created_time";
 
     /**
-     * 
+     *
      */
     public static final String UPDATED_TIME = "updated_time";
 
     /**
-     * 
+     *
      */
     public static final String VERSION = "version";
 

src/main/java/com/jarvis/dataCenter/mapper/jws/InvoiceSignMapper.java

@@ -3,7 +3,6 @@ package com.jarvis.dataCenter.mapper.jws;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.jarvis.dataCenter.constants.DbConstants;
 import com.jarvis.dataCenter.entity.jws.InvoiceSignEntity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jarvis.lib.common.mybatisplus.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Select;
 

src/main/java/com/jarvis/dataCenter/mapper/prod/BusAgencyaddressMapper.java

@@ -3,7 +3,6 @@ package com.jarvis.dataCenter.mapper.prod;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.jarvis.dataCenter.constants.DbConstants;
 import com.jarvis.dataCenter.entity.prod.BusAgencyaddressEntity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jarvis.lib.common.mybatisplus.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Select;
 

src/main/java/com/jarvis/dataCenter/mapper/prod/BusAgencymasterMapper.java

@@ -3,7 +3,6 @@ package com.jarvis.dataCenter.mapper.prod;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.jarvis.dataCenter.constants.DbConstants;
 import com.jarvis.dataCenter.entity.prod.BusAgencymasterEntity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jarvis.lib.common.mybatisplus.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Select;
 

src/main/java/com/jarvis/dataCenter/mapper/prod/BusMerchandisemasterMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author jinzhaopo
@@ -18,6 +18,6 @@ import org.apache.ibatis.annotations.Select;
 public interface BusMerchandisemasterMapper extends IBaseMapper<BusMerchandisemasterEntity> {
 
     @Select("select max(id) from bus_merchandisemaster")
-     Long maxId();
+    Long maxId();
 
 }
\ No newline at end of file

src/main/java/com/jarvis/dataCenter/mapper/prod/BusProductspecMapper.java

@@ -7,7 +7,7 @@ import com.jarvis.lib.common.mybatisplus.mapper.IBaseMapper;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author jinzhaopo

src/main/java/com/jarvis/dataCenter/mapper/prod/CsOrderMapper.java

@@ -12,7 +12,8 @@ import com.jarvis.lib.common.mybatisplus.mapper.IBaseMapper;
  *
  * @author jinzhaopo
  * @since 2019-10-29
- */@DS(DbConstants.PROD)
+ */
+@DS(DbConstants.PROD)
 public interface CsOrderMapper extends IBaseMapper<CsOrderEntity> {
 
 }
\ No newline at end of file

src/main/java/com/jarvis/dataCenter/mapper/prod/PoCoupondetailMapper.java

@@ -12,7 +12,8 @@ import com.jarvis.lib.common.mybatisplus.mapper.IBaseMapper;
  *
  * @author jinzhaopo
  * @since 2019-10-23
- */@DS(DbConstants.PROD)
+ */
+@DS(DbConstants.PROD)
 public interface PoCoupondetailMapper extends IBaseMapper<PoCoupondetailEntity> {
 
 }
\ No newline at end of file

src/main/java/com/jarvis/dataCenter/mapper/prod/PoCouponmasterMapper.java

@@ -12,7 +12,8 @@ import com.jarvis.lib.common.mybatisplus.mapper.IBaseMapper;
  *
  * @author jinzhaopo
  * @since 2019-10-23
- */@DS(DbConstants.PROD)
+ */
+@DS(DbConstants.PROD)
 public interface PoCouponmasterMapper extends IBaseMapper<PoCouponmasterEntity> {
 
 }
\ No newline at end of file

src/main/java/com/jarvis/dataCenter/mapper/prod/PoOrdermasterMapper.java

@@ -7,12 +7,13 @@ import com.jarvis.lib.common.mybatisplus.mapper.IBaseMapper;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author jinzhaopo
  * @since 2019-10-22
- */@DS(DbConstants.PROD)
+ */
+@DS(DbConstants.PROD)
 public interface PoOrdermasterMapper extends IBaseMapper<PoOrdermasterEntity> {
 
 }
\ No newline at end of file

src/main/java/com/jarvis/dataCenter/mapper/prod/PoSupliersmasterMapper.java

@@ -12,7 +12,8 @@ import com.jarvis.lib.common.mybatisplus.mapper.IBaseMapper;
  *
  * @author jinzhaopo
  * @since 2019-10-22
- */@DS(DbConstants.PROD)
+ */
+@DS(DbConstants.PROD)
 public interface PoSupliersmasterMapper extends IBaseMapper<PoSupliersmasterEntity> {
 
 }
\ No newline at end of file

src/main/java/com/jarvis/dataCenter/mapper/prod/SoOrderdetailMapper.java

@@ -8,12 +8,13 @@ import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author jinzhaopo
  * @since 2019-10-22
- */@DS(DbConstants.PROD)
+ */
+@DS(DbConstants.PROD)
 public interface SoOrderdetailMapper extends IBaseMapper<SoOrderdetailEntity> {
 
     @Select("select max(id) from so_orderdetail")

src/main/java/com/jarvis/dataCenter/mapper/prod/SoOrdermasterMapper.java

@@ -7,12 +7,13 @@ import com.jarvis.lib.common.mybatisplus.mapper.IBaseMapper;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author jinzhaopo
  * @since 2019-10-22
- */@DS(DbConstants.PROD)
+ */
+@DS(DbConstants.PROD)
 public interface SoOrdermasterMapper extends IBaseMapper<SoOrdermasterEntity> {
 
 }
\ No newline at end of file

src/main/java/com/jarvis/dataCenter/mapper/report/ReportCsOrderInfoMapper.java

@@ -10,5 +10,5 @@ import com.jarvis.lib.common.mybatisplus.mapper.IBaseMapper;
  * @date 2019-10-30 10:18
  */
 @DS(DbConstants.REPORT)
-public interface ReportCsOrderInfoMapper  extends IBaseMapper<ReportCsOrderInfo> {
+public interface ReportCsOrderInfoMapper extends IBaseMapper<ReportCsOrderInfo> {
 }

src/main/java/com/jarvis/dataCenter/mapper/warehouse/DeliveryLicenceMapper.java

@@ -3,13 +3,11 @@ package com.jarvis.dataCenter.mapper.warehouse;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.jarvis.dataCenter.constants.DbConstants;
 import com.jarvis.dataCenter.entity.warehouse.DeliveryLicenceEntity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jarvis.lib.common.mybatisplus.mapper.IBaseMapper;
-import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author jinzhaopo

src/main/java/com/jarvis/dataCenter/mapper/warehouse/DeliveryOrderDetailMapper.java

@@ -3,7 +3,6 @@ package com.jarvis.dataCenter.mapper.warehouse;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.jarvis.dataCenter.constants.DbConstants;
 import com.jarvis.dataCenter.entity.warehouse.DeliveryOrderDetailEntity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jarvis.lib.common.mybatisplus.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Select;
 

src/main/java/com/jarvis/dataCenter/mapper/warehouse/DeliveryOrderMapper.java

@@ -3,7 +3,6 @@ package com.jarvis.dataCenter.mapper.warehouse;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.jarvis.dataCenter.constants.DbConstants;
 import com.jarvis.dataCenter.entity.warehouse.DeliveryOrderEntity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jarvis.lib.common.mybatisplus.mapper.IBaseMapper;
 
 /**

src/main/java/com/jarvis/dataCenter/mapper/warehouse/DeliveryOrderReceiptMapper.java

@@ -3,7 +3,6 @@ package com.jarvis.dataCenter.mapper.warehouse;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.jarvis.dataCenter.constants.DbConstants;
 import com.jarvis.dataCenter.entity.warehouse.DeliveryOrderReceiptEntity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jarvis.lib.common.mybatisplus.mapper.IBaseMapper;
 
 /**

src/main/java/com/jarvis/dataCenter/mapper/warehouse/StockAllocationMapper.java

@@ -3,7 +3,6 @@ package com.jarvis.dataCenter.mapper.warehouse;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.jarvis.dataCenter.constants.DbConstants;
 import com.jarvis.dataCenter.entity.warehouse.StockAllocationEntity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jarvis.lib.common.mybatisplus.mapper.IBaseMapper;
 
 /**

src/main/java/com/jarvis/dataCenter/mapper/warehouse/StockContainerMapper.java

@@ -3,7 +3,6 @@ package com.jarvis.dataCenter.mapper.warehouse;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.jarvis.dataCenter.constants.DbConstants;
 import com.jarvis.dataCenter.entity.warehouse.StockContainerEntity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jarvis.lib.common.mybatisplus.mapper.IBaseMapper;
 
 /**

src/main/java/com/jarvis/dataCenter/mapper/warehouse/WarehouseMapper.java

@@ -3,7 +3,6 @@ package com.jarvis.dataCenter.mapper.warehouse;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.jarvis.dataCenter.constants.DbConstants;
 import com.jarvis.dataCenter.entity.warehouse.WarehouseEntity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jarvis.lib.common.mybatisplus.mapper.IBaseMapper;
 
 /**

src/main/java/com/jarvis/dataCenter/runner/InitRunner.java

 package com.jarvis.dataCenter.runner;
 
-import com.google.code.or.OpenReplicator;
 import com.jarvis.common.redis.service.RedisService;
-import com.jarvis.commons.open.replicator.info.ColumnInfo;
-import com.jarvis.commons.open.replicator.keeper.TableInfoKeeper;
-import com.jarvis.dataCenter.entity.report.ReportInvoiceInfo;
-import com.jarvis.dataCenter.service.impl.report.ReportDoInfoServiceImpl;
-import com.jarvis.dataCenter.service.impl.report.ReportInvoiceInfoServiceImpl;
 import com.jarvis.dataCenter.service.report.ThreadService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,8 +9,6 @@ import org.springframework.boot.ApplicationRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @author jinzhaopo
  * @date 2019-10-31 14:11

src/main/java/com/jarvis/dataCenter/runner/OpenReplicatorRunner.java

@@ -13,7 +13,6 @@ import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.stereotype.Service;
 
 import java.util.concurrent.TimeUnit;

src/main/java/com/jarvis/dataCenter/service/impl/jws/InvoiceSignServiceImpl.java

@@ -3,9 +3,8 @@ package com.jarvis.dataCenter.service.impl.jws;
 import com.jarvis.dataCenter.entity.jws.InvoiceSignEntity;
 import com.jarvis.dataCenter.mapper.jws.InvoiceSignMapper;
 import com.jarvis.dataCenter.service.jws.InvoiceSignService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
 import com.jarvis.lib.common.mybatisplus.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>

src/main/java/com/jarvis/dataCenter/service/impl/prod/BusAgencyaddressServiceImpl.java

@@ -3,9 +3,8 @@ package com.jarvis.dataCenter.service.impl.prod;
 import com.jarvis.dataCenter.entity.prod.BusAgencyaddressEntity;
 import com.jarvis.dataCenter.mapper.prod.BusAgencyaddressMapper;
 import com.jarvis.dataCenter.service.prod.BusAgencyaddressService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
 import com.jarvis.lib.common.mybatisplus.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>

src/main/java/com/jarvis/dataCenter/service/impl/prod/BusAgencymasterServiceImpl.java

@@ -3,9 +3,8 @@ package com.jarvis.dataCenter.service.impl.prod;
 import com.jarvis.dataCenter.entity.prod.BusAgencymasterEntity;
 import com.jarvis.dataCenter.mapper.prod.BusAgencymasterMapper;
 import com.jarvis.dataCenter.service.prod.BusAgencymasterService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
 import com.jarvis.lib.common.mybatisplus.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>

src/main/java/com/jarvis/dataCenter/service/impl/prod/BusMerchandisemasterServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author jinzhaopo

src/main/java/com/jarvis/dataCenter/service/impl/prod/BusProductspecServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author jinzhaopo

src/main/java/com/jarvis/dataCenter/service/impl/prod/PoOrdermasterServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author jinzhaopo

src/main/java/com/jarvis/dataCenter/service/impl/prod/SoOrderdetailServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author jinzhaopo

src/main/java/com/jarvis/dataCenter/service/impl/prod/SoOrdermasterServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author jinzhaopo

src/main/java/com/jarvis/dataCenter/service/impl/report/ReportAddressInfoService.java

@@ -42,7 +42,7 @@ public class ReportAddressInfoService extends BaseServiceImpl<ReportAddressInfoM
             startId = 0;
         }
 
-        if(startId.intValue() > endId.intValue()){
+        if (startId.intValue() > endId.intValue()) {
             return false;
         }
 
@@ -67,7 +67,7 @@ public class ReportAddressInfoService extends BaseServiceImpl<ReportAddressInfoM
             return null;
         }
 
-        BeanUtils.build(reportAddressInfo,busAgencyaddressEntity);
+        BeanUtils.build(reportAddressInfo, busAgencyaddressEntity);
         save(reportAddressInfo);
         return reportAddressInfo;
     }

src/main/java/com/jarvis/dataCenter/service/impl/report/ReportAgencyInfoServiceImpl.java

@@ -6,17 +6,14 @@ import com.jarvis.dataCenter.bean.BeanUtils;
 import com.jarvis.dataCenter.constants.DbConstants;
 import com.jarvis.dataCenter.entity.prod.BusAgencymasterEntity;
 import com.jarvis.dataCenter.entity.report.ReportAgencyInfo;
-import com.jarvis.dataCenter.mapper.prod.BusAgencyaddressMapper;
 import com.jarvis.dataCenter.mapper.prod.BusAgencymasterMapper;
 import com.jarvis.dataCenter.mapper.report.ReportAgencyInfoMapper;
-import com.jarvis.dataCenter.service.prod.BusAgencyaddressService;
 import com.jarvis.dataCenter.service.prod.BusAgencymasterService;
 import com.jarvis.dataCenter.service.report.ReportAgencyInfoService;
 import com.jarvis.lib.common.mybatisplus.service.impl.BaseServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import sun.plugin2.message.Message;
 
 /**
  * @author jinzhaopo

src/main/java/com/jarvis/dataCenter/service/impl/report/ReportCsOrderInfoServiceImpl.java

@@ -49,7 +49,7 @@ public class ReportCsOrderInfoServiceImpl extends BaseServiceImpl<ReportCsOrderI
         if (startId == null) {
             startId = 0;
         }
-        if(startId.intValue() > endId.intValue()){
+        if (startId.intValue() > endId.intValue()) {
             return false;
         }
 

src/main/java/com/jarvis/dataCenter/service/impl/report/ReportDoInfoServiceImpl.java

@@ -117,7 +117,6 @@ public class ReportDoInfoServiceImpl extends BaseServiceImpl<ReportDoInfoMapper,
         }
 
 
-
         save(reportDoInfo);
         return reportDoInfo;
     }

src/main/java/com/jarvis/dataCenter/service/impl/report/ReportSoPoInfoServiceImpl.java

@@ -12,7 +12,6 @@ import com.jarvis.dataCenter.mapper.prod.SoOrderdetailMapper;
 import com.jarvis.dataCenter.mapper.report.ReportSoPoInfoMapper;
 import com.jarvis.dataCenter.service.prod.*;
 import com.jarvis.dataCenter.service.report.ReportSoPoInfoService;
-import com.jarvis.lib.common.base.message.Message;
 import com.jarvis.lib.common.mybatisplus.service.impl.BaseServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,7 +57,7 @@ public class ReportSoPoInfoServiceImpl extends BaseServiceImpl<ReportSoPoInfoMap
         if (startId == null) {
             startId = 0;
         }
-        if(startId.intValue() > endId.intValue()){
+        if (startId.intValue() > endId.intValue()) {
             return false;
         }
 

src/main/java/com/jarvis/dataCenter/service/impl/report/ThreadServiceImpl.java

@@ -2,7 +2,6 @@ package com.jarvis.dataCenter.service.impl.report;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.jarvis.dataCenter.constants.DbConstants;
-import com.jarvis.dataCenter.entity.report.ReportAgencyInfo;
 import com.jarvis.dataCenter.service.report.*;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/jarvis/dataCenter/service/impl/warehouse/DeliveryLicenceServiceImpl.java

@@ -5,13 +5,12 @@ import com.jarvis.dataCenter.constants.DbConstants;
 import com.jarvis.dataCenter.entity.warehouse.DeliveryLicenceEntity;
 import com.jarvis.dataCenter.mapper.warehouse.DeliveryLicenceMapper;
 import com.jarvis.dataCenter.service.warehouse.DeliveryLicenceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
 import com.jarvis.lib.common.mybatisplus.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author jinzhaopo

src/main/java/com/jarvis/dataCenter/service/impl/warehouse/DeliveryOrderDetailServiceImpl.java

@@ -5,9 +5,8 @@ import com.jarvis.dataCenter.constants.DbConstants;
 import com.jarvis.dataCenter.entity.warehouse.DeliveryOrderDetailEntity;
 import com.jarvis.dataCenter.mapper.warehouse.DeliveryOrderDetailMapper;
 import com.jarvis.dataCenter.service.warehouse.DeliveryOrderDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
 import com.jarvis.lib.common.mybatisplus.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>

src/main/java/com/jarvis/dataCenter/service/impl/warehouse/DeliveryOrderReceiptServiceImpl.java

@@ -5,9 +5,8 @@ import com.jarvis.dataCenter.constants.DbConstants;
 import com.jarvis.dataCenter.entity.warehouse.DeliveryOrderReceiptEntity;
 import com.jarvis.dataCenter.mapper.warehouse.DeliveryOrderReceiptMapper;
 import com.jarvis.dataCenter.service.warehouse.DeliveryOrderReceiptService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
 import com.jarvis.lib.common.mybatisplus.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>

src/main/java/com/jarvis/dataCenter/service/impl/warehouse/DeliveryOrderServiceImpl.java

@@ -5,9 +5,8 @@ import com.jarvis.dataCenter.constants.DbConstants;
 import com.jarvis.dataCenter.entity.warehouse.DeliveryOrderEntity;
 import com.jarvis.dataCenter.mapper.warehouse.DeliveryOrderMapper;
 import com.jarvis.dataCenter.service.warehouse.DeliveryOrderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
 import com.jarvis.lib.common.mybatisplus.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>

src/main/java/com/jarvis/dataCenter/service/impl/warehouse/StockAllocationServiceImpl.java

@@ -5,9 +5,8 @@ import com.jarvis.dataCenter.constants.DbConstants;
 import com.jarvis.dataCenter.entity.warehouse.StockAllocationEntity;
 import com.jarvis.dataCenter.mapper.warehouse.StockAllocationMapper;
 import com.jarvis.dataCenter.service.warehouse.StockAllocationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
 import com.jarvis.lib.common.mybatisplus.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>

src/main/java/com/jarvis/dataCenter/service/impl/warehouse/StockContainerServiceImpl.java

@@ -5,9 +5,8 @@ import com.jarvis.dataCenter.constants.DbConstants;
 import com.jarvis.dataCenter.entity.warehouse.StockContainerEntity;
 import com.jarvis.dataCenter.mapper.warehouse.StockContainerMapper;
 import com.jarvis.dataCenter.service.warehouse.StockContainerService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
 import com.jarvis.lib.common.mybatisplus.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>

src/main/java/com/jarvis/dataCenter/service/impl/warehouse/WarehouseServiceImpl.java

@@ -5,9 +5,8 @@ import com.jarvis.dataCenter.constants.DbConstants;
 import com.jarvis.dataCenter.entity.warehouse.WarehouseEntity;
 import com.jarvis.dataCenter.mapper.warehouse.WarehouseMapper;
 import com.jarvis.dataCenter.service.warehouse.WarehouseService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
 import com.jarvis.lib.common.mybatisplus.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>

src/main/java/com/jarvis/dataCenter/service/jws/InvoiceSignService.java

 package com.jarvis.dataCenter.service.jws;
 
 import com.jarvis.dataCenter.entity.jws.InvoiceSignEntity;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.jarvis.lib.common.mybatisplus.service.IBaseService;
 
 /**

src/main/java/com/jarvis/dataCenter/service/prod/BusAgencyaddressService.java

 package com.jarvis.dataCenter.service.prod;
 
 import com.jarvis.dataCenter.entity.prod.BusAgencyaddressEntity;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.jarvis.lib.common.mybatisplus.service.IBaseService;
 
 /**

src/main/java/com/jarvis/dataCenter/service/prod/BusAgencymasterService.java

 package com.jarvis.dataCenter.service.prod;
 
 import com.jarvis.dataCenter.entity.prod.BusAgencymasterEntity;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.jarvis.lib.common.mybatisplus.service.IBaseService;
 
 /**

src/main/java/com/jarvis/dataCenter/service/prod/BusMerchandisemasterService.java

@@ -5,7 +5,7 @@ import com.jarvis.lib.common.mybatisplus.service.IBaseService;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author jinzhaopo

src/main/java/com/jarvis/dataCenter/service/prod/BusProductspecService.java

@@ -5,7 +5,7 @@ import com.jarvis.lib.common.mybatisplus.service.IBaseService;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author jinzhaopo

src/main/java/com/jarvis/dataCenter/service/prod/PoOrdermasterService.java

@@ -5,7 +5,7 @@ import com.jarvis.lib.common.mybatisplus.service.IBaseService;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author jinzhaopo

src/main/java/com/jarvis/dataCenter/service/prod/SoOrderdetailService.java

@@ -5,7 +5,7 @@ import com.jarvis.lib.common.mybatisplus.service.IBaseService;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author jinzhaopo

src/main/java/com/jarvis/dataCenter/service/prod/SoOrdermasterService.java

@@ -5,7 +5,7 @@ import com.jarvis.lib.common.mybatisplus.service.IBaseService;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author jinzhaopo

src/main/java/com/jarvis/dataCenter/service/report/ReportAddressInfoService.java

 package com.jarvis.dataCenter.service.report;
 
 import com.jarvis.dataCenter.entity.report.ReportAddressInfo;
-import com.jarvis.dataCenter.entity.report.ReportInvoiceInfo;
 import com.jarvis.lib.common.mybatisplus.service.IBaseService;
 
 /**

src/main/java/com/jarvis/dataCenter/service/report/ReportInvoiceInfoService.java

 package com.jarvis.dataCenter.service.report;
 
-import com.jarvis.dataCenter.entity.report.ReportDoInfo;
 import com.jarvis.dataCenter.entity.report.ReportInvoiceInfo;
 import com.jarvis.lib.common.mybatisplus.service.IBaseService;
 

src/main/java/com/jarvis/dataCenter/service/warehouse/DeliveryLicenceService.java

@@ -5,7 +5,7 @@ import com.jarvis.lib.common.mybatisplus.service.IBaseService;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author jinzhaopo

src/main/java/com/jarvis/dataCenter/service/warehouse/DeliveryOrderDetailService.java

 package com.jarvis.dataCenter.service.warehouse;
 
 import com.jarvis.dataCenter.entity.warehouse.DeliveryOrderDetailEntity;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.jarvis.lib.common.mybatisplus.service.IBaseService;
 
 /**

src/main/java/com/jarvis/dataCenter/service/warehouse/DeliveryOrderReceiptService.java

 package com.jarvis.dataCenter.service.warehouse;
 
 import com.jarvis.dataCenter.entity.warehouse.DeliveryOrderReceiptEntity;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.jarvis.lib.common.mybatisplus.service.IBaseService;
 
 /**

src/main/java/com/jarvis/dataCenter/service/warehouse/DeliveryOrderService.java

 package com.jarvis.dataCenter.service.warehouse;
 
 import com.jarvis.dataCenter.entity.warehouse.DeliveryOrderEntity;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.jarvis.lib.common.mybatisplus.service.IBaseService;
 
 /**

src/main/java/com/jarvis/dataCenter/service/warehouse/StockAllocationService.java

 package com.jarvis.dataCenter.service.warehouse;
 
 import com.jarvis.dataCenter.entity.warehouse.StockAllocationEntity;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.jarvis.lib.common.mybatisplus.service.IBaseService;
 
 /**

src/main/java/com/jarvis/dataCenter/service/warehouse/StockContainerService.java

 package com.jarvis.dataCenter.service.warehouse;
 
 import com.jarvis.dataCenter.entity.warehouse.StockContainerEntity;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.jarvis.lib.common.mybatisplus.service.IBaseService;
 
 /**

src/main/java/com/jarvis/dataCenter/service/warehouse/WarehouseService.java

 package com.jarvis.dataCenter.service.warehouse;
 
 import com.jarvis.dataCenter.entity.warehouse.WarehouseEntity;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.jarvis.lib.common.mybatisplus.service.IBaseService;
 
 /**