2024年5月8日17:17:58

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/release/entity/SeaReleaseBill.java

@@ -16,15 +16,16 @@
  */
 package org.springblade.los.business.release.entity;
 
-import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 业务-海运放单实体类
@@ -40,380 +41,398 @@ public class SeaReleaseBill implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	* 主键
-	*/
-		@ApiModelProperty(value = "主键")
-		private Long id;
-	/**
-	* 分公司 Id
-	*/
-		@ApiModelProperty(value = "分公司 Id")
-		private String branchId;
-	/**
-	* 创建人 Id
-	*/
-		@ApiModelProperty(value = "创建人 Id")
-		private Long createUser;
-	/**
-	* 创建人
-	*/
-		@ApiModelProperty(value = "创建人")
-		private String createUserName;
-	/**
-	* 创建部门 Id
-	*/
-		@ApiModelProperty(value = "创建部门 Id")
-		private String createDept;
-	/**
-	* 创建部门
-	*/
-		@ApiModelProperty(value = "创建部门")
-		private String createDeptName;
-	/**
-	* 创建时间
-	*/
-		@ApiModelProperty(value = "创建时间")
-		private Date createTime;
-	/**
-	* 修改人 Id
-	*/
-		@ApiModelProperty(value = "修改人 Id")
-		private Long updateUser;
-	/**
-	* 修改人
-	*/
-		@ApiModelProperty(value = "修改人")
-		private String updateUserName;
-	/**
-	* 修改时间
-	*/
-		@ApiModelProperty(value = "修改时间")
-		private Date updateTime;
-	/**
-	* 单据类型，A=申请放单, D=调度， R=放单
-	*/
-		@ApiModelProperty(value = "单据类型，A=申请放单, D=调度， R=放单")
-		private String billType;
-	/**
-	* 业务类型, SE=海运出口 SI=海运进口
-	*/
-		@ApiModelProperty(value = "业务类型, SE=海运出口 SI=海运进口")
-		private String businessType;
-	/**
-	* 工作类型,RELEASE=放单
-	*/
-		@ApiModelProperty(value = "工作类型,RELEASE=放单")
-		private String workType;
-	/**
-	* 单据编号
-	*/
-		@ApiModelProperty(value = "单据编号")
-		private String billNo;
-	/**
-	* 单据日期
-	*/
-		@ApiModelProperty(value = "单据日期")
-		private Date billDate;
-	/**
-	* 操作 Id
-	*/
-		@ApiModelProperty(value = "操作 Id")
-		private Long operatorId;
-	/**
-	* 操作
-	*/
-		@ApiModelProperty(value = "操作")
-		private String operatorName;
-	/**
-	* 放单类型,0=自取,1=送单,2=寄送
-	*/
-		@ApiModelProperty(value = "放单类型,0=自取,1=送单,2=寄送")
-		private Integer releaseType;
-	/**
-	* 放单时间，yyyyMMdd HH:mm
-	*/
-		@ApiModelProperty(value = "放单时间，yyyyMMdd HH:mm")
-		private Date releaseTime;
-	/**
-	* 客户 id
-	*/
-		@ApiModelProperty(value = "客户 id")
-		private Long corpId;
-	/**
-	* 客户中文名称
-	*/
-		@ApiModelProperty(value = "客户中文名称")
-		private String corpCnName;
-	/**
-	* 客户英文名称
-	*/
-		@ApiModelProperty(value = "客户英文名称")
-		private String corpEnName;
-	/**
-	* 是否 VIP 客户，0=否，1=是，输入客户时，从 los_b_corps 表获取，或 lookup?
-	*/
-		@ApiModelProperty(value = "是否 VIP 客户，0=否，1=是，输入客户时，从 los_b_corps 表获取，或 lookup?")
-		private Integer vip;
-	/**
-	* VIP 等级，输入客户时，从 los_b_corps 表获取，或 lookup?
-	*/
-		@ApiModelProperty(value = "VIP 等级，输入客户时，从 los_b_corps 表获取，或 lookup?")
-		private Integer vipLevel;
-	/**
-	* 是否已签约，0=否，1=是，输入客户时，从 los_b_corps 表获取，或 lookup?
-	*/
-		@ApiModelProperty(value = "是否已签约，0=否，1=是，输入客户时，从 los_b_corps 表获取，或 lookup?")
-		private Integer isSigned;
-	/**
-	* 协议编号,从 los_bs_agreement_price 表取得？
-	*/
-		@ApiModelProperty(value = "协议编号,从 los_bs_agreement_price 表取得？")
-		private String agreementNo;
-	/**
-	* 协议生效日期，从 los_bs_agreement_price 表取得？
-	*/
-		@ApiModelProperty(value = "协议生效日期，从 los_bs_agreement_price 表取得？")
-		private Date effectiveDate;
-	/**
-	* 协议失效日期，从 los_bs_agreement_price 表取得？
-	*/
-		@ApiModelProperty(value = "协议失效日期，从 los_bs_agreement_price 表取得？")
-		private Date expiringDate;
-	/**
-	* 船公司 id
-	*/
-		@ApiModelProperty(value = "船公司 id")
-		private Long carrierId;
-	/**
-	* 船公司中文名称
-	*/
-		@ApiModelProperty(value = "船公司中文名称")
-		private String carrierCnName;
-	/**
-	* 船公司英文名称
-	*/
-		@ApiModelProperty(value = "船公司英文名称")
-		private String carrierEnName;
-	/**
-	* 船公司约号
-	*/
-		@ApiModelProperty(value = "船公司约号")
-		private String carrierArgreementNo;
-	/**
-	* 订舱号
-	*/
-		@ApiModelProperty(value = "订舱号")
-		private String bookingNo;
-	/**
-	* 船名 id
-	*/
-		@ApiModelProperty(value = "船名 id")
-		private Long vesselId;
-	/**
-	* 中文船名
-	*/
-		@ApiModelProperty(value = "中文船名")
-		private String vesselCnName;
-	/**
-	* 英文船名
-	*/
-		@ApiModelProperty(value = "英文船名")
-		private String vesselEnName;
-	/**
-	* 航次
-	*/
-		@ApiModelProperty(value = "航次")
-		private String voyageNo;
-	/**
-	* MB/L NO
-	*/
-		@ApiModelProperty(value = "MB/L NO")
-		private String mblno;
-	/**
-	* HB/L NO
-	*/
-		@ApiModelProperty(value = "HB/L NO")
-		private String hblno;
-	/**
-	* 开始日期,SE=海运出口时取 ETD, SI=海运进口 时取 ETA
-	*/
-		@ApiModelProperty(value = "开始日期,SE=海运出口时取 ETD, SI=海运进口 时取 ETA")
-		private Date dateFrom;
-	/**
-	* 结束日期,SE=海运出口时取 ETD, SI=海运进口 时取 ETA
-	*/
-		@ApiModelProperty(value = "结束日期,SE=海运出口时取 ETD, SI=海运进口 时取 ETA")
-		private Date dateTo;
-	/**
-	* 装货港 id
-	*/
-		@ApiModelProperty(value = "装货港 id")
-		private Long polId;
-	/**
-	* 装货港代码
-	*/
-		@ApiModelProperty(value = "装货港代码")
-		private String polCode;
-	/**
-	* 装货港英文名称
-	*/
-		@ApiModelProperty(value = "装货港英文名称")
-		private String polCnName;
-	/**
-	* 装货港英文名称
-	*/
-		@ApiModelProperty(value = "装货港英文名称")
-		private String polEnName;
-	/**
-	* 跑单员 Id
-	*/
-		@ApiModelProperty(value = "跑单员 Id")
-		private Long runnerId;
-	/**
-	* 跑单员姓名
-	*/
-		@ApiModelProperty(value = "跑单员姓名")
-		private String runnerName;
-	/**
-	* 是否换签（0 否 1是）
-	*/
-		@ApiModelProperty(value = "是否换签（0 否 1是）")
-		private Integer isSwtich;
-	/**
-	* 提交时间,yyyy-MM-dd HH:mm
-	*/
-		@ApiModelProperty(value = "提交时间,yyyy-MM-dd HH:mm")
-		private Date applyTime;
-	/**
-	* 要求时间,yyyy-MM-dd HH:mm
-	*/
-		@ApiModelProperty(value = "要求时间,yyyy-MM-dd HH:mm")
-		private Date requireTime;
-	/**
-	* 结算方式（0 票结 1月结）
-	*/
-		@ApiModelProperty(value = "结算方式（0 票结 1月结）")
-		private Integer stlMode;
-	/**
-	* 人民币协议金额，关联 los_bs_agreement_price
-	*/
-		@ApiModelProperty(value = "人民币协议金额，关联 los_bs_agreement_price")
-		private BigDecimal amountCny;
-	/**
-	* 美元协议金额，关联 los_bs_agreement_price
-	*/
-		@ApiModelProperty(value = "美元协议金额，关联 los_bs_agreement_price")
-		private BigDecimal amountUsd;
-	/**
-	* 限额合计人民币，美元协议金额 * 汇率 + 人民币协议金额
-	*/
-		@ApiModelProperty(value = "限额合计人民币，美元协议金额 * 汇率 + 人民币协议金额")
-		private BigDecimal amountTotal;
-	/**
-	* 人民币未收金额合计
-	*/
-		@ApiModelProperty(value = "人民币未收金额合计")
-		private BigDecimal unstlDrCny;
-	/**
-	* 美元未收金额合计
-	*/
-		@ApiModelProperty(value = "美元未收金额合计")
-		private BigDecimal unstlDrUsd;
-	/**
-	* 未收合计人民币合计，美元未收金额 * 汇率 + 人民币未收金额
-	*/
-		@ApiModelProperty(value = "未收合计人民币合计，美元未收金额 * 汇率 + 人民币未收金额")
-		private BigDecimal unstlDrTotal;
-	/**
-	* 款是否已到账（0 否 1是）
-	*/
-		@ApiModelProperty(value = "款是否已到账（0 否 1是）")
-		private Integer isAmountReceived;
-	/**
-	* 单票限额，RMB
-	*/
-		@ApiModelProperty(value = "单票限额，RMB")
-		private BigDecimal limitAmountPerBill;
-	/**
-	* 合计明细表的 over_amount_dr
-	*/
-		@ApiModelProperty(value = "合计明细表的 over_amount_dr")
-		private BigDecimal overAmountDr;
-	/**
-	* 单票超限额业务列表
-	*/
-		@ApiModelProperty(value = "单票超限额业务列表")
-		private String overLimitBills;
-	/**
-	* 是否只提本部门（0 否 1是）
-	*/
-		@ApiModelProperty(value = "是否只提本部门（0 否 1是）")
-		private Integer isSelfDeptOnly;
-	/**
-	* 后续有货提单号
-	*/
-		@ApiModelProperty(value = "后续有货提单号")
-		private String unreleaseBills;
-	/**
-	* 操作提交票数，根据明细 item_status=0 合计
-	*/
-		@ApiModelProperty(value = "操作提交票数，根据明细 item_status=0 合计")
-		private Integer billsCountOfNew;
-	/**
-	* 操作提交票数，根据明细 item_status=1 合计
-	*/
-		@ApiModelProperty(value = "操作提交票数，根据明细 item_status=1 合计")
-		private Integer billsCountOfApply;
-	/**
-	* 跑单中票数，根据明细 item_status=2 合计
-	*/
-		@ApiModelProperty(value = "跑单中票数，根据明细 item_status=2 合计")
-		private Integer billsCountOfRunner;
-	/**
-	* 操作确认票数，根据明细 item_status=3 合计
-	*/
-		@ApiModelProperty(value = "操作确认票数，根据明细 item_status=3 合计")
-		private Integer billsCountOfConfirm;
-	/**
-	* 调度确认票数，根据明细 item_status=4 合计
-	*/
-		@ApiModelProperty(value = "调度确认票数，根据明细 item_status=4 合计")
-		private Integer billsCountOfDispatch;
-	/**
-	* 放单票数，根据明细 item_status=5 合计
-	*/
-		@ApiModelProperty(value = "放单票数，根据明细 item_status=5 合计")
-		private Integer billsCountOfRelease;
-	/**
-	* 退回票数，根据明细 item_status=6 合计
-	*/
-		@ApiModelProperty(value = "退回票数，根据明细 item_status=6 合计")
-		private Integer billsCountOfReturn;
-	/**
-	* 版本
-	*/
-		@ApiModelProperty(value = "版本")
-		private String version;
-	/**
-	* 状态（0 正常 1停用）
-	*/
-		@ApiModelProperty(value = "状态（0 正常 1停用）")
-		private Integer status;
-	/**
-	* 是否已删除（0 否 1是）
-	*/
-		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-		private Integer isDeleted;
-	/**
-	* 备注
-	*/
-		@ApiModelProperty(value = "备注")
-		private String remarks;
+	 * 主键
+	 */
+	@ApiModelProperty(value = "主键")
+	private Long id;
+	/**
+	 * 分公司 Id
+	 */
+	@ApiModelProperty(value = "分公司 Id")
+	private String branchId;
+	/**
+	 * 创建人 Id
+	 */
+	@ApiModelProperty(value = "创建人 Id")
+	private Long createUser;
+	/**
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private String createUserName;
+	/**
+	 * 创建部门 Id
+	 */
+	@ApiModelProperty(value = "创建部门 Id")
+	private String createDept;
+	/**
+	 * 创建部门
+	 */
+	@ApiModelProperty(value = "创建部门")
+	private String createDeptName;
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 * 修改人 Id
+	 */
+	@ApiModelProperty(value = "修改人 Id")
+	private Long updateUser;
+	/**
+	 * 修改人
+	 */
+	@ApiModelProperty(value = "修改人")
+	private String updateUserName;
+	/**
+	 * 修改时间
+	 */
+	@ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+	/**
+	 * 单据类型，A=申请放单, D=调度， R=放单
+	 */
+	@ApiModelProperty(value = "单据类型，A=申请放单, D=调度， R=放单")
+	private String billType;
+	/**
+	 * 业务类型, SE=海运出口 SI=海运进口
+	 */
+	@ApiModelProperty(value = "业务类型, SE=海运出口 SI=海运进口")
+	private String businessType;
+	/**
+	 * 工作类型,RELEASE=放单
+	 */
+	@ApiModelProperty(value = "工作类型,RELEASE=放单")
+	private String workType;
+	/**
+	 * 单据编号
+	 */
+	@ApiModelProperty(value = "单据编号")
+	private String billNo;
+	/**
+	 * 单据日期
+	 */
+	@ApiModelProperty(value = "单据日期")
+	private Date billDate;
+	/**
+	 * 操作 Id
+	 */
+	@ApiModelProperty(value = "操作 Id")
+	private Long operatorId;
+	/**
+	 * 操作
+	 */
+	@ApiModelProperty(value = "操作")
+	private String operatorName;
+	/**
+	 * 放单类型,0=自取,1=送单,2=寄送
+	 */
+	@ApiModelProperty(value = "放单类型,0=自取,1=送单,2=寄送")
+	private Integer releaseType;
+	/**
+	 * 放单时间，yyyyMMdd HH:mm
+	 */
+	@ApiModelProperty(value = "放单时间，yyyyMMdd HH:mm")
+	private Date releaseTime;
+	/**
+	 * 客户 id
+	 */
+	@ApiModelProperty(value = "客户 id")
+	private Long corpId;
+	/**
+	 * 客户中文名称
+	 */
+	@ApiModelProperty(value = "客户中文名称")
+	private String corpCnName;
+	/**
+	 * 客户英文名称
+	 */
+	@ApiModelProperty(value = "客户英文名称")
+	private String corpEnName;
+	/**
+	 * 是否 VIP 客户，0=否，1=是，输入客户时，从 los_b_corps 表获取，或 lookup?
+	 */
+	@ApiModelProperty(value = "是否 VIP 客户，0=否，1=是，输入客户时，从 los_b_corps 表获取，或 lookup?")
+	private Integer vip;
+	/**
+	 * VIP 等级，输入客户时，从 los_b_corps 表获取，或 lookup?
+	 */
+	@ApiModelProperty(value = "VIP 等级，输入客户时，从 los_b_corps 表获取，或 lookup?")
+	private Integer vipLevel;
+	/**
+	 * 是否已签约，0=否，1=是，输入客户时，从 los_b_corps 表获取，或 lookup?
+	 */
+	@ApiModelProperty(value = "是否已签约，0=否，1=是，输入客户时，从 los_b_corps 表获取，或 lookup?")
+	private Integer isSigned;
+	/**
+	 * 协议编号,从 los_bs_agreement_price 表取得？
+	 */
+	@ApiModelProperty(value = "协议编号,从 los_bs_agreement_price 表取得？")
+	private String agreementNo;
+	/**
+	 * 协议生效日期，从 los_bs_agreement_price 表取得？
+	 */
+	@ApiModelProperty(value = "协议生效日期，从 los_bs_agreement_price 表取得？")
+	private Date effectiveDate;
+	/**
+	 * 协议失效日期，从 los_bs_agreement_price 表取得？
+	 */
+	@ApiModelProperty(value = "协议失效日期，从 los_bs_agreement_price 表取得？")
+	private Date expiringDate;
+	/**
+	 * 船公司 id
+	 */
+	@ApiModelProperty(value = "船公司 id")
+	private Long carrierId;
+	/**
+	 * 船公司中文名称
+	 */
+	@ApiModelProperty(value = "船公司中文名称")
+	private String carrierCnName;
+	/**
+	 * 船公司英文名称
+	 */
+	@ApiModelProperty(value = "船公司英文名称")
+	private String carrierEnName;
+	/**
+	 * 船公司约号
+	 */
+	@ApiModelProperty(value = "船公司约号")
+	private String carrierArgreementNo;
+	/**
+	 * 订舱号
+	 */
+	@ApiModelProperty(value = "订舱号")
+	private String bookingNo;
+	/**
+	 * 船名 id
+	 */
+	@ApiModelProperty(value = "船名 id")
+	private Long vesselId;
+	/**
+	 * 中文船名
+	 */
+	@ApiModelProperty(value = "中文船名")
+	private String vesselCnName;
+	/**
+	 * 英文船名
+	 */
+	@ApiModelProperty(value = "英文船名")
+	private String vesselEnName;
+	/**
+	 * 航次
+	 */
+	@ApiModelProperty(value = "航次")
+	private String voyageNo;
+	/**
+	 * MB/L NO
+	 */
+	@ApiModelProperty(value = "MB/L NO")
+	private String mblno;
+	/**
+	 * HB/L NO
+	 */
+	@ApiModelProperty(value = "HB/L NO")
+	private String hblno;
+	/**
+	 * 开始日期,SE=海运出口时取 ETD, SI=海运进口 时取 ETA
+	 */
+	@ApiModelProperty(value = "开始日期,SE=海运出口时取 ETD, SI=海运进口 时取 ETA")
+	private Date dateFrom;
+	/**
+	 * 结束日期,SE=海运出口时取 ETD, SI=海运进口 时取 ETA
+	 */
+	@ApiModelProperty(value = "结束日期,SE=海运出口时取 ETD, SI=海运进口 时取 ETA")
+	private Date dateTo;
+	/**
+	 * 装货港 id
+	 */
+	@ApiModelProperty(value = "装货港 id")
+	private Long polId;
+	/**
+	 * 装货港代码
+	 */
+	@ApiModelProperty(value = "装货港代码")
+	private String polCode;
+	/**
+	 * 装货港英文名称
+	 */
+	@ApiModelProperty(value = "装货港英文名称")
+	private String polCnName;
+	/**
+	 * 装货港英文名称
+	 */
+	@ApiModelProperty(value = "装货港英文名称")
+	private String polEnName;
+	/**
+	 * 跑单员 Id
+	 */
+	@ApiModelProperty(value = "跑单员 Id")
+	private Long runnerId;
+	/**
+	 * 跑单员姓名
+	 */
+	@ApiModelProperty(value = "跑单员姓名")
+	private String runnerName;
+	/**
+	 * 是否换签（0 否 1是）
+	 */
+	@ApiModelProperty(value = "是否换签（0 否 1是）")
+	private Integer isSwtich;
+	/**
+	 * 提交时间,yyyy-MM-dd HH:mm
+	 */
+	@ApiModelProperty(value = "提交时间,yyyy-MM-dd HH:mm")
+	private Date applyTime;
+	/**
+	 * 要求时间,yyyy-MM-dd HH:mm
+	 */
+	@ApiModelProperty(value = "要求时间,yyyy-MM-dd HH:mm")
+	private Date requireTime;
+	/**
+	 * 结算方式（0 票结 1月结）
+	 */
+	@ApiModelProperty(value = "结算方式（0 票结 1月结）")
+	private Integer stlMode;
+	/**
+	 * 人民币协议金额，关联 los_bs_agreement_price
+	 */
+	@ApiModelProperty(value = "人民币协议金额，关联 los_bs_agreement_price")
+	private BigDecimal amountCny;
+	/**
+	 * 美元协议金额，关联 los_bs_agreement_price
+	 */
+	@ApiModelProperty(value = "美元协议金额，关联 los_bs_agreement_price")
+	private BigDecimal amountUsd;
+	/**
+	 * 限额合计人民币，美元协议金额 * 汇率 + 人民币协议金额
+	 */
+	@ApiModelProperty(value = "限额合计人民币，美元协议金额 * 汇率 + 人民币协议金额")
+	private BigDecimal amountTotal;
+	/**
+	 * 人民币未收金额合计
+	 */
+	@ApiModelProperty(value = "人民币未收金额合计")
+	private BigDecimal unstlDrCny;
+	/**
+	 * 美元未收金额合计
+	 */
+	@ApiModelProperty(value = "美元未收金额合计")
+	private BigDecimal unstlDrUsd;
+	/**
+	 * 未收合计人民币合计，美元未收金额 * 汇率 + 人民币未收金额
+	 */
+	@ApiModelProperty(value = "未收合计人民币合计，美元未收金额 * 汇率 + 人民币未收金额")
+	private BigDecimal unstlDrTotal;
+	/**
+	 * 款是否已到账（0 否 1是）
+	 */
+	@ApiModelProperty(value = "款是否已到账（0 否 1是）")
+	private Integer isAmountReceived;
+	/**
+	 * 单票限额，RMB
+	 */
+	@ApiModelProperty(value = "单票限额，RMB")
+	private BigDecimal limitAmountPerBill;
+	/**
+	 * 合计明细表的 over_amount_dr
+	 */
+	@ApiModelProperty(value = "合计明细表的 over_amount_dr")
+	private BigDecimal overAmountDr;
+	/**
+	 * 单票超限额业务列表
+	 */
+	@ApiModelProperty(value = "单票超限额业务列表")
+	private String overLimitBills;
+	/**
+	 * 是否只提本部门（0 否 1是）
+	 */
+	@ApiModelProperty(value = "是否只提本部门（0 否 1是）")
+	private Integer isSelfDeptOnly;
+	/**
+	 * 后续有货提单号
+	 */
+	@ApiModelProperty(value = "后续有货提单号")
+	private String unreleaseBills;
+	/**
+	 * 操作提交票数，根据明细 item_status=0 合计
+	 */
+	@ApiModelProperty(value = "操作提交票数，根据明细 item_status=0 合计")
+	private Integer billsCountOfNew;
+	/**
+	 * 操作提交票数，根据明细 item_status=1 合计
+	 */
+	@ApiModelProperty(value = "操作提交票数，根据明细 item_status=1 合计")
+	private Integer billsCountOfApply;
+	/**
+	 * 跑单中票数，根据明细 item_status=2 合计
+	 */
+	@ApiModelProperty(value = "跑单中票数，根据明细 item_status=2 合计")
+	private Integer billsCountOfRunner;
+	/**
+	 * 操作确认票数，根据明细 item_status=3 合计
+	 */
+	@ApiModelProperty(value = "操作确认票数，根据明细 item_status=3 合计")
+	private Integer billsCountOfConfirm;
+	/**
+	 * 调度确认票数，根据明细 item_status=4 合计
+	 */
+	@ApiModelProperty(value = "调度确认票数，根据明细 item_status=4 合计")
+	private Integer billsCountOfDispatch;
+	/**
+	 * 放单票数，根据明细 item_status=5 合计
+	 */
+	@ApiModelProperty(value = "放单票数，根据明细 item_status=5 合计")
+	private Integer billsCountOfRelease;
+	/**
+	 * 退回票数，根据明细 item_status=6 合计
+	 */
+	@ApiModelProperty(value = "退回票数，根据明细 item_status=6 合计")
+	private Integer billsCountOfReturn;
+	/**
+	 * 版本
+	 */
+	@ApiModelProperty(value = "版本")
+	private String version;
+	/**
+	 * 状态（0 正常 1停用）
+	 */
+	@ApiModelProperty(value = "状态（0 正常 1停用）")
+	private Integer status;
+	/**
+	 * 是否已删除（0 否 1是）
+	 */
+	@ApiModelProperty(value = "是否已删除（0 否 1是）")
+	private Integer isDeleted;
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String remarks;
 	/**
 	 * 租户
 	 */
 	@ApiModelProperty(value = "租户")
 	private String tenantId;
 
