From 3f9968e9a3aef7a0115adfe46ad8e6404f0892ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 14 Mar 2023 15:07:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=B7=BB=E5=8A=A0=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiRelevanceController.java | 4 ++++ .../api/entity/basic/UdiRelevanceEntity.java | 1 + .../req/basic/UdiRelevanceSaveRequest.java | 5 +++++ .../api/res/basic/UdiRelevanceResponse.java | 14 ++++++++++++ .../com/glxp/api/task/InvRemindMsgTask.java | 22 +++++++++---------- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 12 ++++++++++ src/main/resources/schemas/schema_v2.1.sql | 5 ++++- 7 files changed, 51 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 5f109b483..e63a8ae45 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -288,6 +288,10 @@ public class UdiRelevanceController { } //更新关联表 + if(udiRelevanceSaveRequest.getIsDateBy()==1){ + int time=udiRelevanceSaveRequest.getRecentDateTime()*24; + udiRelevanceSaveRequest.setRecentDateTime(time); + } UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); BeanUtils.copyProperties(udiRelevanceSaveRequest, udiRelevanceEntity); udiRelevanceEntity.setId(udiRelevanceSaveRequest.getId()); 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 66325e8c6..f397a2c4e 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -43,4 +43,5 @@ public class UdiRelevanceEntity { private boolean dispatch; //是否可配送 private boolean groupBuy; //是否集采产品 private String relCode; + private Integer isDateBy; } diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java index ba64bc0bf..4b37d1d47 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java @@ -88,6 +88,11 @@ public class UdiRelevanceSaveRequest { //关联修改提交:true;单独提交:false private Boolean relSubmit; + private Integer lowStockNum; + private Integer overStockNum; + private Integer recentDateTime; + private Integer isDateBy; + private boolean dispatch; //是否可配送 private boolean groupBuy; //是否集采产品 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 05863e49c..8592b2233 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -90,6 +90,11 @@ public class UdiRelevanceResponse { private Integer useExpireTime; + private Integer lowStockNum; + private Integer overStockNum; + private Integer recentDateTime; + private Integer isDateBy; + //关联查询字典 private String unitFk; //供应商ID @@ -132,4 +137,13 @@ public class UdiRelevanceResponse { return false; return isUseDy; } + + + public Integer getIsDateBy() { + return isDateBy; + } + + public void setIsDateBy(Integer isDateBy) { + this.isDateBy = isDateBy; + } } diff --git a/src/main/java/com/glxp/api/task/InvRemindMsgTask.java b/src/main/java/com/glxp/api/task/InvRemindMsgTask.java index 7fd6b3d4d..0fde90828 100644 --- a/src/main/java/com/glxp/api/task/InvRemindMsgTask.java +++ b/src/main/java/com/glxp/api/task/InvRemindMsgTask.java @@ -58,16 +58,16 @@ public class InvRemindMsgTask implements SchedulingConfigurer { } private void process() { - log.info("开始扫描库存信息，生成库存预警消息"); - List invRemindSetEntities = invRemindSetDao.selectList(null); - if (CollUtil.isNotEmpty(invRemindSetEntities)) { - log.info("库存预警设置条数：{}", invRemindSetEntities.size()); - //开始生成库存信息 - for (InvRemindSetEntity invRemindSetEntity : invRemindSetEntities) { - executor.execute(ThreadUtil.newThread(() -> invRemindMsgService.createRemindMsg(invRemindSetEntity), "createInvRemindThread")); - } - } else { - log.info("无库存预警设置，结束库存扫描"); - } +// log.info("开始扫描库存信息，生成库存预警消息"); +// List invRemindSetEntities = invRemindSetDao.selectList(null); +// if (CollUtil.isNotEmpty(invRemindSetEntities)) { +// log.info("库存预警设置条数：{}", invRemindSetEntities.size()); +// //开始生成库存信息 +// for (InvRemindSetEntity invRemindSetEntity : invRemindSetEntities) { +// executor.execute(ThreadUtil.newThread(() -> invRemindMsgService.createRemindMsg(invRemindSetEntity), "createInvRemindThread")); +// } +// } else { +// log.info("无库存预警设置，结束库存扫描"); +// } } } diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 8bd812e14..2afc41856 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -746,6 +746,18 @@ groupBuy=#{groupBuy}, + + lowStockNum=#{lowStockNum}, + + + overStockNum=#{overStockNum}, + + + recentDateTime=#{recentDateTime}, + + + isDateBy=#{isDateBy}, + WHERE id = #{id} diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index a44fea5e9..4182d1f13 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -11,7 +11,10 @@ CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1) CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'relCode', 'varchar(255) ', 1); -CALL Pro_Temp_ColumnWork('basic_udirel', 'lowStockNum', 'varchar(255) ', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'lowStockNum', 'tinyint ', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'overStockNum', 'tinyint ', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'recentDateTime', 'tinyint ', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'isDateBy', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'useExpireTime', 'int', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'dispatch', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'groupBuy', 'tinyint', 1);