Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/constant/ConstantStatus.java

@@ -6,13 +6,47 @@ package com.glxp.api.constant;
 public class ConstantStatus {
 
     //订单状态
-    public static final Integer ORDER_STATUS_TEMP_SAVE = -1;   //等待提交(草稿）
-    public static final Integer ORDER_STATUS_PROCESS = 1;   //等待处理
-    public static final Integer ORDER_STATUS_CHECK = 2;     //等待校验
-    public static final Integer ORDER_STATUS_FAIL = 3;      //单据校验失败
-    public static final Integer ORDER_STATUS_SUCCESS = 4;   //已校验
+
+    /**
+     * 等待提交(草稿）
+     */
+    public static final Integer ORDER_STATUS_TEMP_SAVE = -1;
+
+    /**
+     * 已提交待处理
+     */
+    public static final Integer ORDER_STATUS_PROCESS = 2;
+
+    /**
+     * 处理成功待校验
+     */
+    public static final Integer ORDER_STATUS_CHECK = 3;
+
+    /**
+     * 处理异常
+     */
+    public static final Integer ORDER_STATS_ERROR = 4;
+
+    /**
+     * 校验成功待审核
+     */
+    public static final Integer ORDER_STATUS_CHECK_SUCCESS = 5;
+
+    /**
+     * 校验失败
+     */
+    public static final Integer ORDER_STATUS_CHECK_FAIL = 6;
+
+    /**
+     * 审核通过
+     */
+    public static final Integer ORDER_STATUS_AUDITED = 7;
+
+    /**
+     * 审核拒绝
+     */
+    public static final Integer ORDER_STATUS_AUDITED_REFUSED = 8;
     public static final Integer ORDER_STATUS_ADDITIONAL = 5;    //补录单据
-    public static final Integer ORDER_STATUS_DOING = 6;
     public static final Integer ORDER_STATUS_RECEIVEED = 7;
 
     //订单处理状态

src/main/java/com/glxp/api/entity/BaseEntity.java

@@ -2,16 +2,13 @@ package com.glxp.api.entity;
 
 import lombok.Data;
 
-import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
 
 @Data
-public class BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class BaseEntity {
 
     /**
      * 搜索值

src/main/java/com/glxp/api/entity/auth/LoginUser.java

@@ -3,16 +3,13 @@ package com.glxp.api.entity.auth;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
 import java.util.List;
 import java.util.Set;
 
 
 @Data
 @NoArgsConstructor
-public class LoginUser implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class LoginUser {
 
     /**
      * 用户ID

src/main/java/com/glxp/api/entity/auth/RoleEntity.java

@@ -3,15 +3,13 @@ package com.glxp.api.entity.auth;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
-
 /**
  * 角色
  */
 
 @Data
 @NoArgsConstructor
-public class RoleEntity implements Serializable {
+public class RoleEntity {
 
     /**
      * 角色ID

src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java

@@ -6,12 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.io.Serializable;
 import java.util.Date;
 
 @Data
 @TableName(value = "io_code")
-public class IoCodeEntity implements Serializable {
+public class IoCodeEntity {
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
@@ -139,5 +138,4 @@ public class IoCodeEntity implements Serializable {
     @TableField(exist = false)
     private Integer status;     //条码校验状态
 
-    private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java

@@ -6,13 +6,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.io.Serializable;
 import java.util.Date;
 
 
 @Data
 @TableName(value = "io_code_temp")
-public class IoCodeTempEntity implements Serializable {
+public class IoCodeTempEntity {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
@@ -139,5 +138,4 @@ public class IoCodeTempEntity implements Serializable {
     @TableField(exist = false)
     private Integer status;     //条码校验状态
 
-    private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java

@@ -4,15 +4,13 @@ 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 lombok.Data;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
 
-import lombok.Data;
-
 @Data
 @TableName(value = "io_order_detail_biz")
-public class IoOrderDetailBizEntity implements Serializable {
+public class IoOrderDetailBizEntity {
     @TableId(value = "id", type = IdType.INPUT)
     private Integer id;
 
@@ -185,5 +183,4 @@ public class IoOrderDetailBizEntity implements Serializable {
     @TableField(exist = false)
     private Integer scanCount;
 
-    private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java

@@ -4,15 +4,13 @@ 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 lombok.Data;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
 
-import lombok.Data;
-
 @Data
 @TableName(value = "io_order_detail_code")
-public class IoOrderDetailCodeEntity implements Serializable {
+public class IoOrderDetailCodeEntity {
     @TableId(value = "id", type = IdType.INPUT)
     private Integer id;
 
@@ -190,5 +188,4 @@ public class IoOrderDetailCodeEntity implements Serializable {
     @TableField(exist = false)
     private Integer orderCount;
 
-    private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/inout/IoOrderDetailResultEntity.java

@@ -4,15 +4,13 @@ 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 lombok.Data;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
 
-import lombok.Data;
-
 @Data
 @TableName(value = "io_order_detail_result")
-public class IoOrderDetailResultEntity implements Serializable {
+public class IoOrderDetailResultEntity {
     @TableId(value = "id", type = IdType.INPUT)
     private Integer id;
 
@@ -184,5 +182,4 @@ public class IoOrderDetailResultEntity implements Serializable {
     @TableField(value = "remark5")
     private String remark5;
 
-    private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java

@@ -4,15 +4,13 @@ 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 lombok.Data;
 
-import java.io.Serializable;
 import java.util.Date;
 
-import lombok.Data;
-
 @Data
 @TableName(value = "io_order")
-public class IoOrderEntity implements Serializable {
+public class IoOrderEntity {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
@@ -65,7 +63,7 @@ public class IoOrderEntity implements Serializable {
     private Integer fromType;
 
     /**
-     * 1:草稿；2:已提交待处理;3:处理成功待校验;3:处理异常;4:校验成功待审核;5:校验失败;6:审核通过;7:审核拒绝
+     * 1:草稿；2:已提交待处理;3:处理成功待校验;4:处理异常;5:校验成功待审核;6:校验失败;7:审核通过;8:审核拒绝
      */
     @TableField(value = "`status`")
     private Integer status;
@@ -187,5 +185,4 @@ public class IoOrderEntity implements Serializable {
     @TableField(value = "preInBillNo")
     private String preInBillNo;
 
-    private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/inv/InvPreinDetailEntity.java

@@ -4,14 +4,11 @@ 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 java.io.Serializable;
-
 import lombok.Data;
 
 @Data
 @TableName(value = "inv_prein_detail")
-public class InvPreinDetailEntity implements Serializable {
+public class InvPreinDetailEntity {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
@@ -75,5 +72,4 @@ public class InvPreinDetailEntity implements Serializable {
     @TableField(value = "reCount")
     private Integer reCount;
 
-    private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/inv/InvPreinOrderEntity.java

@@ -4,13 +4,13 @@ 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 java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 @TableName(value = "inv_prein_order")
-public class InvPreinOrderEntity implements Serializable {
+public class InvPreinOrderEntity {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
@@ -86,5 +86,4 @@ public class InvPreinOrderEntity implements Serializable {
     @TableField(value = "remark")
     private String remark;
 
-    private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/inv/InvProductDetailEntity.java

@@ -4,15 +4,13 @@ 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 lombok.Data;
 
-import java.io.Serializable;
 import java.util.Date;
 
-import lombok.Data;
-
 @Data
 @TableName(value = "inv_product_detail")
-public class InvProductDetailEntity implements Serializable {
+public class InvProductDetailEntity {
     @TableId(value = "id", type = IdType.INPUT)
     private Integer id;
 
@@ -123,5 +121,4 @@ public class InvProductDetailEntity implements Serializable {
     @TableField(value = "action")
     private String action;
 
-    private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/inv/InvProductEntity.java

@@ -4,15 +4,13 @@ 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 lombok.Data;
 
-import java.io.Serializable;
 import java.util.Date;
 
-import lombok.Data;
-
 @Data
 @TableName(value = "inv_product")
-public class InvProductEntity implements Serializable {
+public class InvProductEntity {
     @TableId(value = "id", type = IdType.INPUT)
     private Integer id;
 
@@ -101,6 +99,4 @@ public class InvProductEntity implements Serializable {
     @TableField(value = "updateTime")
     private Date updateTime;
 
-
-    private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/monitor/OperLogDTO.java

@@ -2,7 +2,6 @@ package com.glxp.api.entity.monitor;
 
 import lombok.Data;
 
-import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -10,9 +9,7 @@ import java.util.Date;
  */
 
 @Data
-public class OperLogDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class OperLogDTO {
 
     /**
      * 日志主键

src/main/java/com/glxp/api/entity/monitor/SysLogininfor.java

@@ -2,7 +2,6 @@ package com.glxp.api.entity.monitor;
 
 import lombok.Data;
 
-import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -12,8 +11,7 @@ import java.util.Map;
  */
 
 @Data
-public class SysLogininfor implements Serializable {
-    private static final long serialVersionUID = 1L;
+public class SysLogininfor {
 
     /**
      * ID

src/main/java/com/glxp/api/entity/monitor/SysOperLog.java

@@ -2,7 +2,6 @@ package com.glxp.api.entity.monitor;
 
 import lombok.Data;
 
-import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -12,9 +11,7 @@ import java.util.Map;
  */
 
 @Data
-public class SysOperLog implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class SysOperLog {
 
     /**
      * 日志主键

src/main/java/com/glxp/api/entity/purchase/CustomerContactEntity.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -22,8 +20,6 @@ import java.util.Date;
 @Data
 public class CustomerContactEntity{
 
-    private static final long serialVersionUID = 1L;
-
     @TableField("customerId")
     private String customerId;
 

src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java

@@ -5,8 +5,6 @@ import lombok.Data;
 @Data
 public class PurApplyDetailEntity {
 
-    private static final long serialVersionUID = 1L;
-
     /**
      *
      */

src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java

@@ -14,8 +14,6 @@ import java.util.Date;
 @Data
 public class PurApplyEntity {
 
-    private static final long serialVersionUID = 1L;
-
     /**
      *
      */

src/main/java/com/glxp/api/entity/purchase/PurPlanDetailEntity.java

@@ -5,8 +5,6 @@ import lombok.Data;
 @Data
 public class PurPlanDetailEntity {
 
-    private static final long serialVersionUID = 1L;
-
     /**
      *
      */

src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java

@@ -14,8 +14,6 @@ import java.util.Date;
 @Data
 public class PurPlanEntity {
 
-    private static final long serialVersionUID = 1L;
-
     /**
      *
      */

src/main/java/com/glxp/api/entity/purchase/SupCertEntity.java

@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -23,8 +21,6 @@ import java.util.Date;
 @Data
 public class SupCertEntity {
 
-    private static final long serialVersionUID = 1L;
-
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

src/main/java/com/glxp/api/entity/purchase/SupCertSetEntity.java

@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -25,8 +23,6 @@ import java.util.List;
 @Data
 public class SupCertSetEntity {
 
-    private static final long serialVersionUID = 1L;
-
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

src/main/java/com/glxp/api/entity/purchase/SupCompanyEntity.java

@@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.io.Serializable;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -22,8 +20,6 @@ import java.util.Date;
 @Data
 public class SupCompanyEntity {
 
-    private static final long serialVersionUID = 1L;
-
     @TableId("customerId")
     private String customerId;
 

src/main/java/com/glxp/api/entity/purchase/SupManufacturerEntity.java

@@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.io.Serializable;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -23,8 +21,6 @@ import java.util.Date;
 @Data
 public class SupManufacturerEntity{
 
-    private static final long serialVersionUID = 1L;
-
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 

src/main/java/com/glxp/api/entity/purchase/SupProductEntity.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -22,8 +20,6 @@ import java.util.Date;
 @Data
 public class SupProductEntity{
 
-    private static final long serialVersionUID = 1L;
-
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 

src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -16,7 +15,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName(value = "thr_bustype_origin")
-public class ThrBusTypeOriginEntity implements Serializable {
+public class ThrBusTypeOriginEntity {
 
     /**
      * id

src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -17,8 +16,6 @@ import java.util.Date;
 @Data
 public class ThrCorpEntity{
 
-    private static final long serialVersionUID = 1L;
-
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

src/main/java/com/glxp/api/entity/thrsys/ThrCorpExportLogEntity.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -18,8 +17,6 @@ import java.util.Date;
 @Data
 public class ThrCorpExportLogEntity{
 
-    private static final long serialVersionUID = 1L;
-
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

src/main/java/com/glxp/api/entity/thrsys/ThrCorpImportDetailEntity.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -17,8 +16,6 @@ import java.util.Date;
 @Data
 public class ThrCorpImportDetailEntity{
 
-    private static final long serialVersionUID = 1L;
-
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

src/main/java/com/glxp/api/entity/thrsys/ThrCorpImportLogEntity.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -17,8 +16,6 @@ import java.util.Date;
 @Data
 public class ThrCorpImportLogEntity{
 
-    private static final long serialVersionUID = 1L;
-
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

src/main/java/com/glxp/api/entity/thrsys/ThrInvProductsEntity.java

@@ -1,14 +1,11 @@
 package com.glxp.api.entity.thrsys;
 
-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 lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
+
+import java.util.Date;
 
 /**
  * <p>
@@ -22,8 +19,6 @@ import lombok.experimental.Accessors;
 @TableName("thr_inv_products")
 public class ThrInvProductsEntity {
 
-    private static final long serialVersionUID = 1L;
-
     @TableId(value = "id")
     private Integer id;
 

src/main/java/com/glxp/api/entity/thrsys/ThrInvProductsExportLogEntity.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -22,8 +20,6 @@ import java.util.Date;
 @TableName("thr_inv_products_export_log")
 public class ThrInvProductsExportLogEntity {
 
-    private static final long serialVersionUID = 1L;
-
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

src/main/java/com/glxp/api/entity/thrsys/ThrInvProductsImportDetailEntity.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -20,9 +18,7 @@ import java.util.Date;
  */
 @Data
 @TableName("thr_inv_products_import_detail")
-public class ThrInvProductsImportDetailEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class ThrInvProductsImportDetailEntity {
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;

src/main/java/com/glxp/api/entity/thrsys/ThrInvProductsImportLogEntity.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -20,9 +18,7 @@ import java.util.Date;
  */
 @Data
 @TableName("thr_inv_products_import_log")
-public class ThrInvProductsImportLogEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class ThrInvProductsImportLogEntity {
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;

src/main/java/com/glxp/api/entity/thrsys/ThrOrderDetailEntity.java

@@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -23,8 +21,6 @@ import java.util.Date;
 @TableName("thr_order_detail")
 public class ThrOrderDetailEntity{
 
-    private static final long serialVersionUID = 1L;
-
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

src/main/java/com/glxp/api/entity/thrsys/ThrOrderEntity.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -22,8 +20,6 @@ import java.util.Date;
 @TableName("thr_order")
 public class ThrOrderEntity{
 
-    private static final long serialVersionUID = 1L;
-
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

src/main/java/com/glxp/api/entity/thrsys/ThrOrderExportLogEntity.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -22,8 +20,6 @@ import java.util.Date;
 @TableName("thr_order_export_log")
 public class ThrOrderExportLogEntity{
 
-    private static final long serialVersionUID = 1L;
-
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

src/main/java/com/glxp/api/entity/thrsys/ThrOrderImportDetailEntity.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -22,8 +20,6 @@ import java.util.Date;
 @TableName("thr_order_import_detail")
 public class ThrOrderImportDetailEntity {
 
-    private static final long serialVersionUID = 1L;
-
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

src/main/java/com/glxp/api/entity/thrsys/ThrOrderImportLogEntity.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -22,8 +20,6 @@ import java.util.Date;
 @TableName("thr_order_import_log")
 public class ThrOrderImportLogEntity{
 
-    private static final long serialVersionUID = 1L;
-
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

src/main/java/com/glxp/api/entity/thrsys/ThrOrderUploadBustypesEntity.java

@@ -6,9 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 
 /**
  * <p>
@@ -22,8 +19,6 @@ import java.time.LocalDateTime;
 @TableName("thr_order_upload_bustypes")
 public class ThrOrderUploadBustypesEntity {
 
-    private static final long serialVersionUID = 1L;
-
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

src/main/java/com/glxp/api/entity/thrsys/ThrOrderUploadEntity.java

@@ -5,9 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
  * <p>
  * 
@@ -20,8 +17,6 @@ import java.time.LocalDateTime;
 @TableName("thr_order_upload")
 public class ThrOrderUploadEntity{
 
-    private static final long serialVersionUID = 1L;
-
     @TableId("id")
     private Integer id;
 

src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java

@@ -1,14 +1,12 @@
 package com.glxp.api.entity.thrsys;
 
-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 lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
+
+import java.util.Date;
 
 /**
  * <p>
@@ -22,8 +20,6 @@ import lombok.experimental.Accessors;
 @TableName("thr_products")
 public class ThrProductsEntity{
 
-    private static final long serialVersionUID = 1L;
-
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportLogEntity.java

@@ -18,8 +18,6 @@ import java.time.LocalDateTime;
 @Data
 public class ThrProductsImportLogEntity {
 
-    private static final long serialVersionUID = 1L;
-
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

src/main/java/com/glxp/api/exception/ServiceException.java

@@ -4,7 +4,6 @@ package com.glxp.api.exception;
  * 业务异常
  */
 public final class ServiceException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
 
     /**
      * 错误码

src/main/java/com/glxp/api/exception/UtilException.java

@@ -6,7 +6,6 @@ package com.cpt.common.exception;
  * @author ruoyi
  */
 public class UtilException extends RuntimeException {
-    private static final long serialVersionUID = 8247610319171014183L;
 
     public UtilException(Throwable e) {
         super(e.getMessage(), e);

src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java

@@ -154,5 +154,9 @@ public class IoOrderDetailCodeResponse {
 
     private boolean checkSuccess;
 
+    /**
+     * 供应商名称
+     */
+    private String supName;
 
 }

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -7,8 +7,6 @@ import com.glxp.api.constant.ConstantType;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.inv.InvPreinDetailEntity;
-import com.glxp.api.entity.inv.InvProductDetailEntity;
-import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inv.InvPreinDetailService;
 import com.glxp.api.service.inv.InvPreinOrderService;
@@ -110,7 +108,7 @@ public class IoCheckInoutService {
         List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderEntity.getBillNo());
 
         if (CollUtil.isEmpty(orderDetailCodeEntities)) {
-            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_FAIL);
+            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_FAIL);
             orderEntity.setUpdateTime(new Date());
             orderEntity.setErrMsg("校验失败，扫码详情为空！");
             orderService.update(orderEntity);
@@ -140,7 +138,7 @@ public class IoCheckInoutService {
         }
         codeTempService.deleteByBillNo(orderEntity.getBillNo());
 
-        orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
+        orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS);
         orderEntity.setUpdateTime(new Date());
         orderService.update(orderEntity);
         checkSecond(orderEntity);
@@ -152,7 +150,7 @@ public class IoCheckInoutService {
         List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(orderEntity.getBillNo());
 
         if (CollUtil.isEmpty(orderDetailCodeEntities)) {
-            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_FAIL);
+            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_FAIL);
             orderEntity.setUpdateTime(new Date());
             orderEntity.setErrMsg("校验失败，扫码详情为空！");
             orderService.update(orderEntity);
@@ -160,7 +158,7 @@ public class IoCheckInoutService {
         }
 
         if (CollUtil.isEmpty(orderDetailBizEntities)) {
-            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_FAIL);
+            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_FAIL);
             orderEntity.setUpdateTime(new Date());
             orderEntity.setErrMsg("校验失败，业务详情为空！");
             orderService.update(orderEntity);
@@ -217,7 +215,7 @@ public class IoCheckInoutService {
 
         if (StrUtil.isNotEmpty(errMsg)) {
             orderEntity.setErrMsg(errMsg + "校验失败");
-            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_FAIL);
+            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_FAIL);
             orderEntity.setUpdateTime(new Date());
             orderService.update(orderEntity);
         } else {
@@ -237,7 +235,7 @@ public class IoCheckInoutService {
             }
             codeTempService.deleteByBillNo(orderEntity.getBillNo());
             orderEntity.setErrMsg("校验成功！");
-            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
+            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS);
             orderEntity.setUpdateTime(new Date());
             orderService.update(orderEntity);
             checkSecond(orderEntity);

src/main/java/com/glxp/api/util/HardWareUtils.java

@@ -18,8 +18,6 @@ public class HardWareUtils extends Applet {
     public HardWareUtils() {
     }
 
-    private static final long serialVersionUID = 1L;
-
     @Override
     public void paint(Graphics paint) {
         super.paint(paint);

src/main/java/com/glxp/api/util/page/PageQuery.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.glxp.api.util.StringUtils;
 import lombok.Data;
 
-import java.io.Serializable;
-
 /**
  * 分页查询实体类
  *
@@ -15,9 +13,7 @@ import java.io.Serializable;
  */
 
 @Data
-public class PageQuery implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class PageQuery {
 
     /**
      * 分页大小

src/main/java/com/glxp/api/util/page/TableDataInfo.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -14,8 +13,7 @@ import java.util.List;
 
 @Data
 @NoArgsConstructor
-public class TableDataInfo<T> implements Serializable {
-    private static final long serialVersionUID = 1L;
+public class TableDataInfo<T> {
 
     /**
      * 总记录数