From cda38bad455aca684e97c3808100512ea8c22344 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 22 Jul 2024 15:07:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/entity/basic/UdiRelevanceEntity.java | 4 -- .../api/entity/inv/InvRemindSetEntity.java | 6 ++- .../api/req/inv/AddInvRemindSetRequest.java | 3 ++ .../inv/impl/InvRemindMsgServiceImpl.java | 10 ++--- .../inv/impl/InvRemindSetServiceImpl.java | 4 +- .../thrsys/impl/ThrInvOrderServiceImpl.java | 2 +- src/main/resources/application-dev.yml | 2 +- .../mybatis/mapper/inv/InvRemindSetDao.xml | 45 ++++++++++--------- src/main/resources/schemas/schema_v2.3.sql | 2 + 9 files changed, 42 insertions(+), 36 deletions(-) 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 f9a34e4df..591481bf4 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -137,13 +137,9 @@ public class UdiRelevanceEntity { @TableField(value = "createTime") private Date createTime; - @TableField(value = "overStockNum") - private Integer overStockNum; @TableField(value = "recentDateTime") private Integer recentDateTime; - @TableField(value = "lowStockNum") - private Integer lowStockNum; @TableField(value = "relCode") private String relCode; diff --git a/src/main/java/com/glxp/api/entity/inv/InvRemindSetEntity.java b/src/main/java/com/glxp/api/entity/inv/InvRemindSetEntity.java index 0db5ea558..3a9c7acbb 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvRemindSetEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvRemindSetEntity.java @@ -95,6 +95,10 @@ public class InvRemindSetEntity { */ @TableField(value = "`status`") private Integer status; + @TableField(value = "lowStockNum") + private Integer lowStockNum; + @TableField(value = "overStockNum") + private Integer overStockNum; @Override public String toString() { @@ -111,4 +115,4 @@ public class InvRemindSetEntity { ", 备注：='" + remark + '\'' + '}'; } -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/req/inv/AddInvRemindSetRequest.java b/src/main/java/com/glxp/api/req/inv/AddInvRemindSetRequest.java index 4695124e1..a70921540 100644 --- a/src/main/java/com/glxp/api/req/inv/AddInvRemindSetRequest.java +++ b/src/main/java/com/glxp/api/req/inv/AddInvRemindSetRequest.java @@ -71,4 +71,7 @@ public class AddInvRemindSetRequest { * 耗材字典ID集合 */ private List relIdList; + + private String lowStockNum; + private String overStockNum; } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvRemindMsgServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvRemindMsgServiceImpl.java index a92e387fb..5167e5375 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvRemindMsgServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvRemindMsgServiceImpl.java @@ -91,14 +91,14 @@ public class InvRemindMsgServiceImpl implements InvRemindMsgService { invRemindMsgRequest.setSupId(invProductEntity.getSupId()); //根据预警设置，添加类型参数 - if (invRemindSetEntity.getLowStock() && null != udiRelevanceEntity.getLowStockNum()) { + if (invRemindSetEntity.getLowStock() && null != invRemindSetEntity.getLowStockNum()) { //开启低库存预警 invRemindMsgRequest.setType("1"); //库存不足预警 InvRemindMsgEntity msgEntity = getInvRemindMsgEntity(invRemindMsgRequest, invProductEntity); //判断是否需要生成/刷新库存预警 - if ((null == msgEntity.getNextRemindTime() || msgEntity.getNextRemindTime().getTime() <= new Date().getTime()) && udiRelevanceEntity.getLowStockNum() > invProductEntity.getReCount()) { + if ((null == msgEntity.getNextRemindTime() || msgEntity.getNextRemindTime().getTime() <= new Date().getTime()) && invRemindSetEntity.getLowStockNum() > invProductEntity.getReCount()) { //设置预警消息 - msgEntity.setMsg(StrUtil.format("库存数量已不足：{}，当前库存数量：{} ", udiRelevanceEntity.getLowStockNum(), invProductEntity.getReCount())); + msgEntity.setMsg(StrUtil.format("库存数量已不足：{}，当前库存数量：{} ", invRemindSetEntity.getLowStockNum(), invProductEntity.getReCount())); saveMsg(msgEntity); } } else { @@ -119,12 +119,12 @@ public class InvRemindMsgServiceImpl implements InvRemindMsgService { } } - if (invRemindSetEntity.getOverStock() && null != udiRelevanceEntity.getOverStockNum()) { + if (invRemindSetEntity.getOverStock() && null != invRemindSetEntity.getOverStockNum()) { //开启库存积压预警 invRemindMsgRequest.setType("3"); //库存积压预警 InvRemindMsgEntity msgEntity = getInvRemindMsgEntity(invRemindMsgRequest, invProductEntity); //判断是否需要生成/刷新库存预警 - if ((null == msgEntity.getNextRemindTime() || msgEntity.getNextRemindTime().getTime() <= new Date().getTime()) && invProductEntity.getReCount() > udiRelevanceEntity.getOverStockNum()) { + if ((null == msgEntity.getNextRemindTime() || msgEntity.getNextRemindTime().getTime() <= new Date().getTime()) && invProductEntity.getReCount() > invRemindSetEntity.getOverStockNum()) { //设置预警消息 msgEntity.setMsg(StrUtil.format("库存积压，当前库存数量：{}", invProductEntity.getReCount())); saveMsg(msgEntity); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java index 89ec1853f..cb9088d9c 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java @@ -233,8 +233,8 @@ public class InvRemindSetServiceImpl implements InvRemindSetService { if (null == udiRelevanceEntity) { invRemindSetEntity.setStatus(0); } else { - if (!invRemindSetEntity.getLowStock() && null == udiRelevanceEntity.getLowStockNum() && - !invRemindSetEntity.getOverStock() && null == udiRelevanceEntity.getOverStockNum() && + if (!invRemindSetEntity.getLowStock() && null == invRemindSetEntity.getLowStockNum() && + !invRemindSetEntity.getOverStock() && null == invRemindSetEntity.getOverStockNum() && !invRemindSetEntity.getRecentDate() && null == udiRelevanceEntity.getRecentDateTime() && !invRemindSetEntity.getExpireDate() && !invRemindSetEntity.getLackStock()) { invRemindSetEntity.setStatus(0); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java index c45c97a65..f74c9ab36 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java @@ -873,7 +873,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { AtomicInteger fullGen = new AtomicInteger(); thrInvOrderDetails.forEach(item -> { Long relId = item.getRelId(); - if (ObjectUtil.isNull(relId)) { + if (ObjectUtil.isNull(relId)) { String thrCode = item.getThrCode(); Integer count = Integer.valueOf(item.getReCount()); List skProjectDetailEntityList = basicDestinyRelService.filterDestinyRelListByPId(thrCode); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 087dbec16..a2ecc2dc9 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt2?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: diff --git a/src/main/resources/mybatis/mapper/inv/InvRemindSetDao.xml b/src/main/resources/mybatis/mapper/inv/InvRemindSetDao.xml index 59d1972ce..8aa7209d0 100644 --- a/src/main/resources/mybatis/mapper/inv/InvRemindSetDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvRemindSetDao.xml @@ -13,8 +13,8 @@ irs.expireDate, irs.recentDate, irs.remark, - bu.lowStockNum, - bu.overStockNum, + irs.lowStockNum, + irs.overStockNum, bu.recentDateTime, bu.useExpireTime, bu.isDateBy, @@ -44,33 +44,34 @@ #{item} - order by irs.updateTime desc diff --git a/src/main/resources/schemas/schema_v2.3.sql b/src/main/resources/schemas/schema_v2.3.sql index 9556053e2..fa436053e 100644 --- a/src/main/resources/schemas/schema_v2.3.sql +++ b/src/main/resources/schemas/schema_v2.3.sql @@ -1152,3 +1152,5 @@ CREATE TABLE if not exists `sup_evaluate_plan_detail` SET FOREIGN_KEY_CHECKS = 1; +CALL Pro_Temp_ColumnWork('inv_remind_set', 'lowStockNum', 'varchar(20) ', 1); +CALL Pro_Temp_ColumnWork('inv_remind_set', 'overStockNum', 'varchar(20) ', 1);