1.完成库存预警功能

src/main/java/com/glxp/api/res/inv/InvRemindSetResponse.java

@@ -35,11 +35,6 @@ public class InvRemindSetResponse {
      */
     private Boolean lowStock;
 
-    /**
-     * 库存低于多少数量时预警
-     */
-    private Integer lowStockNum;
-
     /**
      * 是否开启库存负数预警
      */
@@ -50,11 +45,6 @@ public class InvRemindSetResponse {
      */
     private Boolean overStock;
 
-    /**
-     * 库存高于多少数量时预警
-     */
-    private Integer overStockNum;
-
     /**
      * 是否开启库存产品过期提醒
      */
@@ -65,11 +55,6 @@ public class InvRemindSetResponse {
      */
     private Boolean recentDate;
 
-    /**
-     * 近效期达到多少天时提醒
-     */
-    private Integer recentDateDay;
-
     /**
      * 备注
      */

src/main/java/com/glxp/api/service/inv/impl/InvRemindMsgServiceImpl.java

@@ -62,6 +62,7 @@ public class InvRemindMsgServiceImpl implements InvRemindMsgService {
         invRemindMsgEntity.setIgnoreStatus(0); //重置成为不忽略
         invRemindMsgEntity.setHandleMsg(handleMsg); //处理方式
         invRemindMsgEntity.setUpdateTime(new Date());
+        invRemindMsgEntity.setNextRemindTime(new Date());
         invRemindMsgDao.updateById(invRemindMsgEntity);
         return ResultVOUtils.success("已确认");
     }
@@ -87,6 +88,7 @@ public class InvRemindMsgServiceImpl implements InvRemindMsgService {
                     invRemindMsgRequest.setDeptCode(invProductEntity.getDeptCode());
                     invRemindMsgRequest.setInvCode(invProductEntity.getInvCode());
                     invRemindMsgRequest.setInvSpaceCode(invProductEntity.getInvSpaceCode());
+                    invRemindMsgRequest.setSupId(invProductEntity.getSupId());
 
                     //根据预警设置，添加类型参数
                     if (invRemindSetEntity.getLowStock() && null != udiRelevanceEntity.getLowStockNum()) {
@@ -177,13 +179,13 @@ public class InvRemindMsgServiceImpl implements InvRemindMsgService {
         Date updateTime = msgEntity.getUpdateTime();
         switch (ignoreStatus) {
             case 1:  //忽略7天
-                msgEntity.setNextRemindTime(DateUtil.getBeforeDay(updateTime, 7 * 24));
+                msgEntity.setNextRemindTime(DateUtil.getAfterDay(updateTime, 7 * 24));
                 break;
             case 2: //忽略15天
-                msgEntity.setNextRemindTime(DateUtil.getBeforeDay(updateTime, 15 * 24));
+                msgEntity.setNextRemindTime(DateUtil.getAfterDay(updateTime, 15 * 24));
                 break;
             case 3: //忽略30天
-                msgEntity.setNextRemindTime(DateUtil.getBeforeDay(updateTime, 30 * 24));
+                msgEntity.setNextRemindTime(DateUtil.getAfterDay(updateTime, 30 * 24));
                 break;
             default:
                 break;

src/main/java/com/glxp/api/util/DateUtil.java

@@ -554,7 +554,6 @@ public class DateUtil extends DateUtils {
             long time = actDate.getTime();
             long move = hour * 1000 * 60 * 60;
             time = time - move;
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             return new Date(time);
         } catch (Exception e) {
             e.printStackTrace();
@@ -621,4 +620,23 @@ public class DateUtil extends DateUtils {
         long t2 = Long.parseLong(time);
         return t2 > t1;
     }
+
+    /**
+     * 向后推迟时间
+     *
+     * @param time 时间
+     * @param hour 小时
+     * @return
+     */
+    public static Date getAfterDay(Date date, int hour) {
+        try {
+            long time = date.getTime();
+            long move = hour * 1000 * 60 * 60;
+            time = time + move;
+            return new Date(time);
+        } catch (Exception e) {
+            log.error("向后推迟时间异常", e);
+        }
+        return null;
+    }
 }

src/main/resources/mybatis/mapper/inv/InvRemindSetDao.xml

@@ -8,13 +8,10 @@
                irs.invCode,
                irs.invSpaceCode,
                irs.lowStock,
-               irs.lowStockNum,
                irs.lackStock,
                irs.overStock,
-               irs.overStockNum,
                irs.expireDate,
                irs.recentDate,
-               irs.recentDateDay,
                irs.remark,
                bp.cpmctymc                                                                               productName,
                bp.ggxh,

src/main/resources/mybatis/mapper/inv/invProductDao.xml

@@ -245,9 +245,10 @@
                ip.batchNo,
                ip.productionDate,
                ip.expireDate,
-               sum(ip.inCount),
+               ip.supId,
-               sum(ip.outCount),
+               sum(ip.inCount) incount,
-               sum(ip.reCount)
+               sum(ip.outCount) outCount,
+               sum(ip.reCount) reCount
         from inv_product ip
                  left join inv_product_detail ipd
                            on ip.relIdFk = ipd.relId and ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
@@ -262,7 +263,7 @@
                 AND ip.relIdFk = #{relId}
             </if>
         </where>
-        group by ip.relIdFk, ip.batchNo, ip.invCode, ipd.invSpaceCode
+        group by ip.relIdFk, ip.batchNo
     </select>
 
     <select id="filterProductNames" resultType="com.glxp.api.res.inv.InvProductResponse">