1.添加库存预警相关的实体类和接口

master
x_z 2 years ago
parent d74a95f05f
commit dcbc6712eb

@ -6,10 +6,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication
@ServletComponentScan
@EnableScheduling
@MapperScan("com.glxp.api.dao")
public class ApiAdminApplication extends SpringBootServletInitializer {

@ -0,0 +1,50 @@
package com.glxp.api.controller.inv;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.req.inv.FilterInvRemindMsgRequest;
import com.glxp.api.res.inv.InvRemindMsgResponse;
import com.glxp.api.service.inv.InvRemindMsgService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
*
*/
@Slf4j
@RestController
public class InvRemindMsgController {
@Resource
private InvRemindMsgService invRemindMsgService;
/**
*
*
* @param filterInvRemindMsgRequest
* @return
*/
@GetMapping("/udiwms/inv/remind/msg/filter")
public BaseResponse filterList(FilterInvRemindMsgRequest filterInvRemindMsgRequest) {
List<InvRemindMsgResponse> list = invRemindMsgService.filterList(filterInvRemindMsgRequest);
PageInfo<InvRemindMsgResponse> pageInfo = new PageInfo<>(list);
return ResultVOUtils.page(pageInfo);
}
/**
*
*
* @param id
* @return
*/
@GetMapping("/udiwms/inv/remind/msg/confirmMsg")
public BaseResponse confirmMsg(Integer id, String handleMsg) {
return invRemindMsgService.confirmMsg(id, handleMsg);
}
}

@ -0,0 +1,82 @@
package com.glxp.api.controller.inv;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
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.entity.inv.InvRemindSetEntity;
import com.glxp.api.req.inv.AddInvRemindSetRequest;
import com.glxp.api.req.inv.FilterInvRemindSetRequest;
import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.res.inv.InvRemindSetResponse;
import com.glxp.api.service.inv.InvRemindSetService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
*
*/
@Slf4j
@RestController
public class InvRemindSetController {
@Resource
private InvRemindSetService invRemindSetService;
/**
*
*
* @param filterInvRemindSetRequest
* @return
*/
@GetMapping("/udiwms/inv/remind/set/filter")
public BaseResponse filterList(FilterInvRemindSetRequest filterInvRemindSetRequest) {
List<InvRemindSetResponse> list = invRemindSetService.filterList(filterInvRemindSetRequest);
PageInfo<InvRemindSetResponse> pageInfo = new PageInfo<>(list);
return ResultVOUtils.page(pageInfo);
}
/**
*
*
* @param addInvRemindSetRequest
* @return
*/
@PostMapping("/udiwms/inv/remind/set/add")
public BaseResponse addInvRemindSet(@RequestBody AddInvRemindSetRequest addInvRemindSetRequest) {
return invRemindSetService.addInvRemindSet(addInvRemindSetRequest);
}
/**
*
*
* @param invRemindSetEntity
* @return
*/
@PostMapping("/udiwms/inv/remind/set/update")
public BaseResponse updateInvRemindSet(@RequestBody InvRemindSetEntity invRemindSetEntity) {
return invRemindSetService.updateInvRemindSet(invRemindSetEntity);
}
/**
*
*
* @param deleteRequest
* @return
*/
@PostMapping("/udiwms/inv/remind/set/delete")
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
if (null == deleteRequest || StrUtil.isBlank(deleteRequest.getId())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
return invRemindSetService.deleteInvRemindSet(Integer.valueOf(deleteRequest.getId()));
}
}

@ -55,4 +55,14 @@ public interface InvProductDao extends BaseMapperPlus<InvProductDao, InvProductE
* @return
*/
List<InvProductResponse> getCountInvProduct(FilterInvProductRequest filterInvProductRequest);
/**
*
*
* @param invCode
* @param invSpaceCode
* @param relId
* @return
*/
List<InvProductEntity> selectInvProductInfo(@Param("invCode") String invCode, @Param("invSpaceCode") String invSpaceCode, @Param("relId") String relId);
}

