库存预警修改

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;

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() {

src/main/java/com/glxp/api/req/inv/AddInvRemindSetRequest.java

@@ -71,4 +71,7 @@ public class AddInvRemindSetRequest {
      * 耗材字典ID集合
      */
     private List<String> relIdList;
+
+    private String lowStockNum;
+    private String overStockNum;
 }

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);

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);

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:

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,7 +44,6 @@
                     #{item}
                 </foreach>
             </if>
-
         </where>
         order by irs.updateTime desc
     </select>
@@ -61,8 +60,8 @@
         and invWarehouseCode = ip.invCode)                       invSpaceName,
         bp.ggxh,
         bp.cpmctymc                                                 productName,
-               bu.lowStockNum,
-               bu.overStockNum,
+        irs.lowStockNum,
+        irs.overStockNum,
         bu.recentDateTime,
         bu.isDateBy
         from inv_product ip
@@ -71,6 +70,8 @@
         left join inv_product_detail ipd
         on ip.relIdFk = ipd.relId and IFNULL(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
         and ip.invCode = ipd.invCode
+
+        left join inv_remind_set irs on ip.invCode = irs.invCode and ip.relIdFk = irs.relId
         where ip.id = #{invId}
         group by ip.id
     </select>

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);