1.合并自助平台库存预警设置的代码

src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java

@@ -1,10 +1,13 @@
 package com.glxp.api.controller.inv;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.Log;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.BusinessType;
 import com.glxp.api.entity.inv.InvRemindSetEntity;
 import com.glxp.api.req.inv.AddInvRemindSetRequest;
 import com.glxp.api.req.inv.FilterInvRemindSetRequest;
@@ -79,4 +82,33 @@ public class InvRemindSetController {
         return invRemindSetService.deleteInvRemindSet(Integer.valueOf(deleteRequest.getId()));
     }
 
+    /**
+     * 批量添加库存预警设置
+     *
+     * @param addInvRemindSetRequest
+     * @return
+     */
+    @PostMapping("/udiwms/inv/remind/set/batchAddInvRemindSet")
+    @Log(title = "库存预警", businessType = BusinessType.INSERT)
+    public BaseResponse batchAddInvRemindSet(@RequestBody AddInvRemindSetRequest addInvRemindSetRequest) {
+        if (null == addInvRemindSetRequest || CollUtil.isEmpty(addInvRemindSetRequest.getRelIdList())) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        return invRemindSetService.batchAddInvRemindSet(addInvRemindSetRequest);
+    }
+
+    /**
+     * 通过库存ID查询生成库存预警设置的信息
+     *
+     * @param invId
+     * @return
+     */
+    @GetMapping("/udiwms/inv/remind/set/getInfoByInvId")
+    public BaseResponse getInfoByInvId(FilterInvRemindSetRequest filterInvRemindSetRequest) {
+        if (null == filterInvRemindSetRequest || null == filterInvRemindSetRequest.getInvId()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        return invRemindSetService.getInfoByInvId(filterInvRemindSetRequest.getInvId());
+    }
+
 }

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

@@ -24,4 +24,14 @@ public class FilterInvRemindSetRequest extends ListPageRequest {
      */
     private String invSpaceCode;
 
+    /**
+     * 库存ID
+     */
+    private Integer invId;
+
+    /**
+     * 状态  0：未启用    1：已启用
+     */
+    private Integer status;
+
 }

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

@@ -52,7 +52,16 @@ public class InvRemindSetServiceImpl implements InvRemindSetService {
         if (null != filterInvRemindSetRequest.getPage() && null != filterInvRemindSetRequest.getLimit()) {
             PageHelper.offsetPage((filterInvRemindSetRequest.getPage() - 1) * filterInvRemindSetRequest.getLimit(), filterInvRemindSetRequest.getLimit());
         }
-        return invRemindSetDao.filterList(filterInvRemindSetRequest);
+        List<InvRemindSetResponse> list = invRemindSetDao.filterList(filterInvRemindSetRequest);
+        if (CollUtil.isNotEmpty(list)) {
+            list.forEach(invRemindSetResponse -> {
+                if (invRemindSetResponse.getIsDateBy() == 1 && null != invRemindSetResponse.getRecentDateTime()) {
+                    //将近效期预警值由小时换算成天
+                    invRemindSetResponse.setRecentDateTime(invRemindSetResponse.getRecentDateTime() / 24);
+                }
+            });
+        }
+        return list;
     }
 
     @Override
@@ -115,6 +124,20 @@ public class InvRemindSetServiceImpl implements InvRemindSetService {
     public BaseResponse getInfoByInvId(Integer invId) {
         InvRemindSetResponse response = invRemindSetDao.selectInfoByInvId(invId);
         if (null != response) {
+            //查询是否已有库存预警设置信息，若已存在预警设置，则回显旧数据
+            InvRemindSetEntity invRemindSetEntity = invRemindSetDao.selectOne(new QueryWrapper<InvRemindSetEntity>()
+                    .eq("deptCode", response.getDeptCode())
+                    .eq("invCode", response.getInvCode())
+                    .eq("relId", response.getRelId())
+            );
+
+            if (null != invRemindSetEntity) {
+                response.setLackStock(invRemindSetEntity.getLackStock());
+                response.setLowStock(invRemindSetEntity.getLowStock());
+                response.setOverStock(invRemindSetEntity.getOverStock());
+                response.setExpireDate(invRemindSetEntity.getExpireDate());
+                response.setRecentDate(invRemindSetEntity.getRecentDate());
+            }
             if (response.getIsDateBy() == 1 && null != response.getRecentDateTime()) {
                 //将近效期预警值由小时换算成天
                 response.setRecentDateTime(response.getRecentDateTime() / 24);

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

@@ -13,6 +13,11 @@
         irs.expireDate,
         irs.recentDate,
         irs.remark,
+        bu.lowStockNum,
+        bu.overStockNum,
+        bu.recentDateTime,
+        bu.useExpireTime,
+        bu.isDateBy,
         bp.cpmctymc                                                                               productName,
         bp.ggxh,
         (select `name` from auth_warehouse where `code` = irs.invCode)                            invName,
@@ -45,7 +50,8 @@
                (select `name` from auth_warehouse where code = ip.invCode) invName,
                (select `name`
                 from auth_space
-        where code = ipd.invSpaceCode and invWarehouseCode = ip.invCode) invSpaceName,
+                where code = ipd.invSpaceCode
+                  and invWarehouseCode = ip.invCode)                       invSpaceName,
                bp.ggxh,
                bp.cpmctymc                                                 productName,
                bu.lowStockNum,

src/main/resources/schemas/schema_v2.1.sql

@@ -122,6 +122,7 @@ CALL Pro_Temp_ColumnWork('sup_product', 'allowNoProduct', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('sup_product', 'allowNoSerial', 'tinyint', 1);
 
 CALL Pro_Temp_ColumnWork('inv_remind_msg', 'remindCount', 'int', 1);
+CALL Pro_Temp_ColumnWork('inv_remind_set', 'status', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('sup_cert_remind_msg', 'remindCount', 'int', 1);
 
 CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'orderStatus', 'tinyint', 1);
@@ -166,6 +167,7 @@ CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_biz', 'updateTime', 'dateti
 CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_label', 'updateTime', 'datetime', 1);
 CALL Pro_Temp_ColumnWork('sys_pdf_template_relevance_statemen', 'updateTime', 'datetime', 1);
 
+
 # CALL Pro_Temp_ColumnWork('sup_cert_set', 'foreign', 'tinyint', 3);
 # CALL Pro_Temp_ColumnWork('sup_cert_set', 'needForeign', 'tinyint', 1);