@ -0,0 +1,22 @@
package com.glxp.api.dao.inv;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.InvRemindMsgEntity;
import com.glxp.api.req.inv.FilterInvRemindMsgRequest;
import com.glxp.api.res.inv.InvRemindMsgResponse;
import java.util.List;
/**
* Dao
*/
public interface InvRemindMsgDao extends BaseMapper<InvRemindMsgEntity> {
/**
*
*
* @param filterInvRemindMsgRequest
* @return
*/
List<InvRemindMsgResponse> filterList(FilterInvRemindMsgRequest filterInvRemindMsgRequest);
}

@ -0,0 +1,22 @@
package com.glxp.api.dao.inv;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.InvRemindSetEntity;
import com.glxp.api.req.inv.FilterInvRemindSetRequest;
import com.glxp.api.res.inv.InvRemindSetResponse;
import java.util.List;
/**
* Dao
*/
public interface InvRemindSetDao extends BaseMapper<InvRemindSetEntity> {
/**
*
*
* @param filterInvRemindSetRequest
* @return
*/
List<InvRemindSetResponse> filterList(FilterInvRemindSetRequest filterInvRemindSetRequest);
}

@ -0,0 +1,134 @@
package com.glxp.api.entity.inv;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
@TableName(value = "inv_remind_msg")
public class InvRemindMsgEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* ID
*/
@TableField(value = "relId")
private String relId;
/**
*
*/
@TableField(value = "batchNo")
private String batchNo;
/**
*
*/
@TableField(value = "productionDate")
private String productionDate;
/**
*
*/
@TableField(value = "expireDate")
private String expireDate;
/**
*
*/
@TableField(value = "deptCode")
private String deptCode;
/**
*
*/
@TableField(value = "invCode")
private String invCode;
/**
*
*/
@TableField(value = "invSpaceCode")
private String invSpaceCode;
/**
*
*/
@TableField(value = "inCount")
private Integer inCount;
/**
*
*/
@TableField(value = "outCount")
private Integer outCount;
/**
*
*/
@TableField(value = "reCount")
private Integer reCount;
/**
* 1:2
*/
@TableField(value = "`status`")
private Integer status;
/**
* 017215330
*/
@TableField(value = "ignoreStatus")
private Integer ignoreStatus;
/**
* 12345
*/
@TableField(value = "`type`")
private Integer type;
/**
*
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
*
*/
@TableField(value = "createTime")
private Date createTime;
/**
*
*/
@TableField(value = "nextRemindTime")
private Date nextRemindTime;
/**
*
*/
@TableField(value = "remark")
private String remark;
/**
*
*/
@TableField(value = "msg")
private String msg;
/**
*
*/
@TableField(value = "handleMsg")
private String handleMsg;
}

