Merge remote-tracking branch 'origin/master' into ww

src/main/java/com/glxp/api/controller/inout/IoCodeController.java

@@ -1,14 +1,54 @@
 package com.glxp.api.controller.inout;
 
+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.req.inout.FilterIoCodeRequest;
+import com.glxp.api.res.inout.IoCodeResponse;
+import com.glxp.api.service.inout.IoCodeService;
+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 IoCodeController extends BaseController {
 
+    @Resource
+    private IoCodeService ioCodeService;
+
+    /**
+     * 查询单据正式码表数据
+     *
+     * @param filterIoCodeRequest
+     * @return
+     */
+    @GetMapping("/udiwms/inout/code/filterList")
+    public BaseResponse filterList(FilterIoCodeRequest filterIoCodeRequest) {
+        List<IoCodeResponse> list = ioCodeService.filterList(filterIoCodeRequest);
+        PageInfo<IoCodeResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
+    /**
+     * 根据单据号查询正式码表数据
+     *
+     * @param orderId
+     * @return
+     */
+    @GetMapping("/udiwms/inout/code/findByOrderId")
+    public BaseResponse findAllByOrderId(String orderId) {
+        FilterIoCodeRequest filterIoCodeRequest = new FilterIoCodeRequest();
+        filterIoCodeRequest.setOrderId(orderId);
+        List<IoCodeResponse> list = ioCodeService.filterList(filterIoCodeRequest);
+        PageInfo<IoCodeResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.success(pageInfo);
+    }
 
 
 }

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -15,7 +15,7 @@ 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.IoCodeEnttity;
+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;
@@ -695,9 +695,9 @@ public class IoCodeTempController extends BaseController {
             codeEnttity.setSupId(originSupId);
         } else {
 
-            IoCodeEnttity ioCodeEnttity = new IoCodeEnttity();
+            IoCodeEntity ioCodeEntity = new IoCodeEntity();
-            BeanUtils.copyProperties(codeEnttity, ioCodeEnttity);
+            BeanUtils.copyProperties(codeEnttity, ioCodeEntity);
-            String supId = transInoutService.checkInvExitSup(ioCodeEnttity);
+            String supId = transInoutService.checkInvExitSup(ioCodeEntity);
             if (supId == null) {
                 supId = transInoutService.checkExitSup(codeEnttity.getRelId());
             }

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.inout;
 
+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;
@@ -7,6 +8,7 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.req.inout.FilterOrderRequest;
 import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.inout.IoOrderResponse;
 import com.glxp.api.service.inout.IoOrderService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.BindingResult;
@@ -36,9 +38,9 @@ public class IoOrderController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-
+        List<IoOrderResponse> list = orderService.filterList(filterOrderRequest);
-
+        PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
-        return ResultVOUtils.success();
+        return ResultVOUtils.page(pageInfo);
     }
 
     @AuthRuleAnnotation("")

src/main/java/com/glxp/api/controller/inout/IoOrderDetailController.java

@@ -4,14 +4,10 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.dao.inout.IoOrderDetailCodeDao;
-import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
-import com.glxp.api.req.basic.UdiCombineRequest;
+import com.glxp.api.req.inout.FilterOrderDetailRequest;
-import com.glxp.api.req.inout.AddBizProductReqeust;
 import com.glxp.api.res.PageSimpleResponse;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -24,6 +20,7 @@ public class IoOrderDetailController {
     @Resource
     IoOrderDetailCodeDao ioOrderDetailCodeDao;
 
+
     //获取新增扫码单据详情---临时接口查询
     @AuthRuleAnnotation("")
     @GetMapping("udiwms/inout/order/draft/detailCode")
@@ -35,7 +32,16 @@ public class IoOrderDetailController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
-
+    /**
+     * 查询单据详情
+     *
+     * @param filterOrderDetailRequest
+     * @return
+     */
+    @GetMapping("udiwms/inout/order/filterList")
+    public BaseResponse filterList(FilterOrderDetailRequest filterOrderDetailRequest) {
+        return ResultVOUtils.success();
+    }
 
 
 }

src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java

@@ -3,7 +3,7 @@ package com.glxp.api.dao.basic;
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.dao.inout.IoCodeDao;
 import com.glxp.api.entity.basic.UdiRelevanceEntity;
-import com.glxp.api.entity.inout.IoCodeEnttity;
+import com.glxp.api.entity.inout.IoCodeEntity;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import org.apache.ibatis.annotations.Mapper;
@@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-public interface UdiRelevanceDao extends BaseMapperPlus<IoCodeDao, IoCodeEnttity, IoCodeEnttity> {
+public interface UdiRelevanceDao extends BaseMapperPlus<IoCodeDao, IoCodeEntity, IoCodeEntity> {
 
     List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest);
 

src/main/java/com/glxp/api/dao/inout/IoCodeDao.java

@@ -1,12 +1,13 @@
 package com.glxp.api.dao.inout;
 
 import com.glxp.api.dao.BaseMapperPlus;
-import com.glxp.api.entity.inout.IoCodeEnttity;
+import com.glxp.api.entity.inout.IoCodeEntity;
 import com.glxp.api.req.inout.FilterIoCodeRequest;
+import com.glxp.api.res.inout.IoCodeResponse;
 
 import java.util.List;
 
-public interface IoCodeDao extends BaseMapperPlus<IoCodeDao, IoCodeEnttity, IoCodeEnttity> {
+public interface IoCodeDao extends BaseMapperPlus<IoCodeDao, IoCodeEntity, IoCodeEntity> {
 
     /**
      * 查询单据码明细
@@ -14,5 +15,13 @@ public interface IoCodeDao extends BaseMapperPlus<IoCodeDao, IoCodeEnttity, IoCo
      * @param filterIoCodeRequest
      * @return
      */
-    List<IoCodeEnttity> filterCodeList(FilterIoCodeRequest filterIoCodeRequest);
+    List<IoCodeEntity> filterCodeList(FilterIoCodeRequest filterIoCodeRequest);
+
+    /**
+     * 查询单据码明细VO数据
+     *
+     * @param filterIoCodeRequest
+     * @return
+     */
+    List<IoCodeResponse> filterList(FilterIoCodeRequest filterIoCodeRequest);
 }

src/main/java/com/glxp/api/dao/inout/IoOrderDao.java

@@ -2,6 +2,26 @@ package com.glxp.api.dao.inout;
 
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inout.IoOrderEntity;
+import com.glxp.api.req.inout.FilterOrderRequest;
+import com.glxp.api.res.inout.IoOrderResponse;
+
+import java.util.List;
 
 public interface IoOrderDao extends BaseMapperPlus<IoOrderDao, IoOrderEntity, IoOrderEntity> {
+
+    /**
+     * 查询单据VO列表
+     *
+     * @param filterOrderRequest
+     * @return
+     */
+    List<IoOrderResponse> filterList(FilterOrderRequest filterOrderRequest);
+
+    /**
+     * 查询单据实体列表
+     *
+     * @param filterOrderRequest
+     * @return
+     */
+    List<IoOrderEntity> filterOrderList(FilterOrderRequest filterOrderRequest);
 }

src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java

@@ -4,15 +4,14 @@ 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 lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import lombok.Data;
-
 @Data
 @TableName(value = "io_code")
-public class IoCodeEnttity implements Serializable {
+public class IoCodeEntity implements Serializable {
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;

src/main/java/com/glxp/api/req/inout/FilterIoCodeRequest.java

@@ -7,15 +7,64 @@ import java.util.List;
 
 @Data
 public class FilterIoCodeRequest extends ListPageRequest {
+
+    /**
+     * 手持终端订单号
+     */
     private String corpOrderId;
+
+    /**
+     * UDI码
+     */
     private String code;
-    private String udi;
+
+    /**
+     * 批次号
+     */
     private String batchNo;
+
+    /**
+     * 单据号
+     */
     private String orderId;
+
+    /**
+     * DI标识
+     */
     private String nameCode;
+
+    /**
+     * 供应商ID
+     */
     private String supId;
-    private String locStorageCode;
+
+    /**
+     * 耗材字典ID
+     */
     private String relId;
 
+    /**
+     * 部门编码
+     */
+    private String deptCode;
+
+    /**
+     * 仓库编码
+     */
+    private String invCode;
+
+    /**
+     * 货位编码
+     */
+    private String warehouseCode;
+
+    /**
+     * 包装级别
+     */
+    private String packageLevel;
+
+    /**
+     * 单据类型集合
+     */
     List<String> actions;
 }

src/main/java/com/glxp/api/req/inout/FilterOrderDetailRequest.java

@@ -0,0 +1,10 @@
+package com.glxp.api.req.inout;
+
+import lombok.Data;
+
+/**
+ *
+ */
+@Data
+public class FilterOrderDetailRequest {
+}

src/main/java/com/glxp/api/res/inout/IoCodeResponse.java

@@ -0,0 +1,147 @@
+package com.glxp.api.res.inout;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 单据正式码表VO类
+ */
+@Data
+public class IoCodeResponse implements Serializable {
+
+    private static final long serialVersionUID = -3436984812709186027L;
+
+    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 productName;
+
+    /**
+     * 供应商名称
+     */
+    private String supName;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 仓库名称
+     */
+    private String invName;
+
+    /**
+     * 货位名称
+     */
+    private String warehouseName;
+}

src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java

@@ -0,0 +1,10 @@
+package com.glxp.api.res.inout;
+
+import lombok.Data;
+
+/**
+ * 单据业务详情VO
+ */
+@Data
+public class IoOrderDetailBizResponse {
+}

src/main/java/com/glxp/api/res/inout/IoOrderDetailResponse.java

@@ -0,0 +1,11 @@
+package com.glxp.api.res.inout;
+
+import lombok.Data;
+
+/**
+ * 单据详情VO
+ */
+@Data
+public class IoOrderDetailResponse {
+
+}

src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java

@@ -0,0 +1,11 @@
+package com.glxp.api.res.inout;
+
+import lombok.Data;
+
+/**
+ * 单据扫码明细VO
+ */
+@Data
+public class IoOrderDetailResultResponse {
+
+}

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -1,9 +1,6 @@
 package com.glxp.api.res.inout;
 
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.util.Date;
@@ -34,6 +31,11 @@ public class IoOrderResponse {
      */
     private String action;
 
+    /**
+     * 单据类型名称
+     */
+    private String billTypeName;
+
     /**
      * 往来单位
      */
@@ -149,10 +151,41 @@ public class IoOrderResponse {
      */
     private String remark;
 
+    /**
+     * 创建人名称
+     */
+    private String createUserName;
+
+    /**
+     * 更新人名称
+     */
+    private String updateUserName;
+
+    /**
+     * 审核人名称
+     */
+    private String reviewUserName;
+
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 往来单位名称
+     */
     private String fromCorpName;
+
+    /**
+     * 往来仓库名称
+     */
     private String fromInvName;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 往来名称
+     */
     private String fromName;
 
 

src/main/java/com/glxp/api/service/inout/IoAddInoutService.java

@@ -6,7 +6,7 @@ import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.basic.UdiRlSupEntity;
-import com.glxp.api.entity.inout.IoCodeEnttity;
+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;
@@ -82,10 +82,10 @@ public class IoAddInoutService {
 
 
                     //写入条码
-                    List<IoCodeEnttity> ioCodeEnttities = new ArrayList<>();
+                    List<IoCodeEntity> ioCodeEnttities = new ArrayList<>();
                     for (int index = 0; index < pdaCodeEntities.size(); index++) {
                         pdaCodeEntities.get(index).setOrderId(orderNo);
-                        IoCodeEnttity codeEnttity = new IoCodeEnttity();
+                        IoCodeEntity codeEnttity = new IoCodeEntity();
                         BeanUtils.copyProperties(pdaCodeEntities.get(index), codeEnttity);
                         ioCodeEnttities.add(codeEnttity);
                     }
@@ -124,7 +124,7 @@ public class IoAddInoutService {
         return null;
     }
 
-    public String checkInvExitSup(IoCodeEnttity codeEnttity) {
+    public String checkInvExitSup(IoCodeEntity codeEnttity) {
 
         String supId = checkNorInv(codeEnttity);
         if (supId == null) {
@@ -134,7 +134,7 @@ public class IoAddInoutService {
     }
 
     //查普通库存  todo
-    public String checkNorInv(IoCodeEnttity codeEnttity) {
+    public String checkNorInv(IoCodeEntity codeEnttity) {
 
 //        FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
 //        filterInvWarehouseRequest.setLevel(1);
@@ -168,7 +168,7 @@ public class IoAddInoutService {
     }
 
     //查寄售库存  todo
-    public String checkPreInv(IoCodeEnttity codeEnttity) {
+    public String checkPreInv(IoCodeEntity codeEnttity) {
 //        FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
 //        filterInvWarehouseRequest.setLevel(1);
 //        filterInvWarehouseRequest.setAdvanceType(true);

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.*;
-import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -206,7 +205,7 @@ public class IoCheckInoutService {
             //临时表转正式表
             List<IoCodeTempEntity> codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo());
             for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
-                IoCodeEnttity codeEnttity = new IoCodeEnttity();
+                IoCodeEntity codeEnttity = new IoCodeEntity();
                 BeanUtils.copyProperties(codeTempEntity, codeEnttity);
                 codeService.insert(codeEnttity);
             }

src/main/java/com/glxp/api/service/inout/IoCodeService.java

@@ -1,22 +1,44 @@
 package com.glxp.api.service.inout;
 
-import com.glxp.api.entity.inout.IoCodeEnttity;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.entity.inout.IoCodeEntity;
 import com.glxp.api.req.inout.FilterIoCodeRequest;
+import com.glxp.api.res.inout.IoCodeResponse;
 
 import java.util.List;
 
 public interface IoCodeService {
 
-    int insert(IoCodeEnttity codeEnttity);
+    int insert(IoCodeEntity codeEnttity);
 
-    boolean insertBatch(List<IoCodeEnttity> codeEnttities);
+    boolean insertBatch(List<IoCodeEntity> codeEnttities);
 
-    List<IoCodeEnttity> findByOrderId(String billNo);
+    List<IoCodeEntity> findByOrderId(String billNo);
 
-    int updateById(IoCodeEnttity codeEnttity);
+    int updateById(IoCodeEntity codeEnttity);
 
-    public IoCodeEnttity findByUnique(String orderId, String code);
+    public IoCodeEntity findByUnique(String orderId, String code);
+
+    /**
+     * 查询正式码表实体数据
+     *
+     * @param filterIoCodeRequest
+     * @return
+     */
+    List<IoCodeEntity> filterCodeList(FilterIoCodeRequest filterIoCodeRequest);
+
+    /**
+     * 查询正式码表VO数据
+     */
+    List<IoCodeResponse> filterList(FilterIoCodeRequest filterIoCodeRequest);
+
+    /**
+     * 根据单号删除正式码表数据
+     *
+     * @param orderId
+     * @return
+     */
+    BaseResponse deleteCodeByOrderId(String orderId);
 
-    List<IoCodeEnttity> filterCodeList(FilterIoCodeRequest filterIoCodeRequest);
 
 }

src/main/java/com/glxp/api/service/inout/IoOrderService.java

@@ -1,6 +1,8 @@
 package com.glxp.api.service.inout;
 
 import com.glxp.api.entity.inout.IoOrderEntity;
+import com.glxp.api.req.inout.FilterOrderRequest;
+import com.glxp.api.res.inout.IoOrderResponse;
 
 import java.util.List;
 
@@ -18,4 +20,20 @@ public interface IoOrderService {
     int insertOrUpdate(IoOrderEntity orderEntity);
 
     int update(IoOrderEntity orderEntity);
+
+    /**
+     * 查询单据列表
+     *
+     * @param filterOrderRequest
+     * @return
+     */
+    List<IoOrderResponse> filterList(FilterOrderRequest filterOrderRequest);
+
+    /**
+     * 查询单据列表
+     *
+     * @param filterOrderRequest
+     * @return
+     */
+    List<IoOrderEntity> filterOrderList(FilterOrderRequest filterOrderRequest);
 }

src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java

@@ -1,10 +1,15 @@
 package com.glxp.api.service.inout.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.dao.inout.IoCodeDao;
-import com.glxp.api.entity.inout.IoCodeEnttity;
+import com.glxp.api.entity.inout.IoCodeEntity;
 import com.glxp.api.req.inout.FilterIoCodeRequest;
+import com.glxp.api.res.inout.IoCodeResponse;
 import com.glxp.api.service.inout.IoCodeService;
 import org.springframework.stereotype.Service;
 
@@ -16,35 +21,35 @@ import java.util.List;
 public class IoCodeServiceImpl implements IoCodeService {
 
     @Resource
-    IoCodeDao ioCodeDao;
+    private IoCodeDao ioCodeDao;
 
     @Override
-    public int insert(IoCodeEnttity codeEnttity) {
+    public int insert(IoCodeEntity codeEnttity) {
         return ioCodeDao.insert(codeEnttity);
     }
 
     @Override
-    public boolean insertBatch(List<IoCodeEnttity> codeEnttities) {
+    public boolean insertBatch(List<IoCodeEntity> codeEnttities) {
         return ioCodeDao.insertBatch(codeEnttities);
     }
 
     @Override
-    public List<IoCodeEnttity> findByOrderId(String billNo) {
+    public List<IoCodeEntity> findByOrderId(String billNo) {
-        return ioCodeDao.selectList(new QueryWrapper<IoCodeEnttity>().eq("orderId", billNo));
+        return ioCodeDao.selectList(new QueryWrapper<IoCodeEntity>().eq("orderId", billNo));
     }
 
     @Override
-    public int updateById(IoCodeEnttity codeEnttity) {
+    public int updateById(IoCodeEntity codeEnttity) {
         return ioCodeDao.updateById(codeEnttity);
     }
 
     @Override
-    public IoCodeEnttity findByUnique(String orderId, String code) {
+    public IoCodeEntity findByUnique(String orderId, String code) {
-        return ioCodeDao.selectOne(new QueryWrapper<IoCodeEnttity>().eq("orderId", orderId).eq("code", code));
+        return ioCodeDao.selectOne(new QueryWrapper<IoCodeEntity>().eq("orderId", orderId).eq("code", code));
     }
 
     @Override
-    public List<IoCodeEnttity> filterCodeList(FilterIoCodeRequest filterIoCodeRequest) {
+    public List<IoCodeEntity> filterCodeList(FilterIoCodeRequest filterIoCodeRequest) {
         if (null == filterIoCodeRequest) {
             return Collections.emptyList();
         }
@@ -54,5 +59,25 @@ public class IoCodeServiceImpl implements IoCodeService {
         return ioCodeDao.filterCodeList(filterIoCodeRequest);
     }
 
+    @Override
+    public List<IoCodeResponse> filterList(FilterIoCodeRequest filterIoCodeRequest) {
+        if (null == filterIoCodeRequest) {
+            return Collections.emptyList();
+        }
+        if (null != filterIoCodeRequest.getPage() && null != filterIoCodeRequest.getLimit()) {
+            PageHelper.offsetPage((filterIoCodeRequest.getPage() - 1) * filterIoCodeRequest.getLimit(), filterIoCodeRequest.getLimit());
+        }
+        return ioCodeDao.filterList(filterIoCodeRequest);
+    }
+
+    @Override
+    public BaseResponse deleteCodeByOrderId(String orderId) {
+        if (StrUtil.isBlank(orderId)) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "单据号不能为空");
+        }
+        ioCodeDao.delete(new QueryWrapper<IoCodeEntity>().eq("orderId", orderId));
+        return ResultVOUtils.success("删除成功");
+    }
+
 
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -1,20 +1,23 @@
 package com.glxp.api.service.inout.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.inout.IoOrderDao;
-import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
+import com.glxp.api.req.inout.FilterOrderRequest;
+import com.glxp.api.res.inout.IoOrderResponse;
 import com.glxp.api.service.inout.IoOrderService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.List;
 
 @Service
 public class IoOrderServiceImpl implements IoOrderService {
 
     @Resource
-    IoOrderDao orderDao;
+    private IoOrderDao orderDao;
 
     @Override
     public List<IoOrderEntity> selectAll() {
@@ -51,4 +54,27 @@ public class IoOrderServiceImpl implements IoOrderService {
     public int update(IoOrderEntity orderEntity) {
         return orderDao.updateById(orderEntity);
     }
+
+    @Override
+    public List<IoOrderResponse> filterList(FilterOrderRequest filterOrderRequest) {
+        if (null == filterOrderRequest) {
+            return Collections.emptyList();
+        }
+        if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) {
+            PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit());
+        }
+        return orderDao.filterList(filterOrderRequest);
+    }
+
+    @Override
+    public List<IoOrderEntity> filterOrderList(FilterOrderRequest filterOrderRequest) {
+        if (null == filterOrderRequest) {
+            return Collections.emptyList();
+        }
+        if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) {
+            PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit());
+        }
+        return orderDao.filterOrderList(filterOrderRequest);
+    }
+
 }

src/main/resources/mybatis/mapper/inout/IoCodeDao.xml

@@ -1,8 +1,107 @@
 <?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.IoCodeDao">
+    <select id="filterCodeList" resultType="com.glxp.api.entity.inout.IoCodeEntity"
+            parameterType="com.glxp.api.req.inout.FilterIoCodeRequest">
+        select *
+        from io_code
+        <where>
+            <if test="code != null and code != ''">
+                AND code = #{code}
+            </if>
+            <if test="orderId != null and orderId != ''">
+                AND orderId like concat('%', #{orderId}, '%')
+            </if>
+            <if test="nameCode != null and nameCode != ''">
+                AND nameCode like concat('%', #{nameCode}, '%')
+            </if>
+            <if test="supId != null and supId != ''">
+                AND supId like concat('%', #{supId}, '%')
+            </if>
+            <if test="relId != null and relId != ''">
+                AND relId like concat('%', #{relId}, '%')
+            </if>
+            <if test="deptCode != null and deptCode != ''">
+                AND deptCode = #{deptCode}
+            </if>
+            <if test="invCode != null and invCode != ''">
+                AND invCode = #{invCode}
+            </if>
+            <if test="warehouseCode != null and warehouseCode != ''">
+                AND warehouseCode = #{warehouseCode}
+            </if>
+            <if test="packageLevel != null and packageLevel != ''">
+                AND packageLevel = #{packageLevel}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND batchNo = #{batchNo}
+            </if>
+            <if test="corpOrderId != null and corpOrderId != ''">
+                AND corpOrderId = #{corpOrderId}
+            </if>
+            <if test="actions != null and actions.size() != 0">
+                AND action in
+                <foreach collection="actions" item="item" open="(" close=")" index="index" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 
-<select id="filterCodeList" resultType="com.glxp.api.entity.inout.IoCodeEnttity">
+    <select id="filterList" resultType="com.glxp.api.res.inout.IoCodeResponse">
-
+        select ic.*,
-</select>
+               bp.cpmctymc     productName,
+               ad.name         deptName,
+               aw.name         invName,
+               auth_space.name warehouseName,
+               bc.name         supName
+        from io_code ic
+                 left join auth_dept ad on ic.deptCode = ad.code
+                 left join auth_warehouse aw on ic.invCode = aw.code
+                 left join auth_space on auth_space.code = ic.warehouseCode
+                 left join basic_udirel bu on bu.id = ic.relId
+                 left join basic_products bp on bu.uuid = bp.uuid
+                 left join basic_corp bc on bc.erpId = ic.supId
+        <where>
+            <if test="code != null and code != ''">
+                AND code = #{code}
+            </if>
+            <if test="orderId != null and orderId != ''">
+                AND orderId like concat('%', #{orderId}, '%')
+            </if>
+            <if test="nameCode != null and nameCode != ''">
+                AND nameCode like concat('%', #{nameCode}, '%')
+            </if>
+            <if test="supId != null and supId != ''">
+                AND supId like concat('%', #{supId}, '%')
+            </if>
+            <if test="relId != null and relId != ''">
+                AND relId like concat('%', #{relId}, '%')
+            </if>
+            <if test="deptCode != null and deptCode != ''">
+                AND deptCode = #{deptCode}
+            </if>
+            <if test="invCode != null and invCode != ''">
+                AND invCode = #{invCode}
+            </if>
+            <if test="warehouseCode != null and warehouseCode != ''">
+                AND warehouseCode = #{warehouseCode}
+            </if>
+            <if test="packageLevel != null and packageLevel != ''">
+                AND packageLevel = #{packageLevel}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND batchNo = #{batchNo}
+            </if>
+            <if test="corpOrderId != null and corpOrderId != ''">
+                AND corpOrderId = #{corpOrderId}
+            </if>
+            <if test="actions != null and actions.size() != 0">
+                AND action in
+                <foreach collection="actions" item="item" open="(" close=")" index="index" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -1,4 +1,88 @@
 <?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.IoOrderDao">
+    <select id="filterList" resultType="com.glxp.api.res.inout.IoOrderResponse">
+        select io_order.*,
+               bu.name                billTypeName,
+               auth_user.employeeName createUserName,
+               auth_dept.name         deptName,
+               auth_warehouse.name    invName
+        from io_order
+                 left join basic_bussiness_type bu on io_order.action = bu.action
+                 left join auth_user on auth_user.id = io_order.createUser or auth_user.id = io_order.updateUser
+            or auth_user.id = io_order.reviewUser
+                 left join auth_dept on auth_dept.code = io_order.deptCode
+                 left join auth_warehouse on auth_warehouse.code = io_order.invCode
+        <where>
+            <if test="id != null and id != ''">
+                AND io_order.id = #{id}
+            </if>
+            <if test="billNo != null and billNo != ''">
+                AND billNo like concat('%', #{billNo}, '%')
+            </if>
+            <if test="corpOrderId != null and corpOrderId != ''">
+                AND corpOrderId = #{corpOrderId}
+            </if>
+            <if test="deptCode != null and deptCode != ''">
+                AND deptCode = #{deptCode}
+            </if>
+            <if test="invCode != null and invCode != ''">
+                AND invCode = #{invCode}
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                AND io_order.createTime between #{startTime} and #{endTime}
+            </if>
+            <if test="startTime != null and startTime != ''">
+                AND io_order.createTime >= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND io_order.createTime &lt;= #{endTime}
+            </if>
+        </where>
+    </select>
+
+    <select id="filterOrderList" resultType="com.glxp.api.entity.inout.IoOrderEntity">
+        select * from io_order
+        <where>
+            <if test="billNo != null and billNo != ''">
+                AND billNo like concat('%', #{billNo}, '%')
+            </if>
+            <if test="id != null and id != ''">
+                AND id = #{id}
+            </if>
+            <if test="action != null and action != ''">
+                AND action = #{action}
+            </if>
+            <if test="mainAction != null and mainAction != ''">
+                AND mainAction = #{mainAction}
+            </if>
+            <if test="status != null">
+                AND status = #{status}
+            </if>
+            <if test="corpOrderId != null and corpOrderId != ''">
+                AND corpOrderId = #{corpOrderId}
+            </if>
+            <if test="fromCorp != null and fromCorp != ''">
+                AND fromCorp = #{fromCorp}
+            </if>
+            <if test="customerId != null and customerId != ''">
+                AND customerId = #{customerId}
+            </if>
+            <if test="invCode != null and invCode != ''">
+                AND invCode = #{invCode}
+            </if>
+            <if test="deptCode != null and deptCode != ''">
+                AND deptCode = #{deptCode}
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                AND createTime between #{startTime} and #{endTime}
+            </if>
+            <if test="startTime != null and startTime != ''">
+                AND createTime >= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND createTime &lt;= #{endTime}
+            </if>
+        </where>
+    </select>
 </mapper>