费用科目按是否出入库显示查询及费用表;

mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml

@@ -223,6 +223,12 @@
         <if test="expenseAccountDO.fixedOrderDisplay != null ">
             and a.fixed_order_display = #{expenseAccountDO.fixedOrderDisplay}
         </if>
+        <if test="expenseAccountDO.inOrderDisplay != null ">
+            and a.in_order_display = #{expenseAccountDO.inOrderDisplay}
+        </if>
+        <if test="expenseAccountDO.outOrderDisplay != null ">
+            and a.out_order_display = #{expenseAccountDO.outOrderDisplay}
+        </if>
     </sql>
     <select id="selectExpenseAccount" parameterType="com.mhd.basic.domain.expenseAccount.repository.todo.SearchExpenseAccountDO" resultType="com.mhd.basic.domain.expenseAccount.repository.po.QueryExpenseAccountPO">
         select
@@ -288,4 +294,4 @@
             and a.del_flag=1
             order by show_seq
         </select>
-</mapper>
+</mapper>

mhd_wms/src/main/java/com/mhd/wms/domain/receiptOrderAccount/entity/ReceiptOrderAccount.java

@@ -0,0 +1,99 @@
+package com.mhd.wms.domain.receiptOrderAccount.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mhd.common.core.annotation.Excel;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+@Data
+public class ReceiptOrderAccount extends BaseVOEntity {
+        private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ID_WORKER_STR)
+    private String id;
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    @Excel(name = "创建人", width = 15)
+    private String createBy;
+    /**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    @Excel(name = "创建日期", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    @Excel(name = "更新人", width = 15)
+    private String updateBy;
+    /**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    @Excel(name = "更新日期", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    @Excel(name = "所属部门", width = 15)
+    private String sysOrgCode;
+    /**删除标识*/
+    @ApiModelProperty(value = "删除标识")
+    @Excel(name = "删除标识", width = 15)
+    private Integer isDelete;
+    /**所属组织*/
+    @ApiModelProperty(value = "所属组织")
+    @Excel(name = "所属组织", width = 15)
+    private String orgName;
+    /**组织ID*/
+    @ApiModelProperty(value = "组织ID")
+    @Excel(name = "组织ID", width = 15)
+    private Long organizationId;
+    /**一级组织ID*/
+    @ApiModelProperty(value = "一级组织ID")
+    @Excel(name = "一级组织ID", width = 15)
+    private Long topOrganizationId;
+    /**组织名称*/
+    @ApiModelProperty(value = "组织名称")
+    @Excel(name = "组织名称", width = 15)
+    private String organizationName;
+    /**订单id*/
+    @ApiModelProperty(value = "订单id")
+    @Excel(name = "订单id", width = 15)
+    private String orderId;
+    /**科目id*/
+    @ApiModelProperty(value = "科目id")
+    @Excel(name = "科目id", width = 15)
+    private Long accountId;
+    /**科目收支类型（1-应收，2-应付*/
+    @ApiModelProperty(value = "科目收支类型（1-应收，2-应付")
+    @Excel(name = "科目收支类型（1-应收，2-应付", width = 15)
+    private Long accountType;
+    /**科目编码*/
+    @ApiModelProperty(value = "科目编码")
+    @Excel(name = "科目编码", width = 15)
+    private String subjectCode;
+    /**科目名称*/
+    @ApiModelProperty(value = "科目名称")
+    @Excel(name = "科目名称", width = 15)
+    private String subjectName;
+    /**科目费率*/
+    @ApiModelProperty(value = "科目费率")
+    @Excel(name = "科目费率", width = 15)
+    private BigDecimal rate;
+
+    /**金额*/
+    @ApiModelProperty(value = "金额")
+    @Excel(name = "金额", width = 15)
+    private BigDecimal amount;
+    @ApiModelProperty(value = "金额")
+    @Excel(name = "金额", width = 15)
+    private BigDecimal settlementAmount;
+}

mhd_wms/src/main/java/com/mhd/wms/domain/receiptOrderAccount/repository/facade/IReceiptOrderAccountService.java

@@ -0,0 +1,9 @@
+package com.mhd.wms.domain.receiptOrderAccount.repository.facade;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mhd.wms.domain.receiptOrderAccount.entity.ReceiptOrderAccount;
+
+public interface IReceiptOrderAccountService extends IService<ReceiptOrderAccount>
+{
+
+}

mhd_wms/src/main/java/com/mhd/wms/domain/receiptOrderAccount/repository/mapper/ReceiptOrderAccountMapper.java

@@ -0,0 +1,8 @@
+package com.mhd.wms.domain.receiptOrderAccount.repository.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mhd.wms.domain.receiptOrderAccount.entity.ReceiptOrderAccount;
+
+public interface ReceiptOrderAccountMapper  extends BaseMapper<ReceiptOrderAccount>
+{
+}

mhd_wms/src/main/java/com/mhd/wms/domain/receiptOrderAccount/repository/persistence/ReceiptOrderAccountServiceImpl.java

@@ -0,0 +1,9 @@
+package com.mhd.wms.domain.receiptOrderAccount.repository.persistence;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mhd.wms.domain.receiptOrderAccount.entity.ReceiptOrderAccount;
+import com.mhd.wms.domain.receiptOrderAccount.repository.facade.IReceiptOrderAccountService;
+import com.mhd.wms.domain.receiptOrderAccount.repository.mapper.ReceiptOrderAccountMapper;
+
+public class ReceiptOrderAccountServiceImpl extends ServiceImpl<ReceiptOrderAccountMapper, ReceiptOrderAccount> implements IReceiptOrderAccountService {
+}

mhd_wms/src/main/resources/mapper/receiptOrderAccount/ReceiptOrderAccountMapper.xml

@@ -0,0 +1,7 @@
+<?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.mhd.wms.domain.receiptOrderAccount.repository.mapper.ReceiptOrderAccountMapper">
+
+</mapper>