@ -0,0 +1,166 @@
package com.glxp.api.entity.inv;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
/**
*
*/
@Data
@TableName(value = "inv_remind_set")
public class InvRemindSetEntity {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
*
*/
@TableField(value = "relId")
private String relId;
/**
*
*/
@TableField(value = "deptCode")
private String deptCode;
/**
*
*/
@TableField(value = "invCode")
private String invCode;
/**
*
*/
@TableField(value = "invSpaceCode")
private String invSpaceCode;
/**
*
*/
@TableField(value = "lowStock")
private Boolean lowStock;
/**
*
*/
@TableField(value = "lowStockNum")
private Integer lowStockNum;
/**
*
*/
@TableField(value = "lackStock")
private Boolean lackStock;
/**
*
*/
@TableField(value = "overStock")
private Boolean overStock;
/**
*
*/
@TableField(value = "overStockNum")
private Integer overStockNum;
/**
*
*/
@TableField(value = "expireDate")
private Boolean expireDate;
/**
*
*/
@TableField(value = "recentDate")
private Boolean recentDate;
/**
*
*/
@TableField(value = "recentDateDay")
private Integer recentDateDay;
/**
*
*/
@TableField(value = "remark")
private String remark;
@TableField(value = "`createUser`")
private String createUser;
@TableField(value = "createTime")
private Date createTime;
@TableField(value = "updateUser")
private String updateUser;
@TableField(value = "updateTime")
private Date updateTime;
public static final String COL_ID = "id";
public static final String COL_RELID = "relId";
public static final String COL_DEPTCODE = "deptCode";
public static final String COL_INVCODE = "invCode";
public static final String COL_INVSPACECODE = "invSpaceCode";
public static final String COL_LOWSTOCK = "lowStock";
public static final String COL_LOWSTOCKNUM = "lowStockNum";
public static final String COL_LACKSTOCK = "lackStock";
public static final String COL_OVERSTOCK = "overStock";
public static final String COL_OVERSTOCKNUM = "overStockNum";
public static final String COL_EXPIREDATE = "expireDate";
public static final String COL_RECENTDATE = "recentDate";
public static final String COL_RECENTDATEDAY = "recentDateDay";
public static final String COL_REMARK = "remark";
public static final String COL_CREATEUSER = "createUser";
public static final String COL_CREATETIME = "createTime";
public static final String COL_UPDATEUSER = "updateUser";
public static final String COL_UPDATETIME = "updateTime";
@Override
public String toString() {
return "InvRemindSetEntity{" +
", 产品ID='" + relId + '\'' +
", 部门编码:='" + deptCode + '\'' +
", 仓库编码:='" + invCode + '\'' +
", 货位编码:='" + invSpaceCode + '\'' +
", 是否开启低库存预警:=" + lowStock +
", 库存低于多少数量时预警:=" + lowStockNum +
", 是否开启库存负数预警:=" + lackStock +
", 是否开启库存积压预警:=" + overStock +
", 库存高于多少数量时预警:=" + overStockNum +
", 是否开启库存产品过期提醒:=" + expireDate +
", 是否开启近效期提醒:=" + recentDate +
", 近效期达到多少天时提醒:=" + recentDateDay +
", 备注:='" + remark + '\'' +
'}';
}
}

@ -0,0 +1,78 @@
package com.glxp.api.req.inv;
import lombok.Data;
/**
*
*/
@Data
public class AddInvRemindSetRequest {
private Integer id;
/**
*
*/
private String relId;
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String invSpaceCode;
/**
*
*/
private Boolean lowStock;
/**
*
*/
private Integer lowStockNum;
/**
*
*/
private Boolean lackStock;
/**
*
*/
private Boolean overStock;
/**
*
*/
private Integer overStockNum;
/**
*
*/
private Boolean expireDate;
/**
*
*/
private Boolean recentDate;
/**
*
*/
private Integer recentDateDay;
/**
*
*/
private String remark;
}

@ -0,0 +1,42 @@
package com.glxp.api.req.inv;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
/**
*
*/
@Data
public class FilterInvRemindMsgRequest extends ListPageRequest {
/**
* ID
*/
private String relId;
/**
*
*/
private String batchNo;
/**
*
*/
private String invCode;
/**
*
*/
private String invSpaceCode;
/**
* 1:2
*/
private Integer status;
/**
* 12345
*/
private String type;
}

@ -0,0 +1,27 @@
package com.glxp.api.req.inv;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
/**
*
*/
@Data
public class FilterInvRemindSetRequest extends ListPageRequest {
/**
*
*/
private String relId;
/**
*
*/
private String invCode;
/**
*
*/
private String invSpaceCode;
}

@ -0,0 +1,115 @@
package com.glxp.api.res.inv;
import lombok.Data;
import java.util.Date;
/**
* VO
*/
@Data
public class InvRemindMsgResponse {
private Integer id;
/**
* ID
*/
private Integer relId;
/**
*
*/
private String batchNo;
/**
*
*/
private String productionDate;
/**
*
*/
private String expireDate;
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String invSpaceCode;
/**
*
*/
private Integer inCount;
/**
*
*/
private Integer outCount;
/**
*
*/
private Integer reCount;
/**
* 1:2
*/
private Integer status;
/**
* 12345
*/
private Integer type;
/**
*
*/
private String remark;
/**
*
*/
private String productName;
/**
*
*/
private String invName;
/**
*
*/
private String invSpaceName;
/**
*
*/
private String msg;
/**
*
*/
private String handleMsg;
/**
*
*/
private Date nextRemindTime;
/**
* 017215330
*/
private Integer ignoreStatus;
}

