diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml
index 88cf0987e..2cb7e8fc9 100644
--- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml
+++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml
@@ -223,6 +223,12 @@
and a.fixed_order_display = #{expenseAccountDO.fixedOrderDisplay}
+
+ and a.in_order_display = #{expenseAccountDO.inOrderDisplay}
+
+
+ and a.out_order_display = #{expenseAccountDO.outOrderDisplay}
+
-
+
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptOrderAccount/entity/ReceiptOrderAccount.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptOrderAccount/entity/ReceiptOrderAccount.java
new file mode 100644
index 000000000..98a521ef6
--- /dev/null
+++ b/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;
+}
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptOrderAccount/repository/facade/IReceiptOrderAccountService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptOrderAccount/repository/facade/IReceiptOrderAccountService.java
new file mode 100644
index 000000000..85e18aa44
--- /dev/null
+++ b/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
+{
+
+}
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptOrderAccount/repository/mapper/ReceiptOrderAccountMapper.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptOrderAccount/repository/mapper/ReceiptOrderAccountMapper.java
new file mode 100644
index 000000000..5a7cddde1
--- /dev/null
+++ b/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
+{
+}
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptOrderAccount/repository/persistence/ReceiptOrderAccountServiceImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptOrderAccount/repository/persistence/ReceiptOrderAccountServiceImpl.java
new file mode 100644
index 000000000..e797143f1
--- /dev/null
+++ b/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 implements IReceiptOrderAccountService {
+}
\ No newline at end of file
diff --git a/mhd_wms/src/main/resources/mapper/receiptOrderAccount/ReceiptOrderAccountMapper.xml b/mhd_wms/src/main/resources/mapper/receiptOrderAccount/ReceiptOrderAccountMapper.xml
new file mode 100644
index 000000000..e72dab535
--- /dev/null
+++ b/mhd_wms/src/main/resources/mapper/receiptOrderAccount/ReceiptOrderAccountMapper.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
\ No newline at end of file