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

1.修复单据相关的bug

Browse Source
master
x_z 2 years ago
parent 07c26bf55e
commit d8da9f5c71
9 changed files with 191 additions and 17 deletions
Show Stats Download Patch File Download Diff File

24
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.api.controller.inout;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
@ -10,15 +11,16 @@ import com.glxp.api.constant.Constant;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.auth.DeptEntity;
import com.glxp.api.entity.auth.InvWarehouseEntity;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.basic.UdiProductEntity;
import com.glxp.api.entity.inout.*;
import com.glxp.api.entity.inout.IoCodeEntity;
import com.glxp.api.entity.inout.IoCodeTempEntity;
import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.inv.InvPreinDetailEntity;
import com.glxp.api.entity.inv.InvProductDetailEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.http.SpsDirectClient;
import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
@ -30,6 +32,7 @@ import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.basic.UdiRlSupResponse;
import com.glxp.api.res.inout.AddCodeResult;
import com.glxp.api.res.inout.IoCodeTempResponse;
import com.glxp.api.service.auth.DeptService;
import com.glxp.api.service.auth.InvWarehouseService;
import com.glxp.api.service.basic.*;
@ -41,7 +44,6 @@ import com.glxp.api.util.CustomUtil;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OrderNoTypeBean;
import com.glxp.api.util.page.TableDataInfo;
import com.glxp.api.util.udi.FilterUdiUtils;
import com.glxp.api.util.udi.UdiCalCountUtil;
import org.apache.commons.lang3.StringUtils;
@ -798,14 +800,16 @@ public class IoCodeTempController extends BaseController {
@AuthRuleAnnotation("")
@GetMapping("admin/warehouse/inout/findErrorByOrderId")
public BaseResponse findErrorByOrderId(FilterCodeRequest warehouseQueryRequest) {
if (StrUtil.isEmpty(warehouseQueryRequest.getOrderId())) {
public BaseResponse findErrorByOrderId(FilterCodeRequest filterCodeRequest) {
if (StrUtil.isEmpty(filterCodeRequest.getOrderId())) {
return ResultVOUtils.error(500, "单据号不能为空!");
}
TableDataInfo<IoCodeTempEntity> tableDataInfo = codeTempService.findByOrderId(warehouseQueryRequest);
PageSimpleResponse<IoCodeTempEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(tableDataInfo.getTotal());
pageSimpleResponse.setList(tableDataInfo.getList());
List<IoCodeTempResponse> list = codeTempService.findCodeList(filterCodeRequest);
PageInfo<IoCodeTempResponse> pageInfo = new PageInfo<>(list);
PageSimpleResponse<IoCodeTempResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(pageInfo.getList());
return ResultVOUtils.success(pageSimpleResponse);
}

4
src/main/java/com/glxp/api/controller/inout/IoOrderController.java
Unescape Escape View File

@ -10,7 +10,6 @@ import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.InvBusUserEntity;
import com.glxp.api.entity.auth.InvWarehouseEntity;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.basic.EntrustReceEntity;
import com.glxp.api.entity.inout.IoCodeTempEntity;
@ -18,7 +17,6 @@ import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.req.auth.FilterInvBusUserRequest;
import com.glxp.api.req.auth.FilterInvWarehouseRequest;
import com.glxp.api.req.basic.BasicEntrustRecRequest;
import com.glxp.api.req.inout.AddOrderRequest;
import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
@ -84,7 +82,7 @@ public class IoOrderController extends BaseController {
public BaseResponse getDrafts() {
List<IoOrderEntity> orderEntityList = orderService.selectAll();
PageSimpleResponse<IoOrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(100l);
pageSimpleResponse.setTotal(Long.valueOf(orderEntityList.size()));
pageSimpleResponse.setList(orderEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}

2
src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java
Unescape Escape View File

@ -40,7 +40,7 @@ public class IoOrderDetailCodeController {
List<IoOrderDetailCodeResponse> list = ioOrderDetailCodeService.getDetailCodeResponse(orderEntityList);
PageSimpleResponse<IoOrderDetailCodeResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(100l);
pageSimpleResponse.setTotal(Long.valueOf(list.size()));
pageSimpleResponse.setList(list);
return ResultVOUtils.success(pageSimpleResponse);
}

12
src/main/java/com/glxp/api/dao/inout/IoCodeTempDao.java
Unescape Escape View File

@ -2,6 +2,18 @@ package com.glxp.api.dao.inout;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.inout.IoCodeTempEntity;
import com.glxp.api.req.inout.FilterCodeRequest;
import com.glxp.api.res.inout.IoCodeTempResponse;
import java.util.List;
public interface IoCodeTempDao extends BaseMapperPlus<IoCodeTempDao, IoCodeTempEntity, IoCodeTempEntity> {
/**
* 查询扫码明细列表
*
* @param filterCodeRequest
* @return
*/
List<IoCodeTempResponse> selectCodeList(FilterCodeRequest filterCodeRequest);
}

124
src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java
Unescape Escape View File

@ -0,0 +1,124 @@
package com.glxp.api.res.inout;
import lombok.Data;
import java.util.Date;
/**
* 临时码表VO对象
*/
@Data
public class IoCodeTempResponse {
private Integer id;
/**
* UDI码
*/
private String code;
/**
* 主单据类型（入库，出库）
*/
private String mainAction;
/**
* 单据类型
*/
private String action;
/**
* 订单号外键
*/
private String orderId;
/**
* 手持终端订单号
*/
private String corpOrderId;
/**
* DI标识
*/
private String nameCode;
/**
* 批次号
*/
private String batchNo;
/**
* 生产日期
*/
private String produceDate;
/**
* 失效日期
*/
private String expireDate;
/**
* 序列号
*/
private String serialNo;
/**
* 包装级别
*/
private String packageLevel;
/**
* 供应商ID外键
*/
private String supId;
/**
* 耗材字典ID外键
*/
private Long relId;
/**
* 扫码数量
*/
private Integer count;
/**
* 实际数量
*/
private Integer reCount;
/**
* 部门编码外键
*/
private String deptCode;
/**
* 仓库编码外键
*/
private String invCode;
/**
* 货位编码外键
*/
private String warehouseCode;
/**
* 更新日期
*/
private Date updateTime;
/**
* 创建日期
*/
private Date createTime;
private Integer status; //条码校验状态
private String mySupId; //更新供应商
/**
* 供应商名称
*/
private String supName;
}

9
src/main/java/com/glxp/api/service/inout/IoCodeTempService.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.api.service.inout;
import com.glxp.api.entity.inout.IoCodeTempEntity;
import com.glxp.api.req.inout.FilterCodeRequest;
import com.glxp.api.res.inout.IoCodeTempResponse;
import com.glxp.api.util.page.TableDataInfo;
import java.util.List;
@ -29,4 +30,12 @@ public interface IoCodeTempService {
TableDataInfo<IoCodeTempEntity> findByOrderId(FilterCodeRequest filterCodeRequest);
int deleteByBillNo(String orderId);
/**
* 查询扫码明细
*
* @param filterCodeRequest
* @return
*/
List<IoCodeTempResponse> findCodeList(FilterCodeRequest filterCodeRequest);
}

13
src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java
Unescape Escape View File

@ -1,9 +1,12 @@
package com.glxp.api.service.inout.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.inout.IoCodeTempDao;
import com.glxp.api.entity.inout.IoCodeTempEntity;
import com.glxp.api.req.inout.FilterCodeRequest;
import com.glxp.api.res.inout.IoCodeTempResponse;
import com.glxp.api.service.inout.IoCodeTempService;
import com.glxp.api.util.BeanCopyUtils;
import com.glxp.api.util.page.PageQuery;
@ -13,8 +16,6 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@Service
public class IoCodeTempServiceImpl implements IoCodeTempService {
@ -75,4 +76,12 @@ public class IoCodeTempServiceImpl implements IoCodeTempService {
return ioCodeTempDao.delete(new QueryWrapper<IoCodeTempEntity>().eq("orderId", orderId));
}
@Override
public List<IoCodeTempResponse> findCodeList(FilterCodeRequest filterCodeRequest) {
if (null != filterCodeRequest && null != filterCodeRequest.getPage() && null != filterCodeRequest.getLimit()) {
PageHelper.offsetPage((filterCodeRequest.getPage() - 1) * filterCodeRequest.getLimit(), filterCodeRequest.getLimit());
}
return ioCodeTempDao.selectCodeList(filterCodeRequest);
}
}

17
src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml
Unescape Escape View File

@ -0,0 +1,17 @@
<?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.inout.IoCodeTempDao">
<select id="selectCodeList" resultType="com.glxp.api.res.inout.IoCodeTempResponse">
select *,
(select `name` from basic_corp where erpId = io_code_temp.supId) supName
from io_code_temp
<where>
<if test="orderId != null and orderId != ''">
orderId = #{orderId}
</if>
</where>
</select>
</mapper>

3
src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml
Unescape Escape View File

@ -2,7 +2,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.inout.IoOrderDetailCodeDao">
<select id="filterList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse">
select io_order_detail_code.*
select io_order_detail_code.*,
(select `name` from basic_corp where erpId = io_order_detail_code.supId) supName
from io_order_detail_code
left join basic_udirel bu on bu.id = io_order_detail_code.bindRlFk
left join basic_products bp on bp.uuid = bu.uuid

Write Preview
Loading…
Cancel
Save