@ -0,0 +1,93 @@
package com.glxp.api.res.inv;
import lombok.Data;
/**
* VO
*/
@Data
public class InvRemindSetResponse {
private Integer id;
/**
*
*/
private String relId;
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String invSpaceCode;
/**
*
*/
private Boolean lowStock;
/**
*
*/
private Integer lowStockNum;
/**
*
*/
private Boolean lackStock;
/**
*
*/
private Boolean overStock;
/**
*
*/
private Integer overStockNum;
/**
*
*/
private Boolean expireDate;
/**
*
*/
private Boolean recentDate;
/**
*
*/
private Integer recentDateDay;
/**
*
*/
private String remark;
/**
*
*/
private String productName;
/**
*
*/
private String invName;
/**
*
*/
private String invSpaceName;
}

@ -0,0 +1,37 @@
package com.glxp.api.service.inv;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.entity.inv.InvRemindSetEntity;
import com.glxp.api.req.inv.FilterInvRemindMsgRequest;
import com.glxp.api.res.inv.InvRemindMsgResponse;
import java.util.List;
/**
* Servcie
*/
public interface InvRemindMsgService {
/**
*
*
* @param filterInvRemindMsgRequest
* @return
*/
List<InvRemindMsgResponse> filterList(FilterInvRemindMsgRequest filterInvRemindMsgRequest);
/**
*
*
* @param id
* @return
*/
BaseResponse confirmMsg(Integer id, String handleMsg);
/**
*
*
* @param invRemindSetEntity
*/
void createRemindMsg(InvRemindSetEntity invRemindSetEntity);
}

@ -0,0 +1,48 @@
package com.glxp.api.service.inv;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.entity.inv.InvRemindSetEntity;
import com.glxp.api.req.inv.AddInvRemindSetRequest;
import com.glxp.api.req.inv.FilterInvRemindSetRequest;
import com.glxp.api.res.inv.InvRemindSetResponse;
import java.util.List;
/**
* Service
*/
public interface InvRemindSetService {
/**
*
*
* @param filterInvRemindSetRequest
* @return
*/
List<InvRemindSetResponse> filterList(FilterInvRemindSetRequest filterInvRemindSetRequest);
/**
*
*
* @param addInvRemindSetRequest
* @return
*/
BaseResponse addInvRemindSet(AddInvRemindSetRequest addInvRemindSetRequest);
/**
*
*
* @param invRemindSetEntity
* @return
*/
BaseResponse updateInvRemindSet(InvRemindSetEntity invRemindSetEntity);
/**
* ID
*
* @param id
* @return
*/
BaseResponse deleteInvRemindSet(Integer id);
}

