新增拆零销毁出库相关方法接口

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<IoSplitDesOrderResponse> orderResponses = splitDesOrderService.filterList(splitDesOrderRequest);
+        PageInfo<IoSplitDesOrderResponse> pageInfo = new PageInfo<>(orderResponses);
+        PageSimpleResponse<IoSplitDesOrderResponse> 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<IoSplitDesOrderDetailResponse> list = splitDesOrderDetailService.filterList(splitDesOrderDetailRequest);
+        PageInfo<IoSplitDesOrderDetailResponse> pageInfo = new PageInfo<>(list);
+        PageSimpleResponse<IoSplitDesOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(list);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+}

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<IoSplitDesOrderDetail> {
+
+    List<IoSplitDesOrderDetailResponse> filterList(IoSplitDesOrderDetailRequest splitDesOrderDetailRequest);
+}

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<IoSplitDesOrder> {
+
+    List<IoSplitDesOrderResponse> filterList(IoSplitDesOrderRequest splitDesOrderRequest);
+}

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;
 }

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;
+}

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;
+}

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;
+}

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;
+
+}

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;
+
+
+}

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;
+
+
+}

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<IoSplitDesOrderDetailMapper, IoSplitDesOrderDetail> {
+
+    @Resource
+    IoSplitDesOrderDetailMapper splitDesOrderDetailMapper;
+
+    public List<IoSplitDesOrderDetailResponse> 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<IoSplitDesOrderDetailResponse> data = splitDesOrderDetailMapper.filterList(splitDesOrderDetailRequest);
+        return data;
+    }
+
+
+
+
+
+}

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<IoSplitDesOrderMapper, IoSplitDesOrder> {
+
+    @Resource
+    IoSplitDesOrderMapper splitDesOrderMapper;
+
+    public List<IoSplitDesOrderResponse> 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<IoSplitDesOrderResponse> data = splitDesOrderMapper.filterList(splitDesOrderRequest);
+        return data;
+    }
+
+
+    public IoSplitDesOrder getByBillNo(String billNo) {
+        return splitDesOrderMapper.selectOne(new LambdaQueryWrapper<IoSplitDesOrder>().eq(IoSplitDesOrder::getBillNo, billNo).last("limit 1"));
+    }
+}

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;
 
 
 -- 清除拆零，原始单据等

src/main/resources/mybatis/mapper/collect/IoSplitDesOrderDetailMapper.xml

@@ -0,0 +1,32 @@
+<?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.collect.IoSplitDesOrderDetailMapper">
+    <select id="filterList" parameterType="com.glxp.api.req.collect.IoSplitDesOrderDetailRequest"
+            resultType="com.glxp.api.res.collect.IoSplitDesOrderDetailResponse">
+        SELECT isdod.*, bp.nameCode diCode, bp.zczbhhzbapzbh, bp.manufactory, bp.bzgg
+        FROM io_split_des_order_detail isdod
+                 left join basic_udirel bu on isdod.relId = bu.id
+                 left join basic_products bp on bu.uuid = bp.uuid
+        <where>
+            <if test="orderIdFk != null and orderIdFk != ''">
+                AND isdod.orderIdFk = #{orderIdFk}
+            </if>
+            <if test="relId != null">
+                AND isdod.relId = #{relId}
+            </if>
+            <if test="cpmctymc != null and cpmctymc != ''">
+                AND bp.cpmctymc LIKE concat('%', #{cpmctymc}, '%')
+            </if>
+            <if test="unionCode != '' and unionCode != null">
+                and (
+                        bp.nameCode LIKE concat('%', #{unionCode}, '%')
+                        or bp.ybbm LIKE concat('%', #{unionCode}, '%')
+                        or bp.sptm LIKE concat('%', #{unionCode}, '%'))
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                AND bp.ggxh LIKE concat('%', #{ggxh}, '%')
+            </if>
+        </where>
+        group by isdod.id
+    </select>
+</mapper>

src/main/resources/mybatis/mapper/collect/IoSplitDesOrderMapper.xml

@@ -0,0 +1,22 @@
+<?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.collect.IoSplitDesOrderMapper">
+    <select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderBizRequest"
+            resultType="com.glxp.api.res.collect.IoSplitDesOrderResponse">
+        SELECT isdo.*,
+               sw.workplaceName
+        FROM io_split_des_order isdo
+                 left join sys_workplace sw on isdo.workPlaceCode = sw.workplaceId
+        <where>
+            <if test="billNo != '' and billNo != null">
+                AND billNo LIKE concat('%', #{billNo}, '%')
+            </if>
+            <if test="busType != null and busType != ''">
+                AND busType = #{busType}
+            </if>
+            <if test="workPlaceCode != null">
+                AND isdo.workPlaceCode = #{workPlaceCode}
+            </if>
+        </where>
+    </select>
+</mapper>