2023年10月31日18:29:08

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Bills.java

@@ -1354,6 +1354,12 @@ public class Bills implements Serializable {
 	@ApiModelProperty(value = "数据修改字符串")
 	private String charData;
 
+	/**
+	 * 是否修改数据状态  0是  不等于0否
+	 */
+	@ApiModelProperty(value = "是否修改数据状态  0是  不等于0否")
+	private Integer billingStatus;
+
 
 	/**
 	 * 预配箱型箱量

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/dto/FinAccBillsDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.los.finance.fee.dto;
+
+import org.springblade.los.finance.fee.entity.FinAccBills;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 业务-财务账单，各分公司独立数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2023-10-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class FinAccBillsDTO extends FinAccBills {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/entity/FeeCenter.java

@@ -647,7 +647,7 @@ public class FeeCenter implements Serializable {
 	 * 发票 Id
 	 */
 	@ApiModelProperty(value = "发票 Id")
-	private Long invoiceBillId;
+	private String invoiceBillId;
 
 	/**
 	 * 发票单据编号

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/entity/FinAccBills.java

@@ -0,0 +1,475 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.los.finance.fee.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 业务-财务账单，各分公司独立实体类
+ *
+ * @author BladeX
+ * @since 2023-10-31
+ */
+@Data
+@TableName("los_fin_acc_bills")
+@ApiModel(value = "FinAccBills对象", description = "业务-财务账单，各分公司独立")
+public class FinAccBills 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 LocalDateTime createTime;
+	/**
+	* 修改人 Id
+	*/
+		@ApiModelProperty(value = "修改人 Id")
+		private Long updateUser;
+	/**
+	* 修改人
+	*/
+		@ApiModelProperty(value = "修改人")
+		private String updateUserName;
+	/**
+	* 修改时间
+	*/
+		@ApiModelProperty(value = "修改时间")
+		private LocalDateTime updateTime;
+	/**
+	* 账单编号
+	*/
+		@ApiModelProperty(value = "账单编号")
+		private String billNo;
+	/**
+	* 账单日期
+	*/
+		@ApiModelProperty(value = "账单日期")
+		private LocalDateTime billDate;
+	/**
+	* 账单类型,LOCAL 应收，LOCAL 应付,舱单 应收，舱单 应付
+	*/
+		@ApiModelProperty(value = "账单类型,LOCAL 应收，LOCAL 应付,舱单 应收，舱单 应付")
+		private String accountType;
+	/**
+	* 账单属性,D=应收，C= 应付
+	*/
+		@ApiModelProperty(value = "账单属性,D=应收，C= 应付")
+		private String accountDc;
+	/**
+	* 财务日期
+	*/
+		@ApiModelProperty(value = "财务日期")
+		private LocalDateTime accountDate;
+	/**
+	* 账单关键字 业务表的id+结算单位+收付  +核算要素作为关键字
+	*/
+		@ApiModelProperty(value = "账单关键字 业务表的id+结算单位+收付  +核算要素作为关键字")
+		private String billKey;
+	/**
+	* 业务类型
+	*/
+		@ApiModelProperty(value = "业务类型")
+		private String businessType;
+	/**
+	* 业务 id(主单，直单)
+	*/
+		@ApiModelProperty(value = "业务 id(主单，直单)")
+		private Long businessBillId;
+	/**
+	* 业务单据编号(主单，直单)
+	*/
+		@ApiModelProperty(value = "业务单据编号(主单，直单)")
+		private String businessBillNo;
+	/**
+	* 业务单据日期(主单，直单)
+	*/
+		@ApiModelProperty(value = "业务单据日期(主单，直单)")
+		private LocalDateTime businessDate;
+	/**
+	* 业务 id(分单)
+	*/
+		@ApiModelProperty(value = "业务 id(分单)")
+		private Long businessBillDivideId;
+	/**
+	* 业务单据编号(分单)
+	*/
+		@ApiModelProperty(value = "业务单据编号(分单)")
+		private String businessBillDivideNo;
+	/**
+	* 业务单据日期(分单)
+	*/
+		@ApiModelProperty(value = "业务单据日期(分单)")
+		private LocalDateTime businessDivideDate;
+	/**
+	* 合同号
+	*/
+		@ApiModelProperty(value = "合同号")
+		private String contractNo;
+	/**
+	* 付款方式 PP=预付, CC=到付, FPA, Other
+	*/
+		@ApiModelProperty(value = "付款方式 PP=预付, CC=到付, FPA, Other")
+		private String paymode;
+	/**
+	* 核算要素 id
+	*/
+		@ApiModelProperty(value = "核算要素 id")
+		@TableField("accelementID")
+	private Long accelementid;
+	/**
+	* 核算要素名称
+	*/
+		@ApiModelProperty(value = "核算要素名称")
+		private String accelementname;
+	/**
+	* 客户 id
+	*/
+		@ApiModelProperty(value = "客户 id")
+		private Long corpId;
+	/**
+	* 客户中文名称
+	*/
+		@ApiModelProperty(value = "客户中文名称")
+		private String corpCnName;
+	/**
+	* 客户英文名称
+	*/
+		@ApiModelProperty(value = "客户英文名称")
+		private String corpEnName;
+	/**
+	* 客户是否已签约
+	*/
+		@ApiModelProperty(value = "客户是否已签约")
+		private Integer corpIsSigned;
+	/**
+	* 客户约号
+	*/
+		@ApiModelProperty(value = "客户约号")
+		private String corpArgreementNo;
+	/**
+	* 主表客户 id
+	*/
+		@ApiModelProperty(value = "主表客户 id")
+		private Long billCorpId;
+	/**
+	* 主表客户中文名称
+	*/
+		@ApiModelProperty(value = "主表客户中文名称")
+		private String billCorpCnName;
+	/**
+	* 主表客户英文名称
+	*/
+		@ApiModelProperty(value = "主表客户英文名称")
+		private String billCorpEnName;
+	/**
+	* 业务所在部门 Id
+	*/
+		@ApiModelProperty(value = "业务所在部门 Id")
+		private Long deptId;
+	/**
+	* 业务所在部门
+	*/
+		@ApiModelProperty(value = "业务所在部门")
+		private String deptName;
+	/**
+	* 船名 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;
+	/**
+	* Reference NO
+	*/
+		@ApiModelProperty(value = "Reference NO")
+		private String refno;
+	/**
+	* 开船日期
+	*/
+		@ApiModelProperty(value = "开船日期")
+		private LocalDateTime etd;
+	/**
+	* 到港日期
+	*/
+		@ApiModelProperty(value = "到港日期")
+		private LocalDateTime eta;
+	/**
+	* 装货港 id
+	*/
+		@ApiModelProperty(value = "装货港 id")
+		private Long polId;
+	/**
+	* 装货港代码
+	*/
+		@ApiModelProperty(value = "装货港代码")
+		private String polCode;
+	/**
+	* 装货港英文名称
+	*/
+		@ApiModelProperty(value = "装货港英文名称")
+		private String polCnName;
+	/**
+	* 装货港英文名称
+	*/
+		@ApiModelProperty(value = "装货港英文名称")
+		private String polEnName;
+	/**
+	* 装货港英文名称打印 默认等于pol_en_name 可以编辑
+	*/
+		@ApiModelProperty(value = "装货港英文名称打印 默认等于pol_en_name 可以编辑")
+		private String polNamePrint;
+	/**
+	* 卸货港 id
+	*/
+		@ApiModelProperty(value = "卸货港 id")
+		private Long podId;
+	/**
+	* 卸货港代码
+	*/
+		@ApiModelProperty(value = "卸货港代码")
+		private String podCode;
+	/**
+	* 卸货港中文名称
+	*/
+		@ApiModelProperty(value = "卸货港中文名称")
+		private String podCnName;
+	/**
+	* 卸货港英文名称
+	*/
+		@ApiModelProperty(value = "卸货港英文名称")
+		private String podEnName;
+	/**
+	* 卸货港英文名称打印 默认等于pol_en_name 可以编辑
+	*/
+		@ApiModelProperty(value = "卸货港英文名称打印 默认等于pol_en_name 可以编辑")
+		private String podNamePrint;
+	/**
+	* 本位币应收(CNY)
+	*/
+		@ApiModelProperty(value = "本位币应收(CNY)")
+		private BigDecimal amountDr;
+	/**
+	* 本位币应付(CNY)
+	*/
+		@ApiModelProperty(value = "本位币应付(CNY)")
+		private BigDecimal amountCr;
+	/**
+	* 综合 USD 应收(USD) - 非 USD 外币转换为 USD
+	*/
+		@ApiModelProperty(value = "综合 USD 应收(USD) - 非 USD 外币转换为 USD")
+		private BigDecimal amountDrUsd;
+	/**
+	* 综合 USD 应付(USD) - 非 USD 外币转换为 USD
+	*/
+		@ApiModelProperty(value = "综合 USD 应付(USD) - 非 USD 外币转换为 USD")
+		private BigDecimal amountCrUsd;
+	/**
+	* 合计本位币应收(CNY )
+	*/
+		@ApiModelProperty(value = "合计本位币应收(CNY )")
+		private BigDecimal amountDrLoc;
+	/**
+	* 合计本位币应付(CNY)
+	*/
+		@ApiModelProperty(value = "合计本位币应付(CNY)")
+		private BigDecimal amountCrLoc;
+	/**
+	* 结算 Id
+	*/
+		@ApiModelProperty(value = "结算 Id")
+		private Long stlBillId;
+	/**
+	* 结算单据编号
+	*/
+		@ApiModelProperty(value = "结算单据编号")
+		private String stlBillNo;
+	/**
+	* 结算日期
+	*/
+		@ApiModelProperty(value = "结算日期")
+		private LocalDateTime stlDate;
+	/**
+	* 已结算本位币应收(CNY)
+	*/
+		@ApiModelProperty(value = "已结算本位币应收(CNY)")
+		private BigDecimal stlAmountDr;
+	/**
+	* 已结算本位币应付(CNY)
+	*/
+		@ApiModelProperty(value = "已结算本位币应付(CNY)")
+		private BigDecimal stlAmountCr;
+	/**
+	* 已结算综合 USD 应收(USD) - 非 USD 外币转换为 USD
+	*/
+		@ApiModelProperty(value = "已结算综合 USD 应收(USD) - 非 USD 外币转换为 USD")
+		private BigDecimal stlAmountDrUsd;
+	/**
+	* 已结算综合 USD 应付(USD) - 非 USD 外币转换为 USD
+	*/
+		@ApiModelProperty(value = "已结算综合 USD 应付(USD) - 非 USD 外币转换为 USD")
+		private BigDecimal stlAmountCrUsd;
+	/**
+	* 已结算合计本位币应收(CNY )
+	*/
+		@ApiModelProperty(value = "已结算合计本位币应收(CNY )")
+		private BigDecimal stlAmountDrLoc;
+	/**
+	* 已结算合计本位币应付(CNY)
+	*/
+		@ApiModelProperty(value = "已结算合计本位币应付(CNY)")
+		private BigDecimal stlAmountCrLoc;
+	/**
+	* 发票 Id
+	*/
+		@ApiModelProperty(value = "发票 Id")
+		private String invoiceBillId;
+	/**
+	* 发票单据编号
+	*/
+		@ApiModelProperty(value = "发票单据编号")
+		private String invoiceBillNo;
+	/**
+	* 发票号
+	*/
+		@ApiModelProperty(value = "发票号")
+		private String invoiceNo;
+	/**
+	* 发票日期
+	*/
+		@ApiModelProperty(value = "发票日期")
+		private LocalDateTime invoiceDate;
+	/**
+	* 凭证 Id
+	*/
+		@ApiModelProperty(value = "凭证 Id")
+		private Long voucherBillId;
+	/**
+	* 凭证单据编号
+	*/
+		@ApiModelProperty(value = "凭证单据编号")
+		private String voucherBillNo;
+	/**
+	* 凭证号
+	*/
+		@ApiModelProperty(value = "凭证号")
+		private String voucherNo;
+	/**
+	* 凭证日期
+	*/
+		@ApiModelProperty(value = "凭证日期")
+		private LocalDateTime voucherDate;
+	/**
+	* 是否对账（0 未对账 1 已对账）
+	*/
+		@ApiModelProperty(value = "是否对账（0 未对账 1 已对账）")
+		private Integer isChecked;
+	/**
+	* 是否销账（0 未销账 3 部分销账 9 销账）
+	*/
+		@ApiModelProperty(value = "是否销账（0 未销账 3 部分销账 9 销账）")
+		private Integer isCleared;
+	/**
+	* 账单状态（0 未完成 1 已完成）
+	*/
+		@ApiModelProperty(value = "账单状态（0 未完成 1 已完成）")
+		private Integer billStatus;
+	/**
+	* 版本
+	*/
+		@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;
+
+
+}

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/fee/vo/FinAccBillsVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.los.finance.fee.vo;
+
+import org.springblade.los.finance.fee.entity.FinAccBills;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 业务-财务账单，各分公司独立视图实体类
+ *
+ * @author BladeX
+ * @since 2023-10-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "FinAccBillsVO对象", description = "业务-财务账单，各分公司独立")
+public class FinAccBillsVO extends FinAccBills {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/controller/FinAccBillsController.java

@@ -0,0 +1,126 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.los.finance.fee.controller;
+
+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.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+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.finance.fee.entity.FinAccBills;
+import org.springblade.los.finance.fee.vo.FinAccBillsVO;
+import org.springblade.los.finance.fee.service.IFinAccBillsService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 业务-财务账单，各分公司独立 控制器
+ *
+ * @author BladeX
+ * @since 2023-10-31
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/finaccbills")
+@Api(value = "业务-财务账单，各分公司独立", tags = "业务-财务账单，各分公司独立接口")
+public class FinAccBillsController extends BladeController {
+
+	private final IFinAccBillsService finAccBillsService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入finAccBills")
+	public R<FinAccBills> detail(FinAccBills finAccBills) {
+		FinAccBills detail = finAccBillsService.getOne(Condition.getQueryWrapper(finAccBills));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 业务-财务账单，各分公司独立
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入finAccBills")
+	public R<IPage<FinAccBills>> list(FinAccBills finAccBills, Query query) {
+		IPage<FinAccBills> pages = finAccBillsService.page(Condition.getPage(query), Condition.getQueryWrapper(finAccBills));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 业务-财务账单，各分公司独立
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入finAccBills")
+	public R<IPage<FinAccBillsVO>> page(FinAccBillsVO finAccBills, Query query) {
+		IPage<FinAccBillsVO> pages = finAccBillsService.selectFinAccBillsPage(Condition.getPage(query), finAccBills);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 业务-财务账单，各分公司独立
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入finAccBills")
+	public R save(@Valid @RequestBody FinAccBills finAccBills) {
+		return R.status(finAccBillsService.save(finAccBills));
+	}
+
+	/**
+	 * 修改 业务-财务账单，各分公司独立
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入finAccBills")
+	public R update(@Valid @RequestBody FinAccBills finAccBills) {
+		return R.status(finAccBillsService.updateById(finAccBills));
+	}
+
+	/**
+	 * 新增或修改 业务-财务账单，各分公司独立
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入finAccBills")
+	public R submit(@Valid @RequestBody FinAccBills finAccBills) {
+		return R.status(finAccBillsService.saveOrUpdate(finAccBills));
+	}
+
+	
+	/**
+	 * 删除 业务-财务账单，各分公司独立
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(finAccBillsService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/mapper/FinAccBillsMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.los.finance.fee.mapper;
+
+import org.springblade.los.finance.fee.entity.FinAccBills;
+import org.springblade.los.finance.fee.vo.FinAccBillsVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 业务-财务账单，各分公司独立 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2023-10-31
+ */
+public interface FinAccBillsMapper extends BaseMapper<FinAccBills> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param finAccBills
+	 * @return
+	 */
+	List<FinAccBillsVO> selectFinAccBillsPage(IPage page, FinAccBillsVO finAccBills);
+
+}

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/mapper/FinAccBillsMapper.xml

@@ -0,0 +1,100 @@
+<?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="org.springblade.los.finance.fee.mapper.FinAccBillsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="finAccBillsResultMap" type="org.springblade.los.finance.fee.entity.FinAccBills">
+        <id column="id" property="id"/>
+        <result column="branch_id" property="branchId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_user_name" property="createUserName"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_dept_name" property="createDeptName"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_user_name" property="updateUserName"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="bill_no" property="billNo"/>
+        <result column="bill_date" property="billDate"/>
+        <result column="account_type" property="accountType"/>
+        <result column="account_dc" property="accountDc"/>
+        <result column="account_date" property="accountDate"/>
+        <result column="bill_key" property="billKey"/>
+        <result column="business_type" property="businessType"/>
+        <result column="business_bill_id" property="businessBillId"/>
+        <result column="business_bill_no" property="businessBillNo"/>
+        <result column="business_date" property="businessDate"/>
+        <result column="business_bill_divide_id" property="businessBillDivideId"/>
+        <result column="business_bill_divide_no" property="businessBillDivideNo"/>
+        <result column="business_divide_date" property="businessDivideDate"/>
+        <result column="contract_no" property="contractNo"/>
+        <result column="paymode" property="paymode"/>
+        <result column="accelementID" property="accelementid"/>
+        <result column="accelementname" property="accelementname"/>
+        <result column="corp_id" property="corpId"/>
+        <result column="corp_cn_name" property="corpCnName"/>
+        <result column="corp_en_name" property="corpEnName"/>
+        <result column="corp_is_signed" property="corpIsSigned"/>
+        <result column="corp_argreement_no" property="corpArgreementNo"/>
+        <result column="bill_corp_id" property="billCorpId"/>
+        <result column="bill_corp_cn_name" property="billCorpCnName"/>
+        <result column="bill_corp_en_name" property="billCorpEnName"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="dept_name" property="deptName"/>
+        <result column="vessel_id" property="vesselId"/>
+        <result column="vessel_cn_name" property="vesselCnName"/>
+        <result column="vessel_en_name" property="vesselEnName"/>
+        <result column="voyage_no" property="voyageNo"/>
+        <result column="mblno" property="mblno"/>
+        <result column="hblno" property="hblno"/>
+        <result column="refno" property="refno"/>
+        <result column="etd" property="etd"/>
+        <result column="eta" property="eta"/>
+        <result column="pol_id" property="polId"/>
+        <result column="pol_code" property="polCode"/>
+        <result column="pol_cn_name" property="polCnName"/>
+        <result column="pol_en_name" property="polEnName"/>
+        <result column="pol_name_print" property="polNamePrint"/>
+        <result column="pod_id" property="podId"/>
+        <result column="pod_code" property="podCode"/>
+        <result column="pod_cn_name" property="podCnName"/>
+        <result column="pod_en_name" property="podEnName"/>
+        <result column="pod_name_print" property="podNamePrint"/>
+        <result column="amount_dr" property="amountDr"/>
+        <result column="amount_cr" property="amountCr"/>
+        <result column="amount_dr_usd" property="amountDrUsd"/>
+        <result column="amount_cr_usd" property="amountCrUsd"/>
+        <result column="amount_dr_loc" property="amountDrLoc"/>
+        <result column="amount_cr_loc" property="amountCrLoc"/>
+        <result column="stl_bill_id" property="stlBillId"/>
+        <result column="stl_bill_no" property="stlBillNo"/>
+        <result column="stl_date" property="stlDate"/>
+        <result column="stl_amount_dr" property="stlAmountDr"/>
+        <result column="stl_amount_cr" property="stlAmountCr"/>
+        <result column="stl_amount_dr_usd" property="stlAmountDrUsd"/>
+        <result column="stl_amount_cr_usd" property="stlAmountCrUsd"/>
+        <result column="stl_amount_dr_loc" property="stlAmountDrLoc"/>
+        <result column="stl_amount_cr_loc" property="stlAmountCrLoc"/>
+        <result column="invoice_bill_id" property="invoiceBillId"/>
+        <result column="invoice_bill_no" property="invoiceBillNo"/>
+        <result column="invoice_no" property="invoiceNo"/>
+        <result column="invoice_date" property="invoiceDate"/>
+        <result column="voucher_bill_id" property="voucherBillId"/>
+        <result column="voucher_bill_no" property="voucherBillNo"/>
+        <result column="voucher_no" property="voucherNo"/>
+        <result column="voucher_date" property="voucherDate"/>
+        <result column="is_checked" property="isChecked"/>
+        <result column="is_cleared" property="isCleared"/>
+        <result column="bill_status" property="billStatus"/>
+        <result column="version" property="version"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="remarks" property="remarks"/>
+    </resultMap>
+
+
+    <select id="selectFinAccBillsPage" resultMap="finAccBillsResultMap">
+        select * from los_fin_acc_bills where is_deleted = 0
+    </select>
+
+</mapper>

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/IFinAccBillsService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.los.finance.fee.service;
+
+import org.springblade.los.finance.fee.entity.FinAccBills;
+import org.springblade.los.finance.fee.vo.FinAccBillsVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 业务-财务账单，各分公司独立 服务类
+ *
+ * @author BladeX
+ * @since 2023-10-31
+ */
+public interface IFinAccBillsService extends IService<FinAccBills> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param finAccBills
+	 * @return
+	 */
+	IPage<FinAccBillsVO> selectFinAccBillsPage(IPage<FinAccBillsVO> page, FinAccBillsVO finAccBills);
+
+}

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FinAccBillsServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.los.finance.fee.service.impl;
+
+import org.springblade.los.finance.fee.entity.FinAccBills;
+import org.springblade.los.finance.fee.vo.FinAccBillsVO;
+import org.springblade.los.finance.fee.mapper.FinAccBillsMapper;
+import org.springblade.los.finance.fee.service.IFinAccBillsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 业务-财务账单，各分公司独立 服务实现类
+ *
+ * @author BladeX
+ * @since 2023-10-31
+ */
+@Service
+public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAccBills> implements IFinAccBillsService {
+
+	@Override
+	public IPage<FinAccBillsVO> selectFinAccBillsPage(IPage<FinAccBillsVO> page, FinAccBillsVO finAccBills) {
+		return page.setRecords(baseMapper.selectFinAccBillsPage(page, finAccBills));
+	}
+
+}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -5973,15 +5973,26 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			List<OrderParts> srcItemsList = new ArrayList<>();
 			List<OrderItems> srcOrderItemsList = new ArrayList<>();
 			for (OrderItems orderItems : orderItemsList) {
-				if (1 == order.getPurchaseStatusType()) {//排产中
-					if (ObjectUtils.isNotEmpty(orderItems.getDetailType())) {
-						if (OrderTypeEnum.PARTSTYPE.getType().equals(orderItems.getDetailType())) {
-							OrderParts srcItems = orderPartsService.getById(orderItems.getSrcItemId());
-							if (null != srcItems) {
-								//更新对应配件明细采购数量
-								BigDecimal quantity = ObjectUtils.isNotNull(srcItems.getPurchasesNumber()) ? srcItems.getPurchasesNumber() : new BigDecimal("0.00");
-								srcItems.setPurchasesNumber(quantity.add(orderItems.getActualQuantity()));
-								srcItemsList.add(srcItems);
+				if (ObjectUtils.isNotNull(orderItems.getSrcItemId())){
+					if (1 == order.getPurchaseStatusType()) {//排产中
+						if (ObjectUtils.isNotEmpty(orderItems.getDetailType())) {
+							if (OrderTypeEnum.PARTSTYPE.getType().equals(orderItems.getDetailType())) {
+								OrderParts srcItems = orderPartsService.getById(orderItems.getSrcItemId());
+								if (null != srcItems) {
+									//更新对应配件明细采购数量
+									BigDecimal quantity = ObjectUtils.isNotNull(srcItems.getPurchasesNumber()) ? srcItems.getPurchasesNumber() : new BigDecimal("0.00");
+									srcItems.setPurchasesNumber(quantity.add(orderItems.getActualQuantity()));
+									srcItemsList.add(srcItems);
+								}
+							} else {
+								//更新对应销售单明细采购数量
+								OrderItems srcItems = orderItemsMapper.selectById(orderItems.getSrcItemId());
+								if (null != srcItems) {
+									BigDecimal quantity = ObjectUtils.isNotNull(srcItems.getPurchaseQuantity()) ? srcItems.getPurchaseQuantity() : new BigDecimal("0.00");
+									srcItems.setPurchaseQuantity(quantity.add(orderItems.getActualQuantity()));
+									srcItems.setFudaPurchaseStatus("排产中");
+									srcOrderItemsList.add(srcItems);
+								}
 							}
 						} else {
 							//更新对应销售单明细采购数量
@@ -5993,19 +6004,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 								srcOrderItemsList.add(srcItems);
 							}
 						}
-					} else {
-						//更新对应销售单明细采购数量
-						OrderItems srcItems = orderItemsMapper.selectById(orderItems.getSrcItemId());
-						if (null != srcItems) {
-							BigDecimal quantity = ObjectUtils.isNotNull(srcItems.getPurchaseQuantity()) ? srcItems.getPurchaseQuantity() : new BigDecimal("0.00");
-							srcItems.setPurchaseQuantity(quantity.add(orderItems.getActualQuantity()));
-							srcItems.setFudaPurchaseStatus("排产中");
-							srcOrderItemsList.add(srcItems);
-						}
 					}
+					pidList.add(orderItems.getSrcId());
 				}
-
-				pidList.add(orderItems.getSrcId());
 			}
 			if (srcItemsList.size() > 0) {
 				orderPartsService.updateBatchById(srcItemsList);