@ -0,0 +1,115 @@
package com.glxp.api.service.inv.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
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.dao.inv.InvProductDao;
import com.glxp.api.dao.inv.InvRemindMsgDao;
import com.glxp.api.entity.inv.InvProductEntity;
import com.glxp.api.entity.inv.InvRemindMsgEntity;
import com.glxp.api.entity.inv.InvRemindSetEntity;
import com.glxp.api.req.inv.FilterInvRemindMsgRequest;
import com.glxp.api.res.inv.InvRemindMsgResponse;
import com.glxp.api.service.inv.InvRemindMsgService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
public class InvRemindMsgServiceImpl implements InvRemindMsgService {
@Resource
private InvRemindMsgDao invRemindMsgDao;
@Resource
private InvProductDao invProductDao;
@Override
public List<InvRemindMsgResponse> filterList(FilterInvRemindMsgRequest filterInvRemindMsgRequest) {
if (null == filterInvRemindMsgRequest) {
return Collections.emptyList();
}
if (null != filterInvRemindMsgRequest.getPage() && null != filterInvRemindMsgRequest.getLimit()) {
PageHelper.offsetPage((filterInvRemindMsgRequest.getPage() - 1) * filterInvRemindMsgRequest.getLimit(), filterInvRemindMsgRequest.getLimit());
}
return invRemindMsgDao.filterList(filterInvRemindMsgRequest);
}
@Override
public BaseResponse confirmMsg(Integer id, String handleMsg) {
InvRemindMsgEntity invRemindMsgEntity = invRemindMsgDao.selectById(id);
if (null == invRemindMsgEntity) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "消息不存在");
}
invRemindMsgEntity.setStatus(2); //消息状态修改为已确认
invRemindMsgEntity.setIgnoreStatus(0); //重置成为不忽略
invRemindMsgEntity.setHandleMsg(handleMsg); //处理方式
invRemindMsgEntity.setUpdateTime(new Date());
invRemindMsgDao.updateById(invRemindMsgEntity);
return ResultVOUtils.success("已确认");
}
@Override
public void createRemindMsg(InvRemindSetEntity invRemindSetEntity) {
log.info("库存预警设置:{}", invRemindSetEntity.toString());
//查询库存数量
List<InvProductEntity> invProductList = invProductDao.selectInvProductInfo(invRemindSetEntity.getInvCode(), invRemindSetEntity.getInvSpaceCode(), invRemindSetEntity.getRelId());
if (CollUtil.isNotEmpty(invProductList)) {
List<InvProductEntity> invDataList = new CopyOnWriteArrayList<>(invProductList);
invDataList.parallelStream().forEach(invProductEntity -> {
QueryWrapper<InvRemindMsgEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StrUtil.isNotBlank(invRemindSetEntity.getRelId()), "relId", invRemindSetEntity.getRelId())
.eq("invCode", invRemindSetEntity.getInvCode())
.eq(StrUtil.isNotBlank(invRemindSetEntity.getInvSpaceCode()), "invSpaceCode", invRemindSetEntity.getInvSpaceCode());
InvRemindMsgEntity invRemindMsgEntity = invRemindMsgDao.selectOne(wrapper);
if (null == invRemindMsgEntity) {
invRemindMsgEntity = new InvRemindMsgEntity();
invRemindMsgEntity.setCreateTime(new Date());
invRemindMsgEntity.setInvCode(invRemindSetEntity.getInvCode());
invRemindMsgEntity.setInvSpaceCode(invRemindSetEntity.getInvSpaceCode());
if (StrUtil.isBlank(invRemindSetEntity.getRelId())) {
//按照产品统计
invRemindMsgEntity.setRelId(invRemindSetEntity.getRelId());
} else {
//按仓库统计
//TODO 待完善
}
}
//生成或更新预警消息标识
boolean flag = false;
StringBuffer msg = new StringBuffer();
//根据库存信息设置,计算或升成库存预警
if (invRemindSetEntity.getLowStock()) {
//开启低库存预警
if (invProductEntity.getReCount() < invRemindSetEntity.getLowStockNum()) {
invRemindMsgEntity.setReCount(invRemindMsgEntity.getReCount());
invRemindMsgEntity.setInCount(invProductEntity.getInCount());
invRemindMsgEntity.setOutCount(invProductEntity.getOutCount());
//invRemindMsgEntity.set
msg.append("库存过低,当前库存数量:").append(invProductEntity.getReCount()).append("\n");
flag = true;
}
}
});
} else {
log.info("此仓库或产品库存信息不存在");
}
}
}

