Merge branch 'dev' into dev_WMS20260401

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/TmsOrderAccount.java

@@ -0,0 +1,107 @@
+package com.mhd.common.core.domain.dto.wlhy;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mhd.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author: brb
+ * @description:
+ * @create: 2026-04-15 11:04
+ */
+@Data
+public class TmsOrderAccount implements Serializable {
+    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 = "创建日期")
+
+    @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 = "更新日期")
+
+    @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 = "无税费用")
+    private BigDecimal taxFreeFee;
+    @ApiModelProperty(value = "税额")
+    private BigDecimal taxAmount;
+    @ApiModelProperty(value = "收款帐户")
+    private String receiveAccount;
+}

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/TmsOrderAddDTO.java

@@ -228,6 +228,11 @@ TmsOrderAddDTO implements Serializable {
     @ApiModelProperty(value = "货物数量单位")
     private String goodsQuantityUnit;
 
+    @ApiModelProperty("收款账户")
+    private String accountName;
+    @ApiModelProperty("收款账户信息")
+    private String accountInformation;
+
 //    @ApiModelProperty("项目表ID")
 //    private Long projectManagementId;
 
@@ -286,6 +291,9 @@ TmsOrderAddDTO implements Serializable {
     @ApiModelProperty(value = "卸货地址集合")
     private List<TmsAddressMultiDTO> unloadAddressList;
 
+    @ApiModelProperty("费用科目明细")
+    private List<TmsOrderAccount> tmsOrderAccountList;
+