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

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

@@ -4,7 +4,7 @@ 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.req.inout.FilterCodeRequest;
 import com.glxp.api.res.inout.IoCodeResponse;
 import com.glxp.api.service.inout.IoCodeService;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,12 +25,12 @@ public class IoCodeController extends BaseController {
     /**
      * 查询单据正式码表数据
      *
-     * @param filterIoCodeRequest
+     * @param filterCodeRequest
      * @return
      */
     @GetMapping("/udiwms/inout/code/filterList")
-    public BaseResponse filterList(FilterIoCodeRequest filterIoCodeRequest) {
+    public BaseResponse filterList(FilterCodeRequest filterCodeRequest) {
-        List<IoCodeResponse> list = ioCodeService.filterList(filterIoCodeRequest);
+        List<IoCodeResponse> list = ioCodeService.filterList(filterCodeRequest);
         PageInfo<IoCodeResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
     }
@@ -43,9 +43,9 @@ public class IoCodeController extends BaseController {
      */
     @GetMapping("/udiwms/inout/code/findByOrderId")
     public BaseResponse findAllByOrderId(String orderId) {
-        FilterIoCodeRequest filterIoCodeRequest = new FilterIoCodeRequest();
+        FilterCodeRequest filterCodeRequest = new FilterCodeRequest();
-        filterIoCodeRequest.setOrderId(orderId);
+        filterCodeRequest.setOrderId(orderId);
-        List<IoCodeResponse> list = ioCodeService.filterList(filterIoCodeRequest);
+        List<IoCodeResponse> list = ioCodeService.filterList(filterCodeRequest);
         PageInfo<IoCodeResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.success(pageInfo);
     }

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

@@ -24,7 +24,7 @@ import com.glxp.api.http.SpsDirectClient;
 import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
 import com.glxp.api.req.inout.AddEnterCodeRequest;
 import com.glxp.api.req.inout.AddOrderRequest;
-import com.glxp.api.req.inout.FilterIoCodeRequest;
+import com.glxp.api.req.inout.FilterCodeRequest;
 import com.glxp.api.req.inout.PostOrderRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
@@ -752,7 +752,7 @@ public class IoCodeTempController extends BaseController {
 
     @AuthRuleAnnotation("")
     @GetMapping("admin/warehouse/inout/findErrorByOrderId")
-    public BaseResponse findErrorByOrderId(FilterIoCodeRequest warehouseQueryRequest) {
+    public BaseResponse findErrorByOrderId(FilterCodeRequest warehouseQueryRequest) {
         if (StrUtil.isEmpty(warehouseQueryRequest.getOrderId())) {
             return ResultVOUtils.error(500, "单据号不能为空!");
         }

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

@@ -1,25 +1,34 @@
 package com.glxp.api.controller.inout;
 
+import com.github.pagehelper.PageInfo;
 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.IoOrderDetailCodeEntity;
-import com.glxp.api.req.inout.FilterOrderDetailRequest;
+import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
 import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
+import com.glxp.api.service.inout.IoOrderDetailCodeService;
 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 IoOrderDetailController {
+public class IoOrderDetailCodeController {
 
 
     @Resource
     IoOrderDetailCodeDao ioOrderDetailCodeDao;
 
+    @Resource
+    private IoOrderDetailCodeService ioOrderDetailCodeService;
+
 
     //获取新增扫码单据详情---临时接口查询
     @AuthRuleAnnotation("")
@@ -35,12 +44,14 @@ public class IoOrderDetailController {
     /**
      * 查询单据详情
      *
-     * @param filterOrderDetailRequest
+     * @param detailCodeRequest
      * @return
      */
     @GetMapping("udiwms/inout/order/filterList")
-    public BaseResponse filterList(FilterOrderDetailRequest filterOrderDetailRequest) {
+    public BaseResponse filterList(FilterOrderDetailCodeRequest detailCodeRequest) {
-        return ResultVOUtils.success();
+        List<IoOrderDetailCodeResponse> list = ioOrderDetailCodeService.filterList(detailCodeRequest);
+        PageInfo<IoOrderDetailCodeResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
     }
 
 

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

@@ -0,0 +1,13 @@
+package com.glxp.api.controller.inout;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 单据扫码明细查询接口
+ */
+@RestController
+public class IoOrderDetailResultController {
+
+
+
+}

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

@@ -2,7 +2,7 @@ package com.glxp.api.dao.inout;
 
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inout.IoCodeEntity;
-import com.glxp.api.req.inout.FilterIoCodeRequest;
+import com.glxp.api.req.inout.FilterCodeRequest;
 import com.glxp.api.res.inout.IoCodeResponse;
 
 import java.util.List;
@@ -12,16 +12,16 @@ public interface IoCodeDao extends BaseMapperPlus<IoCodeDao, IoCodeEntity, IoCod
     /**
      * 查询单据码明细
      *
-     * @param filterIoCodeRequest
+     * @param filterCodeRequest
      * @return
      */
-    List<IoCodeEntity> filterCodeList(FilterIoCodeRequest filterIoCodeRequest);
+    List<IoCodeEntity> filterCodeList(FilterCodeRequest filterCodeRequest);
 
     /**
      * 查询单据码明细VO数据
      *
-     * @param filterIoCodeRequest
+     * @param filterCodeRequest
      * @return
      */
-    List<IoCodeResponse> filterList(FilterIoCodeRequest filterIoCodeRequest);
+    List<IoCodeResponse> filterList(FilterCodeRequest filterCodeRequest);
 }

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

@@ -2,7 +2,19 @@ package com.glxp.api.dao.inout;
 
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
-import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
+import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
+import com.glxp.api.res.inout.IoOrderDetailBizResponse;
+
+import java.util.List;
 
 public interface IoOrderDetailBizDao extends BaseMapperPlus<IoOrderDetailBizDao, IoOrderDetailBizEntity, IoOrderDetailBizEntity> {
+
+    /**
+     * 查询单据业务详情VO列表
+     *
+     * @param orderDetailBizRequest
+     * @return
+     */
+    List<IoOrderDetailBizResponse> filterList(FilterOrderDetailBizRequest orderDetailBizRequest);
+
 }

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

@@ -2,6 +2,18 @@ package com.glxp.api.dao.inout;
 
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
+import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
+import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
+
+import java.util.List;
 
 public interface IoOrderDetailCodeDao extends BaseMapperPlus<IoOrderDetailCodeDao, IoOrderDetailCodeEntity, IoOrderDetailCodeEntity> {
+
+    /**
+     * 查询单据扫码详情
+     *
+     * @param detailCodeRequest
+     * @return
+     */
+    List<IoOrderDetailCodeResponse> filterList(FilterOrderDetailCodeRequest detailCodeRequest);
 }

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

@@ -1,8 +1,20 @@
 package com.glxp.api.dao.inout;
 
 import com.glxp.api.dao.BaseMapperPlus;
-import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
+import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
+import com.glxp.api.res.inout.IoOrderDetailResultResponse;
+
+import java.util.List;
 
 public interface IoOrderDetailResultDao extends BaseMapperPlus<IoOrderDetailBizDao, IoOrderDetailResultEntity, IoOrderDetailResultEntity> {
+
+    /**
+     * 查询单据扫码明细VO列表
+     *
+     * @param orderDetailResultRequest
+     * @return
+     */
+    List<IoOrderDetailResultResponse> filterList(FilterOrderDetailResultRequest orderDetailResultRequest);
+
 }

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

@@ -6,7 +6,7 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class FilterIoCodeRequest extends ListPageRequest {
+public class FilterCodeRequest extends ListPageRequest {
 
     /**
      * 手持终端订单号

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

@@ -1,10 +0,0 @@
-package com.glxp.api.req.inout;
-
-import lombok.Data;
-
-@Data
-public class FilterOrderBizRequest {
-
-    private Long relId;
-    private String batchNo;
-}

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

@@ -0,0 +1,25 @@
+package com.glxp.api.req.inout;
+
+import lombok.Data;
+
+/**
+ * 单据业务详情查询参数
+ */
+@Data
+public class FilterOrderDetailBizRequest {
+
+    /**
+     * 耗材字典产品ID
+     */
+    private Long relId;
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+
+    /**
+     * 单据号
+     */
+    private String orderIdFk;
+}

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

@@ -0,0 +1,37 @@
+package com.glxp.api.req.inout;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+/**
+ * 单据扫码详情查询参数
+ */
+@Data
+public class FilterOrderDetailCodeRequest extends ListPageRequest {
+
+    /**
+     * 单据号
+     */
+    private String orderIdFk;
+
+    /**
+     * 耗材字典ID
+     */
+    private String relIdFk;
+
+    /**
+     * DI标识
+     */
+    private String nameCode;
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+
+    /**
+     * DI信息UUID外键
+     */
+    private String uuidFk;
+
+}

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

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

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

@@ -0,0 +1,31 @@
+package com.glxp.api.req.inout;
+
+import lombok.Data;
+
+/**
+ * 单据扫码明细查询参数
+ */
+@Data
+public class FilterOrderDetailResultRequest {
+
+    /**
+     * 单据号
+     */
+    private String orderIdFk;
+
+    /**
+     * 耗材字典ID
+     */
+    private String relIdFk;
+
+    /**
+     * DI标识
+     */
+    private String nameCode;
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+
+}

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

@@ -2,16 +2,13 @@ package com.glxp.api.res.inout;
 
 import lombok.Data;
 
-import java.io.Serializable;
 import java.util.Date;
 
 /**
  * 单据正式码表VO类
  */
 @Data
-public class IoCodeResponse implements Serializable {
+public class IoCodeResponse {
-
-    private static final long serialVersionUID = -3436984812709186027L;
 
     private Integer id;
 

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

@@ -2,9 +2,157 @@ package com.glxp.api.res.inout;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 单据业务详情VO
  */
 @Data
 public class IoOrderDetailBizResponse {
+
+    private Integer id;
+
+    /**
+     * 订单号外键
+     */
+    private String orderIdFk;
+
+    /**
+     * 耗材字典ID外键
+     */
+    private Long bindRlFk;
+
+    /**
+     * DI信息UUID外键
+     */
+    private String uuidFk;
+
+    /**
+     * DI
+     */
+    private String nameCode;
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+
+    /**
+     * 生产日期
+     */
+    private String productDate;
+
+    /**
+     * 失效日期
+     */
+    private String expireDate;
+
+    /**
+     * 产品通用名称
+     */
+    private String coName;
+
+    /**
+     * 注册证号
+     */
+    private String certCode;
+
+    /**
+     * 医疗器械注册备案证号
+     */
+    private String ylqxzcrbarmc;
+
+    /**
+     * 生产企业
+     */
+    private String manufacturer;
+
+    /**
+     * 计量单位
+     */
+    private String measname;
+
+    /**
+     * 规格型号
+     */
+    private String spec;
+
+    /**
+     * 价格
+     */
+    private BigDecimal price;
+
+    /**
+     * 销售清单号
+     */
+    private String secSalesListNo;
+
+    /**
+     * 发票第一票
+     */
+    private String firstSalesInvNo;
+
+    /**
+     * 发票第二票
+     */
+    private String secSalesInvNo;
+
+    /**
+     * 发票有效期
+     */
+    private String invoiceDate;
+
+    /**
+     * 供应商ID外键
+     */
+    private String supId;
+
+    /**
+     * 绑定供应商状态
+     */
+    private String bindSupStatus;
+
+    /**
+     * 单据数量
+     */
+    private Integer count;
+
+    /**
+     * 扫码数量
+     */
+    private Integer reCount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 扩展字段1
+     */
+    private String remark1;
+
+    /**
+     * 扩展字段2
+     */
+    private String remark2;
+
+    /**
+     * 扩展字段3
+     */
+    private String remark3;
+
+    /**
+     * 扩展字段4
+     */
+    private String remark4;
+
+    /**
+     * 扩展字段5
+     */
+    private String remark5;
+
+
+    private boolean checkSuccess;
+
 }

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

@@ -0,0 +1,158 @@
+package com.glxp.api.res.inout;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 单据详情VO
+ */
+@Data
+public class IoOrderDetailCodeResponse {
+
+    private Integer id;
+
+    /**
+     * 订单号外键
+     */
+    private String orderIdFk;
+
+    /**
+     * 耗材字典ID外键
+     */
+    private Long bindRlFk;
+
+    /**
+     * DI信息UUID外键
+     */
+    private String uuidFk;
+
+    /**
+     * DI
+     */
+    private String nameCode;
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+
+    /**
+     * 生产日期
+     */
+    private String productDate;
+
+    /**
+     * 失效日期
+     */
+    private String expireDate;
+
+    /**
+     * 产品通用名称
+     */
+    private String coName;
+
+    /**
+     * 注册证号
+     */
+    private String certCode;
+
+    /**
+     * 医疗器械注册备案证号
+     */
+    private String ylqxzcrbarmc;
+
+    /**
+     * 生产企业
+     */
+    private String manufacturer;
+
+    /**
+     * 计量单位
+     */
+    private String measname;
+
+    /**
+     * 规格型号
+     */
+    private String spec;
+
+    /**
+     * 价格
+     */
+    private BigDecimal price;
+
+    /**
+     * 销售清单号
+     */
+    private String secSalesListNo;
+
+    /**
+     * 发票第一票
+     */
+    private String firstSalesInvNo;
+
+    /**
+     * 发票第二票
+     */
+    private String secSalesInvNo;
+
+    /**
+     * 发票有效期
+     */
+    private String invoiceDate;
+
+    /**
+     * 供应商ID外键
+     */
+    private String supId;
+
+    /**
+     * 绑定供应商状态
+     */
+    private String bindSupStatus;
+
+    /**
+     * 单据数量
+     */
+    private Integer count;
+
+    /**
+     * 扫码数量
+     */
+    private Integer reCount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 扩展字段1
+     */
+    private String remark1;
+
+    /**
+     * 扩展字段2
+     */
+    private String remark2;
+
+    /**
+     * 扩展字段3
+     */
+    private String remark3;
+
+    /**
+     * 扩展字段4
+     */
+    private String remark4;
+
+    /**
+     * 扩展字段5
+     */
+    private String remark5;
+
+    private boolean checkSuccess;
+
+
+}

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

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

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

@@ -2,10 +2,154 @@ package com.glxp.api.res.inout;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 单据扫码明细VO
  */
 @Data
 public class IoOrderDetailResultResponse {
 
+    private Integer id;
+
+    /**
+     * 订单号外键
+     */
+    private String orderIdFk;
+
+    /**
+     * 耗材字典ID外键
+     */
+    private String bindRlFk;
+
+    /**
+     * DI信息UUID外键
+     */
+    private String uuidFk;
+
+    /**
+     * DI
+     */
+    private String nameCode;
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+
+    /**
+     * 生产日期
+     */
+    private String productDate;
+
+    /**
+     * 失效日期
+     */
+    private String expireDate;
+
+    /**
+     * 产品通用名称
+     */
+    private String coName;
+
+    /**
+     * 注册证号
+     */
+    private String certCode;
+
+    /**
+     * 医疗器械注册备案证号
+     */
+    private String ylqxzcrbarmc;
+
+    /**
+     * 生产企业
+     */
+    private String manufacturer;
+
+    /**
+     * 计量单位
+     */
+    private String measname;
+
+    /**
+     * 规格型号
+     */
+    private String spec;
+
+    /**
+     * 价格
+     */
+    private BigDecimal price;
+
+    /**
+     * 销售清单号
+     */
+    private String secSalesListNo;
+
+    /**
+     * 发票第一票
+     */
+    private String firstSalesInvNo;
+
+    /**
+     * 发票第二票
+     */
+    private String secSalesInvNo;
+
+    /**
+     * 发票有效期
+     */
+    private String invoiceDate;
+
+    /**
+     * 供应商ID外键
+     */
+    private String supId;
+
+    /**
+     * 绑定供应商状态
+     */
+    private String bindSupStatus;
+
+    /**
+     * 单据数量
+     */
+    private Integer count;
+
+    /**
+     * 扫码数量
+     */
+    private Integer reCount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 扩展字段1
+     */
+    private String remark1;
+
+    /**
+     * 扩展字段2
+     */
+    private String remark2;
+
+    /**
+     * 扩展字段3
+     */
+    private String remark3;
+
+    /**
+     * 扩展字段4
+     */
+    private String remark4;
+
+    /**
+     * 扩展字段5
+     */
+    private String remark5;
+
 }

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

@@ -2,7 +2,7 @@ package com.glxp.api.service.inout;
 
 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.req.inout.FilterCodeRequest;
 import com.glxp.api.res.inout.IoCodeResponse;
 
 import java.util.List;
@@ -22,15 +22,15 @@ public interface IoCodeService {
     /**
      * 查询正式码表实体数据
      *
-     * @param filterIoCodeRequest
+     * @param filterCodeRequest
      * @return
      */
-    List<IoCodeEntity> filterCodeList(FilterIoCodeRequest filterIoCodeRequest);
+    List<IoCodeEntity> filterCodeList(FilterCodeRequest filterCodeRequest);
 
     /**
      * 查询正式码表VO数据
      */
-    List<IoCodeResponse> filterList(FilterIoCodeRequest filterIoCodeRequest);
+    List<IoCodeResponse> filterList(FilterCodeRequest filterCodeRequest);
 
     /**
      * 根据单号删除正式码表数据

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

@@ -1,7 +1,7 @@
 package com.glxp.api.service.inout;
 
 import com.glxp.api.entity.inout.IoCodeTempEntity;
-import com.glxp.api.req.inout.FilterIoCodeRequest;
+import com.glxp.api.req.inout.FilterCodeRequest;
 import com.glxp.api.util.page.TableDataInfo;
 
 import java.util.List;
@@ -23,7 +23,7 @@ public interface IoCodeTempService {
 
     List<IoCodeTempEntity> findByOrderId(String billNo);
 
-    TableDataInfo<IoCodeTempEntity> findByOrderId(FilterIoCodeRequest filterIoCodeRequest);
+    TableDataInfo<IoCodeTempEntity> findByOrderId(FilterCodeRequest filterCodeRequest);
 
 
     int deleteByBillNo(String orderId);

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

@@ -1,6 +1,9 @@
 package com.glxp.api.service.inout;
 
+import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
+import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
+import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
 
 import java.util.List;
 
@@ -14,4 +17,19 @@ public interface IoOrderDetailCodeService {
 
     int deleteById(Integer id);
 
+    /**
+     * 查询单据扫码详情VO列表
+     *
+     * @param detailCodeRequest
+     * @return
+     */
+    List<IoOrderDetailCodeResponse> filterList(FilterOrderDetailCodeRequest detailCodeRequest);
+
+    /**
+     * 根据单据号删除单据扫码详情
+     *
+     * @param orderId
+     * @return
+     */
+    BaseResponse deleteByOrderId(String orderId);
 }

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

@@ -8,7 +8,7 @@ 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.IoCodeEntity;
-import com.glxp.api.req.inout.FilterIoCodeRequest;
+import com.glxp.api.req.inout.FilterCodeRequest;
 import com.glxp.api.res.inout.IoCodeResponse;
 import com.glxp.api.service.inout.IoCodeService;
 import org.springframework.stereotype.Service;
@@ -49,25 +49,25 @@ public class IoCodeServiceImpl implements IoCodeService {
     }
 
     @Override
-    public List<IoCodeEntity> filterCodeList(FilterIoCodeRequest filterIoCodeRequest) {
+    public List<IoCodeEntity> filterCodeList(FilterCodeRequest filterCodeRequest) {
-        if (null == filterIoCodeRequest) {
+        if (null == filterCodeRequest) {
             return Collections.emptyList();
         }
-        if (null != filterIoCodeRequest.getPage() && null != filterIoCodeRequest.getLimit()) {
+        if (null != filterCodeRequest.getPage() && null != filterCodeRequest.getLimit()) {
-            PageHelper.offsetPage((filterIoCodeRequest.getPage() - 1) * filterIoCodeRequest.getLimit(), filterIoCodeRequest.getLimit());
+            PageHelper.offsetPage((filterCodeRequest.getPage() - 1) * filterCodeRequest.getLimit(), filterCodeRequest.getLimit());
         }
-        return ioCodeDao.filterCodeList(filterIoCodeRequest);
+        return ioCodeDao.filterCodeList(filterCodeRequest);
     }
 
     @Override
-    public List<IoCodeResponse> filterList(FilterIoCodeRequest filterIoCodeRequest) {
+    public List<IoCodeResponse> filterList(FilterCodeRequest filterCodeRequest) {
-        if (null == filterIoCodeRequest) {
+        if (null == filterCodeRequest) {
             return Collections.emptyList();
         }
-        if (null != filterIoCodeRequest.getPage() && null != filterIoCodeRequest.getLimit()) {
+        if (null != filterCodeRequest.getPage() && null != filterCodeRequest.getLimit()) {
-            PageHelper.offsetPage((filterIoCodeRequest.getPage() - 1) * filterIoCodeRequest.getLimit(), filterIoCodeRequest.getLimit());
+            PageHelper.offsetPage((filterCodeRequest.getPage() - 1) * filterCodeRequest.getLimit(), filterCodeRequest.getLimit());
         }
-        return ioCodeDao.filterList(filterIoCodeRequest);
+        return ioCodeDao.filterList(filterCodeRequest);
     }
 
     @Override

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

@@ -3,7 +3,7 @@ package com.glxp.api.service.inout.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.glxp.api.dao.inout.IoCodeTempDao;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
-import com.glxp.api.req.inout.FilterIoCodeRequest;
+import com.glxp.api.req.inout.FilterCodeRequest;
 import com.glxp.api.service.inout.IoCodeTempService;
 import com.glxp.api.util.BeanCopyUtils;
 import com.glxp.api.util.page.PageQuery;
@@ -57,10 +57,10 @@ public class IoCodeTempServiceImpl implements IoCodeTempService {
     }
 
     @Override
-    public TableDataInfo<IoCodeTempEntity> findByOrderId(FilterIoCodeRequest filterIoCodeRequest) {
+    public TableDataInfo<IoCodeTempEntity> findByOrderId(FilterCodeRequest filterCodeRequest) {
         PageQuery pageQuery = new PageQuery();
-        BeanCopyUtils.copy(filterIoCodeRequest, pageQuery);
+        BeanCopyUtils.copy(filterCodeRequest, pageQuery);
-        Page<IoCodeTempEntity> page = ioCodeTempDao.selectPage(pageQuery.build(), new QueryWrapper<IoCodeTempEntity>().eq("orderId", filterIoCodeRequest.getOrderId()));
+        Page<IoCodeTempEntity> page = ioCodeTempDao.selectPage(pageQuery.build(), new QueryWrapper<IoCodeTempEntity>().eq("orderId", filterCodeRequest.getOrderId()));
         return TableDataInfo.build(page);
     }
 

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

@@ -1,13 +1,20 @@
 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.IoOrderDetailCodeDao;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
+import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
+import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
 import com.glxp.api.service.inout.IoOrderDetailCodeService;
-import com.glxp.api.service.inout.IoOrderDetailResultService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -35,4 +42,25 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
     public int deleteById(Integer id) {
         return ioOrderDetailCodeDao.deleteById(id);
     }
+
+    @Override
+    public List<IoOrderDetailCodeResponse> filterList(FilterOrderDetailCodeRequest detailCodeRequest) {
+        if (null == detailCodeRequest) {
+            return Collections.emptyList();
+        }
+        if (null != detailCodeRequest.getPage() && null != detailCodeRequest.getLimit()) {
+            PageHelper.offsetPage((detailCodeRequest.getPage() - 1) * detailCodeRequest.getLimit(), detailCodeRequest.getLimit());
+        }
+        return ioOrderDetailCodeDao.filterList(detailCodeRequest);
+    }
+
+    @Override
+    public BaseResponse deleteByOrderId(String orderId) {
+        if (StrUtil.isBlank(orderId)) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "单据号不能为空！");
+        }
+        ioOrderDetailCodeDao.delete(new QueryWrapper<IoOrderDetailCodeEntity>().eq("orderIdFk", orderId));
+        return ResultVOUtils.success("删除成功");
+    }
+
 }

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

@@ -2,7 +2,7 @@
 <!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">
+            parameterType="com.glxp.api.req.inout.FilterCodeRequest">
         select *
         from io_code
         <where>

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

@@ -0,0 +1,19 @@
+<?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.IoOrderDetailBizDao">
+
+<select id="filterList" resultType="com.glxp.api.res.inout.IoOrderDetailBizResponse">
+    select * from io_order_detail_biz
+    <where>
+        <if test="orderIdFk != null and orderIdFk != ''">
+            AND orderIdFk = #{orderIdFk}
+        </if>
+        <if test="relId != null">
+            AND bindRlFk = #{relId}
+        </if>
+        <if test="batchNo != null and batchNo != ''">
+            AND batchNo = #{batchNo}
+        </if>
+    </where>
+    </select>
+</mapper>

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

@@ -0,0 +1,25 @@
+<?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.IoOrderDetailCodeDao">
+
+<select id="filterList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse">
+        select * from io_order_detail_code
+        <where>
+            <if test="orderIdFk != null and orderIdFk != ''">
+                AND orderIdFk = #{orderIdFk}
+            </if>
+            <if test="relIdFk != null and relIdFk != ''">
+                AND bindRlFk = #{relIdFk}
+            </if>
+            <if test="nameCode != null and nameCode != ''">
+                AND nameCode = #{nameCode}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND batchNo = #{batchNo}
+            </if>
+            <if test="uuidFk != null and uuidFk != ''">
+                AND uuidFk = #{uuidFk}
+            </if>
+        </where>
+    </select>
+</mapper>

src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.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.inout.IoOrderDetailResultDao">
+
+<select id="filterList" resultType="com.glxp.api.res.inout.IoOrderDetailResultResponse">
+    select * from io_order_detail_result
+    <where>
+        <if test="orderIdFk != null and orderIdFk != ''">
+            AND orderIdFk = #{orderIdFk}
+        </if>
+        <if test="nameCode != null and nameCode != ''">
+            AND nameCode = #{nameCode}
+        </if>
+        <if test="batchNo != null and batchNo != ''">
+            AND batchNo = #{batchNo}
+        </if>
+        <if test="relIdFk != null and relIdFk != ''">
+            AND bindRlFk = #{relIdFk}
+        </if>
+    </where>
+    </select>
+</mapper>