@ -0,0 +1,96 @@
package com.glxp.api.service.inv.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
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.dao.inv.InvRemindSetDao;
import com.glxp.api.entity.inv.InvRemindSetEntity;
import com.glxp.api.req.inv.AddInvRemindSetRequest;
import com.glxp.api.req.inv.FilterInvRemindSetRequest;
import com.glxp.api.res.inv.InvRemindSetResponse;
import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.inv.InvRemindSetService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
public class InvRemindSetServiceImpl implements InvRemindSetService {
@Resource
private InvRemindSetDao invRemindSetDao;
@Resource
private CustomerService customerService;
@Override
public List<InvRemindSetResponse> filterList(FilterInvRemindSetRequest filterInvRemindSetRequest) {
if (null == filterInvRemindSetRequest) {
return Collections.emptyList();
}
if (null != filterInvRemindSetRequest.getPage() && null != filterInvRemindSetRequest.getLimit()) {
PageHelper.offsetPage((filterInvRemindSetRequest.getPage() - 1) * filterInvRemindSetRequest.getLimit(), filterInvRemindSetRequest.getLimit());
}
return invRemindSetDao.filterList(filterInvRemindSetRequest);
}
@Override
public BaseResponse addInvRemindSet(AddInvRemindSetRequest addInvRemindSetRequest) {
if (StrUtil.isBlank(addInvRemindSetRequest.getRelId()) || StrUtil.isBlank(addInvRemindSetRequest.getInvCode())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "产品库存信息不完整!");
}
if (false == addInvRemindSetRequest.getLowStock() && false == addInvRemindSetRequest.getLackStock() && false == addInvRemindSetRequest.getOverStock() && false == addInvRemindSetRequest.getExpireDate() && false == addInvRemindSetRequest.getRecentDate()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "预警设置至少开启一项预警!");
}
InvRemindSetEntity invRemindSetEntity = new InvRemindSetEntity();
BeanUtil.copyProperties(addInvRemindSetRequest, invRemindSetEntity);
setUpdateInfo(invRemindSetEntity);
invRemindSetDao.insert(invRemindSetEntity);
return ResultVOUtils.success("添加成功");
}
@Override
public BaseResponse updateInvRemindSet(InvRemindSetEntity invRemindSetEntity) {
if (false == invRemindSetEntity.getLowStock() && false == invRemindSetEntity.getLackStock() && false == invRemindSetEntity.getOverStock() && false == invRemindSetEntity.getExpireDate() && false == invRemindSetEntity.getRecentDate()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "预警设置至少开启一项预警!");
}
setUpdateInfo(invRemindSetEntity);
invRemindSetDao.updateById(invRemindSetEntity);
return ResultVOUtils.success("更新成功");
}
@Override
public BaseResponse deleteInvRemindSet(Integer id) {
if (null == id) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
invRemindSetDao.deleteById(id);
return ResultVOUtils.success("删除成功");
}
/**
*
*
* @param invRemindSetEntity
*/
private void setUpdateInfo(InvRemindSetEntity invRemindSetEntity) {
Date date = new Date();
String userId = customerService.getUserIdStr();
if (null == invRemindSetEntity.getId()) {
invRemindSetEntity.setCreateUser(userId);
invRemindSetEntity.setCreateTime(date);
}
invRemindSetEntity.setUpdateUser(userId);
invRemindSetEntity.setUpdateTime(date);
}
}

@ -0,0 +1,59 @@
package com.glxp.api.task;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.thread.ThreadUtil;
import com.glxp.api.dao.inv.InvRemindSetDao;
import com.glxp.api.dao.schedule.ScheduledDao;
import com.glxp.api.entity.inv.InvRemindSetEntity;
import com.glxp.api.entity.system.ScheduledEntity;
import com.glxp.api.req.system.ScheduledRequest;
import com.glxp.api.service.inv.InvRemindMsgService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.SchedulingConfigurer;
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
import org.springframework.scheduling.support.CronTrigger;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.List;
@Slf4j
@Component
public class InvRemindMsgTask implements SchedulingConfigurer {
@Resource
private ScheduledDao scheduledDao;
@Resource
private InvRemindMsgService invRemindMsgService;
@Resource
private InvRemindSetDao invRemindSetDao;
@Override
public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
taskRegistrar.addTriggerTask(this::process, triggerContext -> {
ScheduledRequest scheduledRequest = new ScheduledRequest();
scheduledRequest.setCronName("invRemindMsgTask");
ScheduledEntity scheduled = scheduledDao.findScheduled(scheduledRequest);
if (null == scheduled) {
log.error("库存预警定时任务未配置,请注意!");
return null;
}
String cron = scheduled.getCron();
return new CronTrigger(cron).nextExecutionTime(triggerContext);
});
}
private void process() {
log.info("开始扫描库存信息,生成库存预警消息");
List<InvRemindSetEntity> invRemindSetEntities = invRemindSetDao.selectList(null);
if (CollUtil.isNotEmpty(invRemindSetEntities)) {
log.info("库存预警设置条数:{}", invRemindSetEntities.size());
//开始生成库存信息
for (InvRemindSetEntity invRemindSetEntity : invRemindSetEntities) {
ThreadUtil.execAsync(ThreadUtil.newThread(() -> invRemindMsgService.createRemindMsg(invRemindSetEntity), "createInvRemindThread"));
}
} else {
log.info("无库存预警设置,结束库存扫描");
}
}
}