+	/**
+	 * 申请明细
+	 */
+	@TableField(exist = false)
+	private List<SeaReleaseBillItems> applicationList;
+
+	/**
+	 * 调度明细
+	 */
+	@TableField(exist = false)
+	private List<SeaReleaseBillItems> dispatchList;
+
+	/**
+	 * 放单明细
+	 */
+	@TableField(exist = false)
+	private List<SeaReleaseBillItems> releaseBillList;
+
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -232,7 +232,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							for (Bills item : billsList) {
 								List<FeeCenter> feeCenterList = feeCenterListMh.stream()
 									.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
-										Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode()))), ArrayList::new));
+										Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode()+f.getDc()))), ArrayList::new));
 								List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 								for (FeeCenter fee : feeCenterList) {
 									FeeCenterReports feeCenterReports = new FeeCenterReports();
@@ -312,7 +312,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					if (!feeCenterList.isEmpty()) {
 						List<FeeCenter> feeCenters = feeCenterList.stream()
 							.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
-								Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode()))), ArrayList::new));
+								Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode()+f.getDc()))), ArrayList::new));
 						List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 						for (FeeCenter fee : feeCenters) {
 							FeeCenterReports feeCenterReports = new FeeCenterReports();
@@ -373,7 +373,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						bills.setFeeCenterList(feeCenterReportList);
 					}
 					list.add(0, bills);
