UDI
/
udiwms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.添加盘点设置表及对应增改查接口和实体类

Browse Source
feature-order-fix
x_z 2 years ago
parent 0a0ce35c80
commit 7459c2ff43
11 changed files with 479 additions and 3 deletions
Show Stats Download Patch File Download Diff File

83
api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCountSettingController.java
Unescape Escape View File

@ -0,0 +1,83 @@
package com.glxp.api.admin.controller.inventory;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.entity.inventory.InvCountSettingEntity;
import com.glxp.api.admin.req.inventory.FilterInvCountSettingRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.inventory.InvCountSettingResponse;
import com.glxp.api.admin.service.inventory.InvCountSettingService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
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 InvCountSettingController {
@Resource
private InvCountSettingService invCountSettingService;
/**
* 查询盘点设置
*
* @param settingRequest
* @return
*/
@GetMapping("/invCount/setting/filterList")
public BaseResponse filterList(FilterInvCountSettingRequest settingRequest) {
List<InvCountSettingResponse> list = invCountSettingService.filterList(settingRequest);
PageInfo<InvCountSettingResponse> pageInfo = new PageInfo<>(list);
PageSimpleResponse<InvCountSettingResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(pageInfo.getList());
return ResultVOUtils.success(pageSimpleResponse);
}
/**
* 更新盘点设置
*
* @param invCountSettingEntity
* @return
*/
@PostMapping("/invCount/setting/update")
public BaseResponse updateCountSetting(@RequestBody InvCountSettingEntity invCountSettingEntity) {
return invCountSettingService.updateCountSetting(invCountSettingEntity);
}
/**
* 添加盘点设置
*
* @param invCountSettingEntity
* @return
*/
@PostMapping("/invCount/setting/add")
public BaseResponse addCountCountSetting(@RequestBody InvCountSettingEntity invCountSettingEntity) {
return invCountSettingService.addCountSetting(invCountSettingEntity);
}
/**
* 判断是否可以新增盘点设置
*
* @return
*/
@GetMapping("/invCount/setting/verifyAdd")
public BaseResponse verifyAdd() {
boolean verify = invCountSettingService.verifyAdd();
if (verify) {
return ResultVOUtils.success();
}
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "已经存在盘点设置，无法添加");
}
}

8
api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java
Unescape Escape View File

@ -69,4 +69,12 @@ public interface BussinessTypeDao {
* @return
*/
String selectSupplementTypeByBillNo(@Param("stockOrderBillNo") String stockOrderBillNo);
/**
* 根据扫码单据类型编码查询单据类型名称
*
* @param action
* @return
*/
String selectNameByAction(@Param("action") String action);
}

39
api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountSettingDao.java
Unescape Escape View File

@ -0,0 +1,39 @@
package com.glxp.api.admin.dao.inventory;
import com.glxp.api.admin.entity.inventory.InvCountSettingEntity;
import com.glxp.api.admin.req.inventory.FilterInvCountSettingRequest;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface InvCountSettingDao {
int deleteByPrimaryKey(Integer id);
int insert(InvCountSettingEntity record);
int insertSelective(InvCountSettingEntity record);
InvCountSettingEntity selectByPrimaryKey(Integer id);
int updateByPrimaryKeySelective(InvCountSettingEntity record);
int updateByPrimaryKey(InvCountSettingEntity record);
int updateBatch(List<InvCountSettingEntity> list);
int updateBatchSelective(List<InvCountSettingEntity> list);
int batchInsert(@Param("list") List<InvCountSettingEntity> list);
List<InvCountSettingEntity> filterList(FilterInvCountSettingRequest settingRequest);
/**
* 统计盘点设置的条目数量
*
* @return
*/
Long countSetting();
}

25
api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvCountSettingEntity.java
Unescape Escape View File

@ -0,0 +1,25 @@
package com.glxp.api.admin.entity.inventory;
import lombok.Data;
/**
* 盘点设置
*/
@Data
public class InvCountSettingEntity {
/**
* ID
*/
private Integer id;
/**
* 盘点入库转单类型
*/
private String inAction;
/**
* 盘点出库转单类型
*/
private String outAction;
}

15
api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvCountSettingRequest.java
Unescape Escape View File

@ -0,0 +1,15 @@
package com.glxp.api.admin.req.inventory;
import com.glxp.api.admin.req.ListPageRequest;
import lombok.Data;
/**
* 查询盘点设置请求参数
*/
@Data
public class FilterInvCountSettingRequest extends ListPageRequest {
private Integer id;
}