@ -11,7 +11,6 @@ import com.glxp.api.service.inout.IoAddInoutService;
import com.glxp.api.service.inout.IoOrderService;
import com.glxp.api.service.system.SystemParamConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.SchedulingConfigurer;
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
import org.springframework.scheduling.support.CronTrigger;
@ -26,7 +25,6 @@ import java.util.concurrent.atomic.AtomicInteger;
*/
@Slf4j
@Component
@EnableScheduling
public class SupplementOrderTask implements SchedulingConfigurer {
@Resource

@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.inv.InvRemindMsgDao">
<select id="filterList" resultType="com.glxp.api.res.inv.InvRemindMsgResponse">
select irm.id,
irm.relId,
irm.batchNo,
irm.productionDate,
irm.expireDate,
irm.deptCode,
irm.invCode,
irm.invSpaceCode,
irm.inCount,
irm.outCount,
irm.reCount,
irm.status,
irm.type,
irm.remark,
bp.cpmctymc productName,
(select `name` from auth_warehouse where `code` = irm.invCode) invName,
(select `name` from auth_space where `code` = irm.invSpaceCode and invCode = irm.invCode) invSpaceName
from inv_remind_msg irm
left join basic_udirel bu on bu.id = irm.relId
left join basic_products bp on bp.uuid = bu.uuid
<where>
<if test="relId != null and relId != ''">
AND irm.relId = #{relId}
</if>
<if test="batchNo != null and batchNo != ''">
AND irm.batchNo like concat('%', #{batchNo}, '%')
</if>
<if test="invCode != null and invCode != ''">
AND irm.invCode = #{invCode}
</if>
<if test="invSpaceCode != null and invSpaceCode != ''">
AND irm.invSpaceCode = #{invSpaceCode}
</if>
<if test="status != null">
AND irm.status = #{status}
</if>
<if test="type != null and type != ''">
AND type = #{type}
</if>
</where>
order by irm.updateTime desc
</select>
</mapper>

@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.inv.InvRemindSetDao">
<select id="filterList" resultType="com.glxp.api.res.inv.InvRemindSetResponse">
select irs.id,
irs.relId,
irs.deptCode,
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,
(select `name` from auth_warehouse where `code` = irs.invCode) invName,
(select `name` from auth_space where `code` = irs.invSpaceCode and invCode = irs.invCode) invSpaceName
from inv_remind_set irs
left join basic_udirel bu on bu.id = irs.relId
left join basic_products bp on bp.uuid = bu.uuid
<where>
<if test="relId != null and relId != ''">
AND irs.relId = #{relId}
</if>
<if test="invCode != null and invCode != ''">
AND irs.invCode = #{invCode}
</if>
<if test="invSpaceCode != null and invSpaceCode != ''">
AND irs.invSpaceCode = #{invSpaceCode}
</if>
</where>
order by irs.updateTime desc
</select>
</mapper>

@ -236,4 +236,30 @@
group by inv_product_detail.relId, inv_product_detail.batchNo
</where>
</select>
<select id="selectInvProductInfo" resultType="java.util.List">
select relIdFk,
deptCode,
invCode,
invSpaceCode,
batchNo,
productionDate,
expireDate,
sum(inCount),
sum(outCount),
sum(reCount)
from inv_product
<where>
<if test="invCode != null and invCode != ''">
AND invCode = #{invCode}
</if>
<if test="invSpaceCode != null and invSpaceCode != ''">
AND invSpaceCode = #{invSpaceCode}
</if>
<if test="relId != null and relId != ''">
AND relIdFk = #{relId}
</if>
</where>
group by relIdFk, batchNo, invCode, invSpaceCode
</select>
</mapper>

Loading…
Cancel
Save