From f4d1ef4b9b32402622d1bd6452364da755bfd08b Mon Sep 17 00:00:00 2001 From: yewj Date: Thu, 29 Aug 2024 10:41:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8B=86=E9=9B=B6=E9=94=80?= =?UTF-8?q?=E6=AF=81=E5=87=BA=E5=BA=93=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoFifoDesOrderController.java | 57 ++++++++++++ .../collect/IoSplitDesOrderDetailMapper.java | 16 ++++ .../dao/collect/IoSplitDesOrderMapper.java | 17 ++++ .../api/entity/collect/IoCollectOrderBiz.java | 2 - .../api/entity/collect/IoSplitDesOrder.java | 65 ++++++++++++++ .../entity/collect/IoSplitDesOrderDetail.java | 77 ++++++++++++++++ .../collect/IoSplitDesOrderDetailRequest.java | 59 +++++++++++++ .../req/collect/IoSplitDesOrderRequest.java | 33 +++++++ .../IoSplitDesOrderDetailResponse.java | 87 +++++++++++++++++++ .../res/collect/IoSplitDesOrderResponse.java | 33 +++++++ .../collect/IoSplitDesOrderDetailService.java | 40 +++++++++ .../collect/IoSplitDesOrderService.java | 42 +++++++++ .../mapper/collect/IoCollectOrderMapper.xml | 1 + .../collect/IoSplitDesOrderDetailMapper.xml | 32 +++++++ .../mapper/collect/IoSplitDesOrderMapper.xml | 22 +++++ 15 files changed, 581 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java create mode 100644 src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderDetailMapper.java create mode 100644 src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderMapper.java create mode 100644 src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java create mode 100644 src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java create mode 100644 src/main/java/com/glxp/api/req/collect/IoSplitDesOrderDetailRequest.java create mode 100644 src/main/java/com/glxp/api/req/collect/IoSplitDesOrderRequest.java create mode 100644 src/main/java/com/glxp/api/res/collect/IoSplitDesOrderDetailResponse.java create mode 100644 src/main/java/com/glxp/api/res/collect/IoSplitDesOrderResponse.java create mode 100644 src/main/java/com/glxp/api/service/collect/IoSplitDesOrderDetailService.java create mode 100644 src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java create mode 100644 src/main/resources/mybatis/mapper/collect/IoSplitDesOrderDetailMapper.xml create mode 100644 src/main/resources/mybatis/mapper/collect/IoSplitDesOrderMapper.xml diff --git a/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java new file mode 100644 index 000000000..cf3c749a6 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java @@ -0,0 +1,57 @@ +package com.glxp.api.controller.collect; + +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.collect.IoSplitDesOrder; +import com.glxp.api.req.collect.IoSplitDesOrderDetailRequest; +import com.glxp.api.req.collect.IoSplitDesOrderRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.collect.IoSplitDesOrderDetailResponse; +import com.glxp.api.res.collect.IoSplitDesOrderResponse; +import com.glxp.api.service.collect.IoSplitDesOrderDetailService; +import com.glxp.api.service.collect.IoSplitDesOrderService; +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 IoFifoDesOrderController extends BaseController { + + @Resource + IoSplitDesOrderService splitDesOrderService; + @Resource + IoSplitDesOrderDetailService splitDesOrderDetailService; + + @GetMapping("/udiwms/basic/collect/desOrder/filter") + public BaseResponse filterOrder(IoSplitDesOrderRequest splitDesOrderRequest) { + List orderResponses = splitDesOrderService.filterList(splitDesOrderRequest); + PageInfo pageInfo = new PageInfo<>(orderResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(orderResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @GetMapping("/udiwms/basic/collect/desOrder/detail") + public BaseResponse detail(IoSplitDesOrderDetailRequest splitDesOrderDetailRequest) { + if (StrUtil.isBlank(splitDesOrderDetailRequest.getOrderIdFk())) { + return ResultVOUtils.error(500, "单据号不能为空"); + } + IoSplitDesOrder collectOrder = splitDesOrderService.getByBillNo(splitDesOrderDetailRequest.getOrderIdFk()); + if (collectOrder == null) { + return ResultVOUtils.error(500, "未找到单据"); + } + List list = splitDesOrderDetailService.filterList(splitDesOrderDetailRequest); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); + } +} diff --git a/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderDetailMapper.java b/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderDetailMapper.java new file mode 100644 index 000000000..b185dffcc --- /dev/null +++ b/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderDetailMapper.java @@ -0,0 +1,16 @@ +package com.glxp.api.dao.collect; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.collect.IoSplitDesOrderDetail; +import com.glxp.api.req.collect.IoSplitDesOrderDetailRequest; +import com.glxp.api.res.collect.IoSplitDesOrderDetailResponse; +import com.glxp.api.res.collect.IoSplitDesOrderResponse; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface IoSplitDesOrderDetailMapper extends BaseMapper { + + List filterList(IoSplitDesOrderDetailRequest splitDesOrderDetailRequest); +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderMapper.java b/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderMapper.java new file mode 100644 index 000000000..5b812cf1a --- /dev/null +++ b/src/main/java/com/glxp/api/dao/collect/IoSplitDesOrderMapper.java @@ -0,0 +1,17 @@ +package com.glxp.api.dao.collect; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.collect.IoSplitDesOrder; +import com.glxp.api.req.collect.CollectOrderRequest; +import com.glxp.api.req.collect.IoSplitDesOrderRequest; +import com.glxp.api.res.collect.IoCollectOrderResponse; +import com.glxp.api.res.collect.IoSplitDesOrderResponse; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface IoSplitDesOrderMapper extends BaseMapper { + + List filterList(IoSplitDesOrderRequest splitDesOrderRequest); +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java index 8c8fd1aa4..18a19c737 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java @@ -184,7 +184,6 @@ public class IoCollectOrderBiz implements Serializable { private Integer unTagCount; - /** * 自动扫描分配的工位存量 锁数量 */ @@ -193,6 +192,5 @@ public class IoCollectOrderBiz implements Serializable { private Integer autoResCount; - private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java new file mode 100644 index 000000000..1d34744f4 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java @@ -0,0 +1,65 @@ +package com.glxp.api.entity.collect; + +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 损耗出库 + */ +@ApiModel(value="损耗出库") +@Data +@TableName(value = "io_split_des_order") +public class IoSplitDesOrder implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + @ApiModelProperty(value="") + private Integer id; + + @TableField(value = "billNo") + @ApiModelProperty(value="") + private Integer billNo; + + @TableField(value = "busType") + @ApiModelProperty(value="") + private String busType; + + @TableField(value = "workPlaceCode") + @ApiModelProperty(value="") + private String workPlaceCode; + + @TableField(value = "createTime") + @ApiModelProperty(value="") + private Date createTime; + + @TableField(value = "billTime") + @ApiModelProperty(value="") + private Date billTime; + + @TableField(value = "remark") + @ApiModelProperty(value="") + private String remark; + + @TableField(value = "collectTime") + @ApiModelProperty(value="") + private Date collectTime; + + @TableField(value = "`createUser`") + @ApiModelProperty(value="") + private String createUser; + + @TableField(value = "updateTime") + @ApiModelProperty(value="") + private Date updateTime; + + @TableField(value = "updateUser") + @ApiModelProperty(value="") + private String updateUser; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java new file mode 100644 index 000000000..979881951 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrderDetail.java @@ -0,0 +1,77 @@ +package com.glxp.api.entity.collect; + +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 销毁出库详情 + */ +@ApiModel(value="销毁出库详情") +@Data +@TableName(value = "io_split_des_order_detail") +public class IoSplitDesOrderDetail implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + @ApiModelProperty(value="") + private Integer id; + + @TableField(value = "workPlaceCode") + @ApiModelProperty(value="") + private Long workPlaceCode; + + @TableField(value = "orderIdFk") + @ApiModelProperty(value="") + private String orderIdFk; + + @TableField(value = "invId") + @ApiModelProperty(value="") + private Integer invId; + + @TableField(value = "relId") + @ApiModelProperty(value="") + private Long relId; + + @TableField(value = "batchNo") + @ApiModelProperty(value="") + private String batchNo; + + @TableField(value = "produceDate") + @ApiModelProperty(value="") + private String produceDate; + + @TableField(value = "expireDate") + @ApiModelProperty(value="") + private String expireDate; + + @TableField(value = "supId") + @ApiModelProperty(value="") + private Long supId; + + @TableField(value = "`count`") + @ApiModelProperty(value="") + private Integer count; + + @TableField(value = "reCount") + @ApiModelProperty(value="") + private Integer reCount; + + @TableField(value = "createTime") + @ApiModelProperty(value="") + private Date createTime; + + @TableField(value = "updateTime") + @ApiModelProperty(value="") + private Date updateTime; + + @TableField(value = "remark") + @ApiModelProperty(value="") + private String remark; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderDetailRequest.java b/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderDetailRequest.java new file mode 100644 index 000000000..fab3f153b --- /dev/null +++ b/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderDetailRequest.java @@ -0,0 +1,59 @@ +package com.glxp.api.req.collect; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.glxp.api.util.page.ListPageRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +public class IoSplitDesOrderDetailRequest extends ListPageRequest { + + + private Integer id; + + private Long workPlaceCode; + + private String orderIdFk; + + private Integer invId; + + private Long relId; + + private String batchNo; + + private String produceDate; + + private String expireDate; + + private Long supId; + + private Integer count; + + private Integer reCount; + + private Date createTime; + + private Date updateTime; + + private String remark; + /** + * 产品通用名称 + */ + private String cpmctymc; + + /** + * 产品标识 + */ + private String nameCode; + + /** + * 规格型号 + */ + private String ggxh; + + private String unionCode; +} diff --git a/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderRequest.java b/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderRequest.java new file mode 100644 index 000000000..7d71d6332 --- /dev/null +++ b/src/main/java/com/glxp/api/req/collect/IoSplitDesOrderRequest.java @@ -0,0 +1,33 @@ +package com.glxp.api.req.collect; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +@Data +public class IoSplitDesOrderRequest extends ListPageRequest { + + private Integer id; + + private Integer billNo; + + private String busType; + + private String workPlaceCode; + + private Date createTime; + + private Date billTime; + + private String remark; + + private Date collectTime; + + private String createUser; + + private Date updateTime; + + private String updateUser; + +} diff --git a/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderDetailResponse.java b/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderDetailResponse.java new file mode 100644 index 000000000..4af2faaa0 --- /dev/null +++ b/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderDetailResponse.java @@ -0,0 +1,87 @@ +package com.glxp.api.res.collect; + +import lombok.Data; + +import java.util.Date; + +@Data +public class IoSplitDesOrderDetailResponse { + + + private Integer id; + + private Long workPlaceCode; + + private String orderIdFk; + + private Integer invId; + + private Long relId; + + private String batchNo; + + private String produceDate; + + private String expireDate; + + private Long supId; + + private Integer count; + + private Integer reCount; + + private Date createTime; + + private Date updateTime; + + private String remark; + + + /** + * 院内编码（第三方编码） + */ + private String thrCode; + + /** + * 医保编码 + */ + private String ybbm; + + /** + * 收费编码 + */ + private String payFeeCode; + + /** + * 产品通用名称 + */ + private String cpmctymc; + + /** + * 产品标识 + */ + private String nameCode; + + /** + * 规格型号 + */ + private String ggxh; + + + /** + * 计量单位 + */ + private String measureUnit; + + /** + * 单据明细赋码状态 1:未赋码；2：部分赋码；3：已赋码 + */ + private Integer tagStatus; + + /** + * 赋码错误信息 + */ + private String tagMsg; + + +} diff --git a/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderResponse.java b/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderResponse.java new file mode 100644 index 000000000..3fa43a189 --- /dev/null +++ b/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderResponse.java @@ -0,0 +1,33 @@ +package com.glxp.api.res.collect; + +import lombok.Data; + +import java.util.Date; + +@Data +public class IoSplitDesOrderResponse { + + private Integer id; + + private Integer billNo; + + private String busType; + + private String workPlaceCode; + + private Date createTime; + + private Date billTime; + + private String remark; + + private Date collectTime; + + private String createUser; + + private Date updateTime; + + private String updateUser; + + +} diff --git a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderDetailService.java b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderDetailService.java new file mode 100644 index 000000000..ac19edce1 --- /dev/null +++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderDetailService.java @@ -0,0 +1,40 @@ +package com.glxp.api.service.collect; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.req.collect.IoSplitDesOrderDetailRequest; +import com.glxp.api.req.collect.IoSplitDesOrderRequest; +import com.glxp.api.res.collect.IoSplitDesOrderDetailResponse; +import com.glxp.api.res.collect.IoSplitDesOrderResponse; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.collect.IoSplitDesOrderDetailMapper; +import com.glxp.api.entity.collect.IoSplitDesOrderDetail; + +@Service +public class IoSplitDesOrderDetailService extends ServiceImpl { + + @Resource + IoSplitDesOrderDetailMapper splitDesOrderDetailMapper; + + public List filterList(IoSplitDesOrderDetailRequest splitDesOrderDetailRequest) { + if (splitDesOrderDetailRequest == null) { + return Collections.emptyList(); + } + if (splitDesOrderDetailRequest.getPage() != null) { + int offset = (splitDesOrderDetailRequest.getPage() - 1) * splitDesOrderDetailRequest.getLimit(); + PageHelper.offsetPage(offset, splitDesOrderDetailRequest.getLimit()); + } + List data = splitDesOrderDetailMapper.filterList(splitDesOrderDetailRequest); + return data; + } + + + + + +} diff --git a/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java new file mode 100644 index 000000000..1048b1ad1 --- /dev/null +++ b/src/main/java/com/glxp/api/service/collect/IoSplitDesOrderService.java @@ -0,0 +1,42 @@ +package com.glxp.api.service.collect; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.pagehelper.PageHelper; +import com.glxp.api.entity.collect.IoCollectOrder; +import com.glxp.api.req.collect.CollectOrderRequest; +import com.glxp.api.req.collect.IoSplitDesOrderRequest; +import com.glxp.api.res.collect.IoCollectOrderResponse; +import com.glxp.api.res.collect.IoSplitDesOrderResponse; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.entity.collect.IoSplitDesOrder; +import com.glxp.api.dao.collect.IoSplitDesOrderMapper; + +@Service +public class IoSplitDesOrderService extends ServiceImpl { + + @Resource + IoSplitDesOrderMapper splitDesOrderMapper; + + public List filterList(IoSplitDesOrderRequest splitDesOrderRequest) { + if (splitDesOrderRequest == null) { + return Collections.emptyList(); + } + if (splitDesOrderRequest.getPage() != null) { + int offset = (splitDesOrderRequest.getPage() - 1) * splitDesOrderRequest.getLimit(); + PageHelper.offsetPage(offset, splitDesOrderRequest.getLimit()); + } + List data = splitDesOrderMapper.filterList(splitDesOrderRequest); + return data; + } + + + public IoSplitDesOrder getByBillNo(String billNo) { + return splitDesOrderMapper.selectOne(new LambdaQueryWrapper().eq(IoSplitDesOrder::getBillNo, billNo).last("limit 1")); + } +} diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml index 8dbccaf5a..2d52fb4ac 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml @@ -91,6 +91,7 @@ TRUNCATE io_split_code; TRUNCATE io_split_code_detail; TRUNCATE io_split_fifo_code; + truncate io_split_fifo_inv; -- 清除拆零，原始单据等 diff --git a/src/main/resources/mybatis/mapper/collect/IoSplitDesOrderDetailMapper.xml b/src/main/resources/mybatis/mapper/collect/IoSplitDesOrderDetailMapper.xml new file mode 100644 index 000000000..eb99f6862 --- /dev/null +++ b/src/main/resources/mybatis/mapper/collect/IoSplitDesOrderDetailMapper.xml @@ -0,0 +1,32 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/collect/IoSplitDesOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoSplitDesOrderMapper.xml new file mode 100644 index 000000000..cfef50949 --- /dev/null +++ b/src/main/resources/mybatis/mapper/collect/IoSplitDesOrderMapper.xml @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file