diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index 0f1b1c7cf..6159afb03 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -172,4 +172,16 @@ public class UdiRelevanceEntity { @TableField(value = "certIdFk") private String certIdFk; + /** + * 上传状态 0:未上传;1:已上传; + */ + @TableField(value = "uploadFlag") + private Integer uploadFlag; + + /** + * 上传日志信息 + */ + @TableField(value = "uploadMsg") + private String uploadMsg; + } diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index 9dc56988c..e362dafcc 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -1,5 +1,6 @@ package com.glxp.api.res.basic; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.math.BigDecimal; @@ -128,6 +129,17 @@ public class UdiRelevanceResponse { private Long deId; + /** + * 上传状态 0:未上传;1:已上传; + */ + private Integer uploadFlag; + + /** + * 上传日志信息 + */ + private String uploadMsg; + + private Integer bpcrid; private String hslbName; diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java index d650fcb04..5104b239d 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java @@ -296,7 +296,7 @@ public class InvWarehouseServiceImpl extends ServiceImpl().eq("code", invWarehouseEntity.getParentCode()).last("limit 1")); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java index 9479ac69f..ad1ac7c28 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java @@ -367,13 +367,18 @@ public class ThrProductsServiceImpl extends ServiceImpl