UDI
/
udims-cg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修改建垛规则表名拼写错误问题

Browse Source 
2.添加获取垛号规则方法
3.建垛接口返回垛号
master
x_z 3 years ago
parent 2c0268f7d9
commit 44c725f8af
10 changed files with 116 additions and 73 deletions
Show Stats Download Patch File Download Diff File

4
script/数据库更新语句.sql
Unescape Escape View File

@ -32,8 +32,8 @@ CREATE TABLE `stack_order` (
SET FOREIGN_KEY_CHECKS = 1;
DROP TABLE IF EXISTS `stock_rules`;
CREATE TABLE `stock_rules` (
DROP TABLE IF EXISTS `stack_rules`;
CREATE TABLE `stack_rules` (
`id` int NOT NULL AUTO_INCREMENT COMMENT 'id',
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '建垛规则名称',
`customerId` bigint NULL DEFAULT NULL COMMENT '客户ID',

47
src/main/java/com/glxp/udi/admin/controller/basic/StockRulesController.java → src/main/java/com/glxp/udi/admin/controller/basic/StackRulesController.java
Unescape Escape View File

@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.glxp.udi.admin.common.enums.ResultEnum;
import com.glxp.udi.admin.common.res.BaseResponse;
import com.glxp.udi.admin.common.util.ResultVOUtils;
import com.glxp.udi.admin.entity.basic.StockRulesEntity;
import com.glxp.udi.admin.req.basic.FilterStockRulesRequest;
import com.glxp.udi.admin.entity.basic.StackRulesEntity;
import com.glxp.udi.admin.req.basic.FilterStackRulesRequest;
import com.glxp.udi.admin.req.inout.DeleteRequest;
import com.glxp.udi.admin.res.PageSimpleResponse;
import com.glxp.udi.admin.service.basic.StockRulesService;
import com.glxp.udi.admin.service.basic.StackRulesService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
@ -24,10 +24,10 @@ import javax.annotation.Resource;
*/
@Slf4j
@RestController
public class StockRulesController {
public class StackRulesController {
@Resource
private StockRulesService stockRulesService;
private StackRulesService stockRulesService;
/**
* 查询建垛规则列表
@ -35,10 +35,10 @@ public class StockRulesController {
* @param filterStockRulesRequest
* @return
*/
@GetMapping("/udims/stockRules/filter")
public BaseResponse filterStockRules(FilterStockRulesRequest filterStockRulesRequest) {
IPage<StockRulesEntity> page = stockRulesService.filter(filterStockRulesRequest);
PageSimpleResponse<StockRulesEntity> pageSimpleResponse = new PageSimpleResponse<>();
@GetMapping("/udims/stackRules/filter")
public BaseResponse filterStockRules(FilterStackRulesRequest filterStockRulesRequest) {
IPage<StackRulesEntity> page = stockRulesService.filter(filterStockRulesRequest);
PageSimpleResponse<StackRulesEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setList(page.getRecords());
pageSimpleResponse.setTotal(page.getTotal());
return ResultVOUtils.success(pageSimpleResponse);
@ -50,9 +50,9 @@ public class StockRulesController {
* @param stockRulesEntity
* @return
*/
@PostMapping("/udims/stockRules/add")
public BaseResponse addStockRules(@RequestBody StockRulesEntity stockRulesEntity) {
stockRulesService.addStockRules(stockRulesEntity);
@PostMapping("/udims/stackRules/add")
public BaseResponse addStockRules(@RequestBody StackRulesEntity stockRulesEntity) {
stockRulesService.addStackRules(stockRulesEntity);
return ResultVOUtils.success();
}
@ -62,13 +62,13 @@ public class StockRulesController {
* @param stockRulesEntity
* @return
*/
@PostMapping("/udims/stockRules/update")
public BaseResponse updateStockRules(@RequestBody StockRulesEntity stockRulesEntity, BindingResult bindingResult) {
@PostMapping("/udims/stackRules/update")
public BaseResponse updateStockRules(@RequestBody StackRulesEntity stockRulesEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
stockRulesService.updateStockRules(stockRulesEntity);
stockRulesService.updateStackRules(stockRulesEntity);
return ResultVOUtils.success("更新成功");
}
@ -78,7 +78,7 @@ public class StockRulesController {
* @param deleteRequest
* @return
*/
@PostMapping("/udims/stockRules/delete")
@PostMapping("/udims/stackRules/delete")
public BaseResponse deleteStockRules(@RequestBody DeleteRequest deleteRequest) {
if (null == deleteRequest || StrUtil.isNotBlank(deleteRequest.getId())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
@ -87,19 +87,4 @@ public class StockRulesController {
return ResultVOUtils.success("删除成功");
}
/**
* 根据客户ID查询当前启用的垛号生成规则
*
* @param customerId
* @return
*/
@GetMapping("/udims/stockRules/getEnableStockRule")
public BaseResponse getEnableStockRule(String customerId) {
if (StrUtil.isBlank(customerId)) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
StockRulesEntity stockRulesEntity = stockRulesService.getEnableStockRule(customerId);
return ResultVOUtils.success(stockRulesEntity);
}
}

4
src/main/java/com/glxp/udi/admin/controller/product/StackOrderController.java
Unescape Escape View File

@ -90,9 +90,9 @@ public class StackOrderController {
}
stackOrderEntity.setCustomerId(customerService.getCustomerId() + "");
stackOrderService.insertOrder(stackOrderEntity);
String stackOrderId = stackOrderService.insertOrder(stackOrderEntity);
stackCodeService.batchInsert(stackUploadRequest.getStackCodeEntityList());
return ResultVOUtils.success("上传成功！");
return ResultVOUtils.success(stackOrderId);
}
}

6
src/main/java/com/glxp/udi/admin/dao/basic/StockRulesDao.java → src/main/java/com/glxp/udi/admin/dao/basic/StackRulesDao.java
Unescape Escape View File

@ -1,19 +1,19 @@
package com.glxp.udi.admin.dao.basic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.udi.admin.entity.basic.StockRulesEntity;
import com.glxp.udi.admin.entity.basic.StackRulesEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 建垛规则表数据接口
*/
@Mapper
public interface StockRulesDao extends BaseMapper<StockRulesEntity> {
public interface StackRulesDao extends BaseMapper<StackRulesEntity> {
/**
* 自定义更新建垛规则
*
* @param stockRulesEntity
*/
void updateStockRules(StockRulesEntity stockRulesEntity);
void updateStackRules(StackRulesEntity stockRulesEntity);
}

4
src/main/java/com/glxp/udi/admin/entity/basic/StockRulesEntity.java → src/main/java/com/glxp/udi/admin/entity/basic/StackRulesEntity.java
Unescape Escape View File

@ -13,8 +13,8 @@ import java.util.Date;
* 建垛规则表
*/
@Data
@TableName(value = "stock_rules")
public class StockRulesEntity {
@TableName(value = "stack_rules")
public class StackRulesEntity {
/**
* id

2
src/main/java/com/glxp/udi/admin/req/basic/FilterStockRulesRequest.java → src/main/java/com/glxp/udi/admin/req/basic/FilterStackRulesRequest.java
Unescape Escape View File

@ -7,7 +7,7 @@ import lombok.Data;
* 查询建垛规则参数
*/
@Data
public class FilterStockRulesRequest extends ListPageRequest {
public class FilterStackRulesRequest extends ListPageRequest {
/**
* 建垛规则名称

54
src/main/java/com/glxp/udi/admin/service/basic/StockRulesService.java → src/main/java/com/glxp/udi/admin/service/basic/StackRulesService.java
Unescape Escape View File

@ -4,9 +4,9 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.dao.basic.StockRulesDao;
import com.glxp.udi.admin.entity.basic.StockRulesEntity;
import com.glxp.udi.admin.req.basic.FilterStockRulesRequest;
import com.glxp.udi.admin.dao.basic.StackRulesDao;
import com.glxp.udi.admin.entity.basic.StackRulesEntity;
import com.glxp.udi.admin.req.basic.FilterStackRulesRequest;
import com.glxp.udi.admin.service.auth.AuthAdminService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -21,10 +21,10 @@ import java.util.Date;
@Slf4j
@Service
@Transactional(rollbackFor = Exception.class)
public class StockRulesService {
public class StackRulesService {
@Resource
private StockRulesDao stockRulesDao;
private StackRulesDao stackRulesDao;
@Resource
private AuthAdminService authAdminService;
@ -34,10 +34,10 @@ public class StockRulesService {
* @param filterStockRulesRequest
* @return
*/
public IPage<StockRulesEntity> filter(FilterStockRulesRequest filterStockRulesRequest) {
QueryWrapper<StockRulesEntity> wrapper = buildWrapper(filterStockRulesRequest);
IPage<StockRulesEntity> page = new Page<>(filterStockRulesRequest.getPage(), filterStockRulesRequest.getLimit());
return stockRulesDao.selectPage(page, wrapper);
public IPage<StackRulesEntity> filter(FilterStackRulesRequest filterStockRulesRequest) {
QueryWrapper<StackRulesEntity> wrapper = buildWrapper(filterStockRulesRequest);
IPage<StackRulesEntity> page = new Page<>(filterStockRulesRequest.getPage(), filterStockRulesRequest.getLimit());
return stackRulesDao.selectPage(page, wrapper);
}
/**
@ -46,8 +46,8 @@ public class StockRulesService {
* @param filterStockRulesRequest
* @return
*/
private QueryWrapper<StockRulesEntity> buildWrapper(FilterStockRulesRequest filterStockRulesRequest) {
QueryWrapper<StockRulesEntity> wrapper = new QueryWrapper<>();
private QueryWrapper<StackRulesEntity> buildWrapper(FilterStackRulesRequest filterStockRulesRequest) {
QueryWrapper<StackRulesEntity> wrapper = new QueryWrapper<>();
wrapper.like(StrUtil.isNotBlank(filterStockRulesRequest.getName()), "name", filterStockRulesRequest.getName())
.eq(null != filterStockRulesRequest.getStatus(), "status", filterStockRulesRequest.getStatus())
.eq(StrUtil.isNotBlank(filterStockRulesRequest.getCustomerId()), "customerId", filterStockRulesRequest.getCustomerId());
@ -57,24 +57,24 @@ public class StockRulesService {
/**
* 添加建垛规则
*
* @param stockRulesEntity
* @param stackRulesEntity
*/
public void addStockRules(StockRulesEntity stockRulesEntity) {
stockRulesEntity.setCreateTime(new Date());
stockRulesEntity.setUpdateTime(new Date());
public void addStackRules(StackRulesEntity stackRulesEntity) {
stackRulesEntity.setCreateTime(new Date());
stackRulesEntity.setUpdateTime(new Date());
String customerId = authAdminService.getCurrentUserCustomerId();
stockRulesEntity.setCustomerId(Long.valueOf(customerId));
stockRulesDao.insert(stockRulesEntity);
stackRulesEntity.setCustomerId(Long.valueOf(customerId));
stackRulesDao.insert(stackRulesEntity);
}
/**
* 更新建垛规则
*
* @param stockRulesEntity
* @param stackRulesEntity
*/
public void updateStockRules(StockRulesEntity stockRulesEntity) {
stockRulesEntity.setUpdateTime(new Date());
stockRulesDao.updateStockRules(stockRulesEntity);
public void updateStackRules(StackRulesEntity stackRulesEntity) {
stackRulesEntity.setUpdateTime(new Date());
stackRulesDao.updateStackRules(stackRulesEntity);
}
/**
@ -83,7 +83,7 @@ public class StockRulesService {
* @param id 规则ID
*/
public void delete(String id) {
stockRulesDao.deleteById(id);
stackRulesDao.deleteById(id);
}
/**
@ -92,11 +92,11 @@ public class StockRulesService {
* @param customerId 客户ID
* @return
*/
public StockRulesEntity getEnableStockRule(String customerId) {
StockRulesEntity stockRulesEntity = stockRulesDao.selectOne(new QueryWrapper<StockRulesEntity>()
.eq(StockRulesEntity.COL_CUSTOMERID, customerId)
.eq(StockRulesEntity.COL_STATUS, 1));
return stockRulesEntity;
public StackRulesEntity getEnableStockRule(String customerId) {
StackRulesEntity stackRulesEntity = stackRulesDao.selectOne(new QueryWrapper<StackRulesEntity>()
.eq(StackRulesEntity.COL_CUSTOMERID, customerId)
.eq(StackRulesEntity.COL_STATUS, 1));
return stackRulesEntity;
}
}

8
src/main/java/com/glxp/udi/admin/service/product/StackOrderService.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.dao.product.StackOrderDao;
import com.glxp.udi.admin.entity.product.StackOrder;
import com.glxp.udi.admin.req.product.StackOrderFilterRequest;
import com.glxp.udi.admin.util.IdUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -18,6 +19,8 @@ public class StackOrderService {
@Resource
StackOrderDao stackOrderDao;
@Resource
private IdUtil idUtil;
public IPage<StackOrder> filterList(StackOrderFilterRequest stackOrderFilterRequest) {
@ -41,8 +44,11 @@ public class StackOrderService {
return stackOrderDao.exists(new QueryWrapper<StackOrder>().eq("orderId", orderId));
}
public void insertOrder(StackOrder stackOrderEntity) {
public String insertOrder(StackOrder stackOrderEntity) {
String stackId = idUtil.getStackId(stackOrderEntity.getCustomerId());
stackOrderEntity.setOrderId(stackId);
stackOrderDao.insert(stackOrderEntity);
return stackId;
}
public void deleteById(Integer id) {

52
src/main/java/com/glxp/udi/admin/util/IdUtil.java
Unescape Escape View File

@ -0,0 +1,52 @@
package com.glxp.udi.admin.util;
import com.glxp.udi.admin.entity.basic.StackRulesEntity;
import com.glxp.udi.admin.service.basic.StackRulesService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
/**
* ID生成工具，生成客户ID，垛号等
*/
@Slf4j
@Component
public class IdUtil {
@Resource
private RedisUtil redisUtil;
@Resource
private StackRulesService stackRulesService;
/**
* 根据客户ID生成垛号
*/
public synchronized String getStackId(String customerId) {
StackRulesEntity stackRulesEntity = stackRulesService.getEnableStockRule(customerId);
StringBuffer stackId = new StringBuffer();
//垛号固定标识
stackId.append("DH")
.append(stackRulesEntity.getPrefix())
//拼接起始数
.append(stackRulesEntity.getStartNum());
//查找该客户上一个垛号
String key = "DH" + customerId;
int serialNum = 0; //顺序号
Object lastStackId = redisUtil.get(key);
if (null != lastStackId) {
//生成新的顺序号
serialNum = Integer.parseInt(String.valueOf(lastStackId)) + stackRulesEntity.getStep();
} else {
//当前客户没有生成过垛号，直接使用规则里的顺序号生成新的顺序号
serialNum = stackRulesEntity.getSerialNum() + stackRulesEntity.getStep();
}
redisUtil.set(key, serialNum);
//拼接顺序号
stackId.append(serialNum);
return stackId.toString();
}
}

8
src/main/resources/mybatis/mapper/basic/StockRulesDao.xml → src/main/resources/mybatis/mapper/basic/StackRulesDao.xml
Unescape Escape View File

@ -1,7 +1,7 @@
<?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.udi.admin.dao.basic.StockRulesDao">
<resultMap id="BaseResultMap" type="com.glxp.udi.admin.entity.basic.StockRulesEntity">
<mapper namespace="com.glxp.udi.admin.dao.basic.StackRulesDao">
<resultMap id="BaseResultMap" type="com.glxp.udi.admin.entity.basic.StackRulesEntity">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="customerId" jdbcType="BIGINT" property="customerId"/>
@ -29,8 +29,8 @@
remark
</sql>
<update id="updateStockRules">
update stock_rules
<update id="updateStackRules">
update stack_rules
set name = #{name},
customerId = #{customerId},
prefix = #{prefix},
Write Preview
Loading…
Cancel
Save