Merge remote-tracking branch 'origin/master'

pom.xml

@@ -116,7 +116,7 @@
             <dependency>
                 <groupId>com.github.pagehelper</groupId>
                 <artifactId>pagehelper-spring-boot-starter</artifactId>
-                <version>1.3.0</version>
+                <version>1.4.2</version>
                 <!--使用spring boot2整合 pagehelper-spring-boot-starter必须排除一下依赖
         因为pagehelper-spring-boot-starter也已经在pom依赖了mybatis与mybatis-spring
         所以会与mybatis-plus-boot-starter中的mybatis与mybatis-spring发生冲突

src/main/java/com/glxp/api/config/YudaoMybatisAutoConfiguration.java

@@ -0,0 +1,22 @@
+package com.glxp.api.config;
+
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Slf4j
+@Configuration
+public class YudaoMybatisAutoConfiguration {
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        log.error("配置分页拦截器");
+        MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor();
+        PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+        mybatisPlusInterceptor.addInnerInterceptor(paginationInnerInterceptor); // 分页插件
+        return mybatisPlusInterceptor;
+    }
+
+}

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -263,12 +263,26 @@ public class InvWarehouseController extends BaseController {
         if (invWarehouseEntity.getId() == null) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
+
+        //更新仓库信息
         boolean b = invWarehouseService.updateInvSubWarehouse(invWarehouseEntity);
 
+        //更新部门信息
         DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId());
         pEntity.setUpdateTime(new Date());
         deptService.updateInvWarehouse(pEntity);
 
+        //更新货位信息
+        //查询此仓库绑定的所有货位
+        List<InvSpace> spaceList = invSpaceService.findBySubWarehouseCode(invWarehouseEntity.getCode());
+        if (CollUtil.isNotEmpty(spaceList)) {
+            for (InvSpace invSpace : spaceList) {
+                invSpace.setInvStorageCode(invWarehouseEntity.getParentId());
+                invSpace.setUpdateTime(new Date());
+            }
+            invSpaceService.batchUpdate(spaceList);
+        }
+
         if (!b) {
             return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
         }

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

@@ -219,4 +219,14 @@ public class InvProductController {
         return ResultVOUtils.page(pageInfo);
     }
 
+
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/inv/products/vailInvCount")
+    public BaseResponse vailInvCount(FilterInvProductDetailRequest filterInvProductDetailRequest) {
+        int count = 0;
+
+//                invProductDetailService.vailStockCount(filterInvProductDetailRequest.getCode());
+        return ResultVOUtils.success(count);
+    }
+
 }

src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java

@@ -0,0 +1,35 @@
+package com.glxp.api.controller.system;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.system.SysRemindMsgEntity;
+import com.glxp.api.entity.system.SysRemindSetEntity;
+import com.glxp.api.req.system.FilterSysRemindMsgRequest;
+import com.glxp.api.service.system.SysRemindMsgService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+public class SysRemindMsgController {
+
+
+    @Resource
+    SysRemindMsgService sysRemindMsgService;
+
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/system/remind/msg/list")
+    public BaseResponse list(FilterSysRemindMsgRequest filterSysRemindMsgRequest) {
+
+        List<SysRemindMsgEntity> sysRemindMsgEntities = sysRemindMsgService.filterList(filterSysRemindMsgRequest);
+        PageInfo<SysRemindMsgEntity> pageInfo = new PageInfo<>(sysRemindMsgEntities);
+        return ResultVOUtils.page(pageInfo);
+
+    }
+
+}

src/main/java/com/glxp/api/controller/system/SysRemindSetController.java