-				} else if (MagicValues.MH.equals(bills.getBillType())) {
+				}
+				else if (MagicValues.MH.equals(bills.getBillType())) {
 					Bills details = billsService.getOne(new LambdaQueryWrapper<Bills>()
 						.eq(Bills::getId, bills.getMasterId())
 						.eq(Bills::getTenantId, AuthUtil.getTenantId())
@@ -396,7 +397,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							}
 							List<FeeCenter> feeCenters = feeCenterList.stream()
 								.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
-									Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode()))), ArrayList::new));
+									Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode()+f.getDc()))), ArrayList::new));
 							List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 							for (FeeCenter fee : feeCenters) {
 								FeeCenterReports feeCenterReports = new FeeCenterReports();
@@ -473,7 +474,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						}
 						List<FeeCenter> feeCenterList1 = feeCenterListMh.stream()
 							.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
-								Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode()))), ArrayList::new));
+								Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode()+f.getDc()))), ArrayList::new));
 						List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 						for (FeeCenter fee : feeCenterList1) {
 							FeeCenterReports feeCenterReports = new FeeCenterReports();
@@ -571,10 +572,16 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							feeCenterReports.add(feeCenterReports1);
 						}
 						if (countC < feeCenterReportsC.size()) {
-							List<String> corps = feeCenterReports.stream().map(FeeCenterReports::getCorpCnName).collect(Collectors.toList());
-							List<FeeCenterReports> feeCe = feeCenterReportsC.stream().filter(e -> !corps.contains(e.getCorpCnName())).collect(Collectors.toList());
+							List<FeeCenterReports> feeCe = feeCenterReportsC.stream()
+								.filter(e -> !"1".equals(e.getMark())).collect(Collectors.toList());
+							/*List<String> corps = feeCenterReports.stream().map(FeeCenterReports::getCorpCnName).collect(Collectors.toList());
+							List<String> feeCnName = feeCenterReports.stream().map(FeeCenterReports::getFeeCnName).collect(Collectors.toList());
+							List<FeeCenterReports> feeCe = feeCenterReportsC.stream()
+								.filter(e -> !corps.contains(e.getCorpCnName()) )
+								.collect(Collectors.toList());*/
 							for (FeeCenterReports i : feeCe) {
 								FeeCenterReports feeCenterReports1 = new FeeCenterReports();
+								feeCenterReports1.setCorpCnName(i.getCorpCnName());
 								feeCenterReports1.setFeeCnName(i.getFeeCnName());
 								feeCenterReports1.setHblno(i.getHblno());
 								feeCenterReports1.setPid(i.getPid());
@@ -3392,7 +3399,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								}
 								List<FeeCenter> feeCenterList = feeCenterListMh.stream()
 									.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
-										Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode()))), ArrayList::new));
+										Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode()+f.getDc()))), ArrayList::new));
 								List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 								for (FeeCenter fee : feeCenterList) {
 									FeeCenterReports feeCenterReports = new FeeCenterReports();
@@ -3472,7 +3479,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						}
 						List<FeeCenter> feeCenters = feeCenterList.stream()
 							.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