22
api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvCountSettingResponse.java
Unescape Escape View File

@ -0,0 +1,22 @@
package com.glxp.api.admin.res.inventory;
import com.glxp.api.admin.entity.inventory.InvCountSettingEntity;
import lombok.Data;
/**
* 盘点设置响应结果
*/
@Data
public class InvCountSettingResponse extends InvCountSettingEntity {
/**
* 入库单据类型名称
*/
private String inBusTypeName;
/**
* 出库盘点单据类型名称
*/
private String outBusTypeName;
}

29
api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvCountSettingService.java
Unescape Escape View File

@ -0,0 +1,29 @@
package com.glxp.api.admin.service.inventory;
import com.glxp.api.admin.entity.inventory.InvCountSettingEntity;
import com.glxp.api.admin.req.inventory.FilterInvCountSettingRequest;
import com.glxp.api.admin.res.inventory.InvCountSettingResponse;
import com.glxp.api.common.res.BaseResponse;
import java.util.List;
/**
* 盘点设置Service
*/
public interface InvCountSettingService {
/**
* 查询盘点设置
*
* @param settingRequest
* @return
*/
List<InvCountSettingResponse> filterList(FilterInvCountSettingRequest settingRequest);
BaseResponse updateCountSetting(InvCountSettingEntity invCountSettingEntity);
BaseResponse addCountSetting(InvCountSettingEntity invCountSettingEntity);
boolean verifyAdd();
}

99
api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountSettingServiceImpl.java
Unescape Escape View File

@ -0,0 +1,99 @@
package com.glxp.api.admin.service.inventory.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.basic.BussinessTypeDao;
import com.glxp.api.admin.dao.inventory.InvCountSettingDao;
import com.glxp.api.admin.entity.inventory.InvCountSettingEntity;
import com.glxp.api.admin.req.inventory.FilterInvCountSettingRequest;
import com.glxp.api.admin.res.inventory.InvCountSettingResponse;
import com.glxp.api.admin.service.inventory.InvCountSettingService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
public class InvCountSettingServiceImpl implements InvCountSettingService {
@Resource
private InvCountSettingDao invCountSettingDao;
@Resource
private BussinessTypeDao bussinessTypeDao;
@Override
public List<InvCountSettingResponse> filterList(FilterInvCountSettingRequest settingRequest) {
if (null == settingRequest) {
return Collections.emptyList();
}
if (null != settingRequest.getPage() && null != settingRequest.getLimit()) {
PageHelper.offsetPage((settingRequest.getPage() - 1) * settingRequest.getLimit(), settingRequest.getLimit());
}
List<InvCountSettingEntity> list = invCountSettingDao.filterList(settingRequest);
if (CollUtil.isNotEmpty(list)) {
List<InvCountSettingResponse> result = new ArrayList<>(list.size());
for (InvCountSettingEntity invCountSettingEntity : list) {
InvCountSettingResponse response = new InvCountSettingResponse();
BeanUtil.copyProperties(invCountSettingEntity, response);
//查询单据类型名称
response.setInBusTypeName(bussinessTypeDao.selectNameByAction(invCountSettingEntity.getInAction()));
response.setOutBusTypeName(bussinessTypeDao.selectNameByAction(invCountSettingEntity.getOutAction()));
result.add(response);
}
return result;
}
return Collections.emptyList();
}
@Override
public BaseResponse updateCountSetting(InvCountSettingEntity invCountSettingEntity) {
if (StrUtil.isBlank(invCountSettingEntity.getInAction()) || StrUtil.isBlank(invCountSettingEntity.getOutAction())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
invCountSettingDao.updateByPrimaryKey(invCountSettingEntity);
return ResultVOUtils.success();
}
@Override
public BaseResponse addCountSetting(InvCountSettingEntity invCountSettingEntity) {
if (existSetting()) {
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "已存在盘点参数");
}
invCountSettingDao.insert(invCountSettingEntity);
return ResultVOUtils.success();
}
@Override
public boolean verifyAdd() {
if (existSetting()) {
return false;
}
return true;
}
/**
* 判断是否已经存在盘点设置
*
* @return
*/
public boolean existSetting() {
Long count = invCountSettingDao.countSetting();
if (count < 1) {
return false;
}
return true;
}
}

5
api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
Unescape Escape View File

@ -415,4 +415,9 @@
where billNo = #{stockOrderBillNo}))
</select>
<select id="selectNameByAction" resultType="java.lang.String">
select name
from basic_bussiness_type
where action = #{action}
</select>
</mapper>