@@ -0,0 +1,31 @@
+package com.glxp.api.controller.system;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.system.SysRemindSetEntity;
+import com.glxp.api.req.system.FilterSysRemindSetRequest;
+import com.glxp.api.service.system.SysRemindSetService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+public class SysRemindSetController {
+
+    @Resource
+    SysRemindSetService sysRemindSetService;
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/system/remind/set/list")
+    public BaseResponse list(FilterSysRemindSetRequest filterSysRemindSetRequest) {
+        List<SysRemindSetEntity> sysRemindSetEntityList = sysRemindSetService.filterList(filterSysRemindSetRequest);
+        PageInfo<SysRemindSetEntity> pageInfo = new PageInfo<>(sysRemindSetEntityList);
+        return ResultVOUtils.page(pageInfo);
+    }
+
+
+}

src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java

@@ -23,7 +23,7 @@ public interface InvSpaceDao {
 
     int updateByPrimaryKey(InvSpace record);
 
-    int updateBatch(List<InvSpace> list);
+    boolean updateBatch(List<InvSpace> list);
 
     int batchInsert(@Param("list") List<InvSpace> list);
 

src/main/java/com/glxp/api/dao/system/SysRemindMsgMapper.java

@@ -0,0 +1,16 @@
+package com.glxp.api.dao.system;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.system.SysRemindMsgEntity;
+import com.glxp.api.entity.system.SysRemindSetEntity;
+import com.glxp.api.req.system.FilterSysRemindMsgRequest;
+import com.glxp.api.req.system.FilterSysRemindSetRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SysRemindMsgMapper extends BaseMapper<SysRemindMsgEntity> {
+
+    List<SysRemindMsgEntity> filterList(FilterSysRemindMsgRequest filterSysRemindMsgRequest);
+}

src/main/java/com/glxp/api/dao/system/SysRemindSetMapper.java

@@ -0,0 +1,17 @@
+package com.glxp.api.dao.system;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.dao.inv.InvPreProductDao;
+import com.glxp.api.entity.inv.InvPreProductEntity;
+import com.glxp.api.entity.system.SysRemindSetEntity;
+import com.glxp.api.req.system.FilterSysRemindSetRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SysRemindSetMapper extends BaseMapperPlus<SysRemindSetMapper, SysRemindSetEntity, SysRemindSetEntity> {
+
+    List<SysRemindSetEntity> filterList(FilterSysRemindSetRequest filterSysRemindSetRequest);
+}

src/main/java/com/glxp/api/entity/system/SysRemindMsgEntity.java

@@ -0,0 +1,86 @@
+package com.glxp.api.entity.system;
+
+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 java.util.Date;
+
+import lombok.Data;
+
+@Data
+@TableName(value = "sys_remind_msg")
+public class SysRemindMsgEntity {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Integer id;
+
+    /**
+     * 消息key
+     */
+    @TableField(value = "`key`")
+    private String key;
+
+    /**
+     * 消息内容
+     */
+    @TableField(value = "message")
+    private String message;
+
+    /**
+     * 提醒类型：1.库存不足提醒；2.库存产品过期；3.库存近效期；
+     */
+    @TableField(value = "`type`")
+    private Integer type;
+
+    @TableField(value = "`level`")
+    private Integer level;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
+    /**
+     * 查看确认人
+     */
+    @TableField(value = "updateUser")
+    private String updateUser;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    /**
+     * 1.未查看；2.已查看3:已确认；
+     */
+    @TableField(value = "`status`")
+    private Integer status;
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_KEY = "key";
+
+    public static final String COL_MESSAGE = "message";
+
+    public static final String COL_TYPE = "type";
+
+    public static final String COL_CREATETIME = "createTime";
+
+    public static final String COL_UPDATETIME = "updateTime";
+
+    public static final String COL_UPDATEUSER = "updateUser";
+
+    public static final String COL_REMARK = "remark";
+
+    public static final String COL_STATUS = "status";
+}

src/main/java/com/glxp/api/entity/system/SysRemindSetEntity.java

@@ -0,0 +1,41 @@
+package com.glxp.api.entity.system;
+
+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;
+
+@Data
+@TableName(value = "sys_remind_set")
+public class SysRemindSetEntity {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Integer id;
+
+    @TableField(value = "`key`")
+    private String key;
+
+    @TableField(value = "`name`")
+    private String name;
+
+    @TableField(value = "`value`")
+    private Integer value;
+
+    @TableField(value = "`type`")
+    private Integer type;
+
+    @TableField(value = "remark")
+    private String remark;
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_KEY = "key";
+
+    public static final String COL_NAME = "name";
+
+    public static final String COL_VALUE = "value";
+
+    public static final String COL_TYPE = "type";
+
+    public static final String COL_REMARK = "remark";
+}

src/main/java/com/glxp/api/req/system/FilterSysRemindMsgRequest.java

@@ -0,0 +1,10 @@
+package com.glxp.api.req.system;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class FilterSysRemindMsgRequest extends ListPageRequest {
+    String key;
+
+}

src/main/java/com/glxp/api/req/system/FilterSysRemindSetRequest.java

@@ -0,0 +1,11 @@
+package com.glxp.api.req.system;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class FilterSysRemindSetRequest extends ListPageRequest {
+
+    private String key;
+
+}

src/main/java/com/glxp/api/service/auth/InvSpaceService.java

@@ -50,4 +50,12 @@ public interface InvSpaceService {
      * @return
      */
     List<InvSpace> findBySubWarehouseCode(String code);
+
+    /**
+     * 批量更新货位信息
+     *
+     * @param spaceList
+     * @return
+     */
+    boolean batchUpdate(List<InvSpace> spaceList);
 }

src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java

@@ -130,6 +130,11 @@ public class InvSpaceServiceImpl implements InvSpaceService {
         return invSpaceDao.selectByWarehouseCode(code);
     }
 
+    @Override
+    public boolean batchUpdate(List<InvSpace> spaceList) {
+        return invSpaceDao.updateBatch(spaceList);
+    }
+
     /**
      * 校验货位是否重复
      *

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -34,7 +34,6 @@ import com.glxp.api.req.inout.OrderEditRequest;
 import com.glxp.api.req.thrsys.UdiwmsOrderRequest;
 import com.glxp.api.res.inout.IoOrderResponse;
 import com.glxp.api.res.inout.OrderNoResult;
-import com.glxp.api.service.basic.BasicCorpService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.*;
 import com.glxp.api.service.inv.*;
@@ -95,7 +94,7 @@ public class IoOrderServiceImpl implements IoOrderService {
     @Resource
     private HttpOkClient httpOkClient;
     @Resource
-    BasicCorpDao basicCorpDao;
+    private BasicCorpDao basicCorpDao;
 
     @Override
     public List<IoOrderEntity> selectAll() {
@@ -191,6 +190,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                 } else if (basicBussinessTypeEntity.isAdvanceType()) {
                     //是否寄售，删除寄售库存
                     List<InvPreProductDetailEntity> invProductDetailEntities = invPreProductDetailService.selectByOrderIdFk(billNo);
+                    if (CollUtil.isNotEmpty(invProductDetailEntities)) {
                         for (InvPreProductDetailEntity invProductDetailEntity : invProductDetailEntities) {
                             //更新库存
                             InvPreProductEntity invProductEntity = invPreProductService.selectByUnique(invProductDetailEntity.getRelId(), invProductDetailEntity.getBatchNo(), invProductDetailEntity.getSupId(), invProductDetailEntity.getDeptCode(), invProductDetailEntity.getInvCode());
@@ -202,16 +202,20 @@ public class IoOrderServiceImpl implements IoOrderService {
                                     int count = invProductEntity.getOutCount() - invProductDetailEntity.getReCount();
                                     invProductEntity.setOutCount(count);
                                 }
-                        }
+
+                                //计算实际数量
+                                invProductEntity.setReCount(invProductEntity.getInCount() - invProductEntity.getOutCount());
                                 invPreProductService.update(invProductEntity);
                             }
+
+                        }
                         //删除库存详情
                         invPreProductDetailService.deleteByOrderId(billNo);
-
+                    }
-
                 } else {
                     //删除普通库存
                     List<InvProductDetailEntity> invProductDetailEntities = invProductDetailService.selectByOrderIdFk(billNo);
+                    if (CollUtil.isNotEmpty(invProductDetailEntities)) {
                         for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) {
                             //更新库存
                             InvProductEntity invProductEntity = invProductService.selectByUnique(invProductDetailEntity.getRelId(), invProductDetailEntity.getBatchNo(), invProductDetailEntity.getSupId(), invProductDetailEntity.getDeptCode(), invProductDetailEntity.getInvCode());
@@ -223,14 +227,18 @@ public class IoOrderServiceImpl implements IoOrderService {
                                     int count = invProductEntity.getOutCount() - invProductDetailEntity.getReCount();
                                     invProductEntity.setOutCount(count);
                                 }
-                        }
+
+                                //计算实际数量
+                                invProductEntity.setReCount(invProductEntity.getInCount() - invProductEntity.getOutCount());
                                 invProductService.update(invProductEntity);
                             }
+                        }
                         //删除库存详情
                         invProductDetailService.deleteByOrderId(billNo);
                     }
                 }
             }
+        }
 
         return 0;
     }
@@ -545,15 +553,23 @@ public class IoOrderServiceImpl implements IoOrderService {
             //查询单据类型名称
             String busTypeName = basicBussinessTypeDao.selectNameByAction(order.getAction());
             response.setBillTypeName(busTypeName);
-            //查询往来单位名称
+
-            BasicCorpEntity corpEntity = basicCorpDao.selectByErpId(order.getFromCorp());
-            response.setFromName(corpEntity.getName());
             //查询部门名称
             String deptName = deptDao.selectNameByCode(order.getDeptCode());
             response.setDeptName(deptName);
             //查询仓库名称
             String invName = invWarehouseDao.selectNameByCode(order.getInvCode());
             response.setInvName(invName);
+
+            //查询往来单位名称
+            if (StrUtil.isNotBlank(order.getFromCorp())) {
+                BasicCorpEntity corpEntity = basicCorpDao.selectByErpId(order.getFromCorp());
+                response.setFromCorpName(corpEntity.getName());
+            } else if (StrUtil.isNotBlank(order.getFromInvCode())) {
+                String fromInvName = invWarehouseDao.selectNameByCode(order.getFromInvCode());
+                response.setFromCorpName(fromInvName);
+            }
+
             responseList.add(response);
         }
         return responseList;
@@ -673,11 +689,12 @@ public class IoOrderServiceImpl implements IoOrderService {
         }
 
         ArrayList<IoOrderEntity> orders = new ArrayList<>();
-        if (CollUtil.isNotEmpty(orders)) {
+        if (CollUtil.isNotEmpty(billNos)) {
             List<IoOrderEntity> list = orderDao.selectList(new QueryWrapper<IoOrderEntity>().in("billNo", billNos).orderByDesc("id"));
             orders.addAll(list);
         }
-        orders.add(order);
+        //将查询入口单据放在第一位的顺序
+        orders.add(0, order);
         return orders;
     }
 

src/main/java/com/glxp/api/service/system/SysRemindMsgService.java

@@ -0,0 +1,12 @@
+package com.glxp.api.service.system;
+
+import com.glxp.api.entity.system.SysRemindMsgEntity;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.glxp.api.req.system.FilterSysRemindMsgRequest;
+
+import java.util.List;
+
+public interface SysRemindMsgService {
+
+    List<SysRemindMsgEntity> filterList(FilterSysRemindMsgRequest filterSysRemindMsgRequest);
+}

src/main/java/com/glxp/api/service/system/SysRemindSetService.java

@@ -0,0 +1,13 @@
+package com.glxp.api.service.system;
+
+import com.glxp.api.entity.system.SysRemindSetEntity;
+import com.glxp.api.req.system.FilterSysRemindSetRequest;
+import com.glxp.api.util.page.TableDataInfo;
+
+import java.util.List;
+
+public interface SysRemindSetService {
+
+    List<SysRemindSetEntity> filterList(FilterSysRemindSetRequest filterSysRemindSetRequest);
+
+}

src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java

@@ -0,0 +1,31 @@
+package com.glxp.api.service.system.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.req.system.FilterSysRemindMsgRequest;
+import org.springframework.stereotype.Service;
+
+import com.glxp.api.dao.system.SysRemindMsgMapper;
+import com.glxp.api.entity.system.SysRemindMsgEntity;
+import com.glxp.api.service.system.SysRemindMsgService;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class SysRemindMsgServiceImpl implements SysRemindMsgService {
+
+    @Resource
+    SysRemindMsgMapper sysRemindMsgMapper;
+
+    @Override
+    public List<SysRemindMsgEntity> filterList(FilterSysRemindMsgRequest filterSysRemindMsgRequest) {
+
+        if (filterSysRemindMsgRequest.getPage() != null) {
+            int offset = (filterSysRemindMsgRequest.getPage() - 1) * filterSysRemindMsgRequest.getLimit();
+            PageHelper.offsetPage(offset, filterSysRemindMsgRequest.getLimit());
+        }
+        return sysRemindMsgMapper.filterList(filterSysRemindMsgRequest);
+
+    }
+}

src/main/java/com/glxp/api/service/system/impl/SysRemindSetServiceImpl.java

@@ -0,0 +1,27 @@
+package com.glxp.api.service.system.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.dao.system.SysRemindSetMapper;
+import com.glxp.api.entity.system.SysRemindSetEntity;
+import com.glxp.api.req.system.FilterSysRemindSetRequest;
+import com.glxp.api.service.system.SysRemindSetService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class SysRemindSetServiceImpl implements SysRemindSetService {
+
+    @Resource
+    SysRemindSetMapper sysRemindSetMapper;
+
+    @Override
+    public List<SysRemindSetEntity> filterList(FilterSysRemindSetRequest filterSysRemindSetRequest) {
+        if (filterSysRemindSetRequest.getPage() != null) {
+            int offset = (filterSysRemindSetRequest.getPage() - 1) * filterSysRemindSetRequest.getLimit();
+            PageHelper.offsetPage(offset, filterSysRemindSetRequest.getLimit());
+        }
+        return sysRemindSetMapper.filterList(filterSysRemindSetRequest);
+    }
+}

src/main/java/com/glxp/api/util/page/TableDataInfo.java

@@ -48,7 +48,7 @@ public class TableDataInfo<T> {
 
     public static <T> TableDataInfo<T> build(IPage<T> page) {
         TableDataInfo<T> rspData = new TableDataInfo<>();
-        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setCode(20000);
         rspData.setMsg("查询成功");
         rspData.setList(page.getRecords());
         rspData.setTotal(page.getTotal());

src/main/resources/mybatis/mapper/system/SysRemindMsgMapper.xml

@@ -0,0 +1,15 @@
+<?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.system.SysRemindMsgMapper">
+    <select id="filterList" parameterType="com.glxp.api.req.system.FilterSysRemindMsgRequest"
+            resultType="com.glxp.api.entity.system.SysRemindMsgEntity">
+        SELECT *
+        FROM sys_remind_msg
+        <where>
+            <if test="key != null and key != ''">
+                AND `key` like CONCAT('%', #{key}, '%')
+            </if>
+        </where>
+        order BY id
+    </select>
+</mapper>

src/main/resources/mybatis/mapper/system/SysRemindSetMapper.xml

@@ -0,0 +1,15 @@
+<?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.system.SysRemindSetMapper">
+    <select id="filterList" parameterType="com.glxp.api.req.system.FilterSysRemindSetRequest"
+            resultType="com.glxp.api.entity.system.SysRemindSetEntity">
+        SELECT *
+        FROM sys_remind_set
+        <where>
+            <if test="key != null and key != ''">
+                AND `key` like CONCAT('%', #{key}, '%')
+            </if>
+        </where>
+        order BY id
+    </select>
+</mapper>