-								Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode()))), ArrayList::new));
+								Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode()+f.getDc()))), ArrayList::new));
 						List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 						for (FeeCenter fee : feeCenters) {
 							FeeCenterReports feeCenterReports = new FeeCenterReports();
@@ -3556,7 +3563,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							}
 							List<FeeCenter> feeCenters = feeCenterList.stream()
 								.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
-									Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode()))), ArrayList::new));
+									Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode()+f.getDc()))), ArrayList::new));
 							List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 							for (FeeCenter fee : feeCenters) {
 								FeeCenterReports feeCenterReports = new FeeCenterReports();
@@ -3633,7 +3640,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						}
 						List<FeeCenter> feeCenterList1 = feeCenterListMh.stream()
 							.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
-								Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode()))), ArrayList::new));
+								Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode()+f.getDc()))), ArrayList::new));
 						List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 						for (FeeCenter fee : feeCenterList1) {
 							FeeCenterReports feeCenterReports = new FeeCenterReports();
@@ -3731,8 +3738,11 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							feeCenterReports.add(feeCenterReports1);
 						}
 						if (countC < feeCenterReportsC.size()) {
-							List<String> corps = feeCenterReports.stream().map(FeeCenterReports::getCorpCnName).collect(Collectors.toList());
+							/*List<String> corps = feeCenterReports.stream().map(FeeCenterReports::getCorpCnName).collect(Collectors.toList());
 							List<FeeCenterReports> feeCe = feeCenterReportsC.stream().filter(e -> !corps.contains(e.getCorpCnName())).collect(Collectors.toList());
+							*/
+							List<FeeCenterReports> feeCe = feeCenterReportsC.stream()
+								.filter(e -> !"1".equals(e.getMark())).collect(Collectors.toList());
 							for (FeeCenterReports i : feeCe) {
 								FeeCenterReports feeCenterReports1 = new FeeCenterReports();
 								feeCenterReports1.setFeeCnName(i.getFeeCnName());

blade-service/blade-los/src/main/java/org/springblade/los/business/release/controller/SeaReleaseBillController.java

@@ -16,23 +16,26 @@
  */
 package org.springblade.los.business.release.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.los.business.release.entity.SeaReleaseBill;
-import org.springblade.los.business.release.vo.SeaReleaseBillVO;
 import org.springblade.los.business.release.service.ISeaReleaseBillService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.los.business.release.vo.SeaReleaseBillVO;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
 
 /**
  * 业务-海运放单 控制器
@@ -55,7 +58,7 @@ public class SeaReleaseBillController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入seaReleaseBill")
 	public R<SeaReleaseBill> detail(SeaReleaseBill seaReleaseBill) {
-		SeaReleaseBill detail = seaReleaseBillService.getOne(Condition.getQueryWrapper(seaReleaseBill));
+		SeaReleaseBill detail = seaReleaseBillService.detail(seaReleaseBill);
 		return R.data(detail);
 	}
 
@@ -66,7 +69,12 @@ public class SeaReleaseBillController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入seaReleaseBill")
 	public R<IPage<SeaReleaseBill>> list(SeaReleaseBill seaReleaseBill, Query query) {
-		IPage<SeaReleaseBill> pages = seaReleaseBillService.page(Condition.getPage(query), Condition.getQueryWrapper(seaReleaseBill));
+		LambdaQueryWrapper<SeaReleaseBill> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(SeaReleaseBill::getTenantId, AuthUtil.getTenantId())
+			.eq(SeaReleaseBill::getIsDeleted, 0)
+			.eq(ObjectUtils.isNotNull(seaReleaseBill.getBillNo()), SeaReleaseBill::getBillNo, seaReleaseBill.getBillNo())
+			.orderByDesc(SeaReleaseBill::getBillDate);
+		IPage<SeaReleaseBill> pages = seaReleaseBillService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/business/release/service/ISeaReleaseBillService.java

@@ -38,4 +38,5 @@ public interface ISeaReleaseBillService extends IService<SeaReleaseBill> {
 	 */
 	IPage<SeaReleaseBillVO> selectSeaReleaseBillPage(IPage<SeaReleaseBillVO> page, SeaReleaseBillVO seaReleaseBill);
 
+    SeaReleaseBill detail(SeaReleaseBill seaReleaseBill);
 }

blade-service/blade-los/src/main/java/org/springblade/los/business/release/service/impl/SeaReleaseBillServiceImpl.java

@@ -16,13 +16,19 @@
  */
 package org.springblade.los.business.release.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.los.business.release.entity.SeaReleaseBill;
-import org.springblade.los.business.release.vo.SeaReleaseBillVO;
+import org.springblade.los.business.release.entity.SeaReleaseBillItems;
 import org.springblade.los.business.release.mapper.SeaReleaseBillMapper;
+import org.springblade.los.business.release.service.ISeaReleaseBillItemsService;
 import org.springblade.los.business.release.service.ISeaReleaseBillService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.los.business.release.vo.SeaReleaseBillVO;
+import org.springblade.system.feign.ISysClient;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  * 业务-海运放单 服务实现类
@@ -31,11 +37,36 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  * @since 2024-04-30
  */
 @Service
+@AllArgsConstructor
 public class SeaReleaseBillServiceImpl extends ServiceImpl<SeaReleaseBillMapper, SeaReleaseBill> implements ISeaReleaseBillService {
 
+
+	private final ISeaReleaseBillItemsService seaReleaseBillItemsService;
+
+	private final ISysClient sysClient;
+
 	@Override
 	public IPage<SeaReleaseBillVO> selectSeaReleaseBillPage(IPage<SeaReleaseBillVO> page, SeaReleaseBillVO seaReleaseBill) {
 		return page.setRecords(baseMapper.selectSeaReleaseBillPage(page, seaReleaseBill));
 	}
 
+	@Override
+	public SeaReleaseBill detail(SeaReleaseBill seaReleaseBill) {
+		SeaReleaseBill details = baseMapper.selectById(seaReleaseBill.getId());
+		details.setApplicationList(seaReleaseBillItemsService.list(new LambdaQueryWrapper<SeaReleaseBillItems>()
+			.eq(SeaReleaseBillItems::getTenantId, AuthUtil.getTenantId())
+			.eq(SeaReleaseBillItems::getIsDeleted, 0)
+			.eq(SeaReleaseBillItems::getPApplyId, seaReleaseBill.getId())
+		));
+		details.setDispatchList(seaReleaseBillItemsService.list(new LambdaQueryWrapper<SeaReleaseBillItems>()
+			.eq(SeaReleaseBillItems::getTenantId, AuthUtil.getTenantId())
+			.eq(SeaReleaseBillItems::getIsDeleted, 0)
+			.eq(SeaReleaseBillItems::getPDispatchId, seaReleaseBill.getId())));
+		details.setReleaseBillList(seaReleaseBillItemsService.list(new LambdaQueryWrapper<SeaReleaseBillItems>()
+			.eq(SeaReleaseBillItems::getTenantId, AuthUtil.getTenantId())
+			.eq(SeaReleaseBillItems::getIsDeleted, 0)
+			.eq(SeaReleaseBillItems::getPReleaseId, seaReleaseBill.getId())));
+		return details;
+	}
+
 }