diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index e317b5e4..13b8bac0 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -422,7 +422,7 @@ public class IoCodeTempController extends BaseController { //过期提醒： // SystemParamConfigEntity expireParamConfigEntity = systemParamConfigService.selectByParamKey("expire_date_tip"); - if (bussinessTypeEntity.getCheckVailDate() == 1 && !addOrderRequest.isIgnoreExpire()) { + if (bussinessTypeEntity.getCheckExpire() == 1 && !addOrderRequest.isIgnoreExpire()) { if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { String expireDate = "20" + udiEntity.getExpireDate(); long expireTime = DateUtil.parseDateExpire(expireDate); @@ -432,6 +432,16 @@ public class IoCodeTempController extends BaseController { } } + if (bussinessTypeEntity.getCheckExpire() == 2) { + if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) { + String expireDate = "20" + udiEntity.getExpireDate(); + long expireTime = DateUtil.parseDateExpire(expireDate); + if (expireTime - System.currentTimeMillis() < 0) { + return ResultVOUtils.error(604, "当前产品已过期,无法添加?"); + } + } + } + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); //近效期提醒 @@ -465,7 +475,7 @@ public class IoCodeTempController extends BaseController { if (resultTime > 0) { long time = resultTime / (24 * 60 * 60 * 1000); if (resultTime < recentTieme) { - return ResultVOUtils.error(505, "当前产品临近过期，距过期还剩" + time + "天,无法添加?"); + return ResultVOUtils.error(605, "当前产品临近过期，距过期还剩" + time + "天,无法添加！"); } } } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java index 9c28c388..f0923ed8 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java @@ -70,7 +70,7 @@ public class BasicProductsEntity { /** * 最小包装单元内包含使用单元数量: -最小销售标识包含使用单元数量 + * 最小销售标识包含使用单元数量 */ @TableField(value = "zxxsbzbhsydysl") private Integer zxxsbzbhsydysl; @@ -163,7 +163,7 @@ public class BasicProductsEntity { * 表示类型：1.主标识，2，使用单元标识，3.本体标识，4，包装标识 */ @TableField(value = "diType") - private Byte diType; + private Integer diType; /** * 医保编码 @@ -193,7 +193,7 @@ public class BasicProductsEntity { * 0:UDI，1：第三方产品编码 */ @TableField(value = "productType") - private Byte productType; + private Integer productType; /** * 是否包含批号 @@ -235,13 +235,13 @@ public class BasicProductsEntity { * 是否允许无生产日期扫码 */ @TableField(value = "allowNoExpire") - private Byte allowNoExpire; + private Boolean allowNoExpire; /** * 是否允许无失效日期扫码 */ @TableField(value = "allowNoProduct") - private Byte allowNoProduct; + private Boolean allowNoProduct; /** * 商品名称 diff --git a/src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java b/src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java index d3d67d38..4dd2ccc2 100644 --- a/src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java @@ -23,7 +23,7 @@ public class SysMenuHelpEntity { private String menuName; @TableField(value = "`status`") - private Byte status; + private Integer status; @TableField(value = "filePath") private String filePath; diff --git a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceBizEntity.java b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceBizEntity.java index 1792c36c..656b2de4 100644 --- a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceBizEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceBizEntity.java @@ -57,11 +57,11 @@ public class SysPdfTemplateRelevanceBizEntity { private String remark3; @TableField(value = "`printType`") - private Byte printType; + private Integer printType; @TableField(value = "`modelKey`") private String modelKey; @TableField(value = "updateTime") private Date updateTime; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java index fd7fdd97..9111da51 100644 --- a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceCodeEntity.java @@ -58,11 +58,11 @@ public class SysPdfTemplateRelevanceCodeEntity { private String remark3; @TableField(value = "`printType`") - private Byte printType; + private Integer printType; @TableField(value = "`modelKey`") private String modelKey; @TableField(value = "updateTime") private Date updateTime; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceLabelEntity.java b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceLabelEntity.java index 4026052f..32cf1478 100644 --- a/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceLabelEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysPdfTemplateRelevanceLabelEntity.java @@ -57,11 +57,11 @@ public class SysPdfTemplateRelevanceLabelEntity { private String remark3; @TableField(value = "`printType`") - private Byte printType; + private Integer printType; @TableField(value = "`modelKey`") private String modelKey; @TableField(value = "updateTime") private Date updateTime; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderEntity.java index 31d0a115..e4445502 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderEntity.java @@ -69,7 +69,7 @@ public class ThrOrderEntity { * 出入库类型1:入库，2:出库 */ @TableField(value = "inoutType") - private Byte inoutType; + private Integer inoutType; /** * 当前部门编码 diff --git a/src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java b/src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java index 5d5509a7..9a28c4e8 100644 --- a/src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java +++ b/src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java @@ -21,7 +21,7 @@ public class SysMenuHelpRequest extends ListPageRequest { private String menuName; - private Byte status; + private Integer status; private String filePath; diff --git a/src/main/java/com/glxp/api/res/inout/IoCodeRelResponse.java b/src/main/java/com/glxp/api/res/inout/IoCodeRelResponse.java index 866573d3..7c7a4168 100644 --- a/src/main/java/com/glxp/api/res/inout/IoCodeRelResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoCodeRelResponse.java @@ -12,7 +12,7 @@ public class IoCodeRelResponse { private String code; private String parentCode; private String nameCode; - private Byte diType; + private Integer diType; private String mainNameCode; private String level; private String produceDate; diff --git a/src/main/java/com/glxp/api/res/system/SysMenuHelpResponse.java b/src/main/java/com/glxp/api/res/system/SysMenuHelpResponse.java index 93cbb853..c26c8cb6 100644 --- a/src/main/java/com/glxp/api/res/system/SysMenuHelpResponse.java +++ b/src/main/java/com/glxp/api/res/system/SysMenuHelpResponse.java @@ -18,7 +18,7 @@ public class SysMenuHelpResponse { private String menuName; - private Byte status; + private Integer status; private String filePath;