144
api-admin/src/main/resources/mybatis/mapper/inventory/InvCountSettingDao.xml
Unescape Escape View File

@ -0,0 +1,144 @@
<?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.admin.dao.inventory.InvCountSettingDao">
<resultMap id="BaseResultMap" type="com.glxp.api.admin.entity.inventory.InvCountSettingEntity">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="inAction" jdbcType="VARCHAR" property="inAction"/>
<result column="outAction" jdbcType="VARCHAR" property="outAction"/>
</resultMap>
<sql id="Base_Column_List">
id,
inAction,
outAction
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from inv_count_setting
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete
from inv_count_setting
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.glxp.api.admin.entity.inventory.InvCountSettingEntity"
keyColumn="id" keyProperty="id" useGeneratedKeys="true">
insert into inv_count_setting (inAction, outAction)
values (#{inAction,jdbcType=VARCHAR}, #{outAction,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.glxp.api.admin.entity.inventory.InvCountSettingEntity"
keyColumn="id" keyProperty="id" useGeneratedKeys="true">
insert into inv_count_setting
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="inAction != null">
inAction,
</if>
<if test="outAction != null">
outAction,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="inAction != null">
#{inAction,jdbcType=VARCHAR},
</if>
<if test="outAction != null">
#{outAction,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.glxp.api.admin.entity.inventory.InvCountSettingEntity">
update inv_count_setting
<set>
<if test="inAction != null">
inAction = #{inAction,jdbcType=VARCHAR},
</if>
<if test="outAction != null">
outAction = #{outAction,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.glxp.api.admin.entity.inventory.InvCountSettingEntity">
update inv_count_setting
set inAction = #{inAction,jdbcType=VARCHAR},
outAction = #{outAction,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateBatch" parameterType="java.util.List">
update inv_count_setting
<trim prefix="set" suffixOverrides=",">
<trim prefix="inAction = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.inAction,jdbcType=VARCHAR}
</foreach>
</trim>
<trim prefix="outAction = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=INTEGER} then #{item.outAction,jdbcType=VARCHAR}
</foreach>
</trim>
</trim>
where id in
<foreach close=")" collection="list" item="item" open="(" separator=", ">
#{item.id,jdbcType=INTEGER}
</foreach>
</update>
<update id="updateBatchSelective" parameterType="java.util.List">
update inv_count_setting
<trim prefix="set" suffixOverrides=",">
<trim prefix="inAction = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.inAction != null">
when id = #{item.id,jdbcType=INTEGER} then #{item.inAction,jdbcType=VARCHAR}
</if>
</foreach>
</trim>
<trim prefix="outAction = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.outAction != null">
when id = #{item.id,jdbcType=INTEGER} then #{item.outAction,jdbcType=VARCHAR}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach close=")" collection="list" item="item" open="(" separator=", ">
#{item.id,jdbcType=INTEGER}
</foreach>
</update>
<insert id="batchInsert" parameterType="map">
insert into inv_count_setting
(id, inAction, outAction)
values
<foreach collection="list" item="item" separator=",">
(#{item.id,jdbcType=INTEGER}, #{item.inAction,jdbcType=VARCHAR}, #{item.outAction,jdbcType=VARCHAR})
</foreach>
</insert>
<select id="filterList" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from inv_count_setting
<where>
<if test="id != null">
AND id = #{id}
</if>
</where>
</select>
<delete id="countSetting">
select count(*)
from inv_count_setting
</delete>
</mapper>

13
scripts/盘点功能表.sql
Unescape Escape View File

@ -72,6 +72,13 @@ SET FOREIGN_KEY_CHECKS = 1;
ALTER TABLE `udiwms`.`inv_product_detail`
ADD COLUMN `invSpaceCode` varchar(255) NULL COMMENT '货位号' AFTER `invWarehouseCode`;
ALTER TABLE `udiwms`.`inv_count_order_detail`
MODIFY COLUMN `produceDate` varchar(255) NULL DEFAULT NULL COMMENT '生产日期' AFTER `batchNo`,
MODIFY COLUMN `expireDate` varchar(255) NULL DEFAULT NULL COMMENT '失效日期' AFTER `produceDate`;
# 盘点设置表
DROP TABLE IF EXISTS `inv_count_setting`;
CREATE TABLE `inv_count_setting` (
`id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'ID',
`inAction` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '盘点入库转单类型',
`outAction` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '盘点出库转单类型',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '盘点设置表' ROW_FORMAT = Dynamic;
SET FOREIGN_KEY_CHECKS = 1;

Write Preview
Loading…
Cancel
Save