diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 50f959dd1..ab82ab8f7 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -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 tableDataInfo = codeTempService.findByOrderId(warehouseQueryRequest); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(tableDataInfo.getTotal()); - pageSimpleResponse.setList(tableDataInfo.getList()); + + List list = codeTempService.findCodeList(filterCodeRequest); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(pageInfo.getList()); return ResultVOUtils.success(pageSimpleResponse); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 4d90d4a33..269d511be 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -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 orderEntityList = orderService.selectAll(); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(100l); + pageSimpleResponse.setTotal(Long.valueOf(orderEntityList.size())); pageSimpleResponse.setList(orderEntityList); return ResultVOUtils.success(pageSimpleResponse); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java index 45b19a508..c29c2b369 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java @@ -40,7 +40,7 @@ public class IoOrderDetailCodeController { List list = ioOrderDetailCodeService.getDetailCodeResponse(orderEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(100l); + pageSimpleResponse.setTotal(Long.valueOf(list.size())); pageSimpleResponse.setList(list); return ResultVOUtils.success(pageSimpleResponse); } diff --git a/src/main/java/com/glxp/api/dao/inout/IoCodeTempDao.java b/src/main/java/com/glxp/api/dao/inout/IoCodeTempDao.java index d079aad8a..38a66c9d7 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoCodeTempDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoCodeTempDao.java @@ -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 { + + /** + * 查询扫码明细列表 + * + * @param filterCodeRequest + * @return + */ + List selectCodeList(FilterCodeRequest filterCodeRequest); } diff --git a/src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java b/src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java new file mode 100644 index 000000000..79832c6e2 --- /dev/null +++ b/src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java @@ -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; + +} diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java index 7c7879230..9510573b7 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java @@ -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 findByOrderId(FilterCodeRequest filterCodeRequest); int deleteByBillNo(String orderId); + + /** + * 查询扫码明细 + * + * @param filterCodeRequest + * @return + */ + List findCodeList(FilterCodeRequest filterCodeRequest); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java index 9c101d9b1..2812f8c45 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java @@ -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().eq("orderId", orderId)); } + @Override + public List 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); + } + } diff --git a/src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml b/src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml new file mode 100644 index 000000000..8211966be --- /dev/null +++ b/src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml index fac825af7..3f63866ac 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml @@ -2,7 +2,8 @@