[CODE]: 财务管理--> 收付对账

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/finance/FTmsaccbillsController.java

@@ -0,0 +1,94 @@
+package com.ruoyi.web.controller.fleet.finance;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.orderManagement.finance.domain.FTmsaccbills;
+import com.ruoyi.orderManagement.finance.domain.FTmsaccbillsFees;
+import com.ruoyi.orderManagement.finance.service.IFTmsaccbillsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 财务对账数据Controller
+ *
+ * @author ruoyi
+ * @date 2021-01-18
+ */
+@RestController
+@RequestMapping("/finances/contrast")
+public class FTmsaccbillsController extends BaseController {
+
+    @Autowired
+    private IFTmsaccbillsService fTmsaccbillsService;
+
+    /**
+     * 查询财务主列表
+     */
+    @PreAuthorize("@ss.hasPermi('finances:contrast:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FTmsaccbills fTmsaccbills)
+    {
+        startPage();
+        List<FTmsaccbills> list = fTmsaccbillsService.selectFTmsaccbillsList(fTmsaccbills);
+        return getDataTable(list);
+    }
+
+    /**
+     *  收费查询
+     */
+    @GetMapping("/contrastList")
+    public TableDataInfo chargeList(FTmsaccbillsFees fTmsaccbillsFees) {
+        startPage();
+        String billsType = "DZ";
+        List<Map<String, Object>> list = fTmsaccbillsService.fTmsaccbillsList(fTmsaccbillsFees,billsType);
+        return getDataTable(list);
+    }
+
+    /**
+     * 新增财务数据主
+     */
+    @PreAuthorize("@ss.hasPermi('finances:contrast:add')")
+    @Log(title = "财务数据主", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    @RepeatSubmit
+    public AjaxResult add(@RequestParam("tFee") String tFee,
+                          @RequestParam("tFeeDo") String tFeeDo ) {
+        String billsType = "SFDZ";
+        // 获取当前的用户
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        return fTmsaccbillsService.insertTFeeTFeeDo(tFee,tFeeDo,loginUser,billsType);
+    }
+
+    /**
+     *  查询详情
+     */
+    @PreAuthorize("@ss.hasPermi('finances:contrast:query')")
+    @GetMapping(value = "/{fId}")
+    public AjaxResult getInfo(@PathVariable("fId") Long fId) {
+        return AjaxResult.success(fTmsaccbillsService.selectFTmsaccbillsAndItemsById(fId));
+    }
+
+    /**
+     * 删除财务数据主
+     */
+    @PreAuthorize("@ss.hasPermi('finances:contrast:remove')")
+    @Log(title = "财务数据主", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{fIds}")
+    public AjaxResult remove(@PathVariable Long[] fIds) {
+        return toAjax(fTmsaccbillsService.deleteFTmsaccbillsByIds(fIds));
+    }
+
+
+}

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/domain/FTmsaccbills.java

@@ -0,0 +1,322 @@
+package com.ruoyi.orderManagement.finance.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 财务主对象 F_TMSACCBILLS
+ * 
+ * @author ruoyi
+ * @date 2021-03-12
+ */
+public class FTmsaccbills extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 年 */
+    @Excel(name = "年")
+    private Long accYear;
+
+    /** 月 */
+    @Excel(name = "月")
+    private Long accMonth;
+
+    /** 活动号 */
+    @Excel(name = "活动号")
+    private Long actId;
+
+    /** 业务活动号 */
+    @Excel(name = "业务活动号")
+    private String billNo;
+
+    /** 客户id */
+    @Excel(name = "客户id")
+    private Long corpId;
+
+    /** 业务员id */
+    @Excel(name = "业务员id")
+    private Long transactId;
+
+    /** 检索区间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "检索区间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fromDate;
+
+    /** 检索区间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "检索区间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date toDate;
+
+    /** 合计金额 */
+    @Excel(name = "合计金额")
+    private BigDecimal amt;
+
+    /** 参考号(银行账号、付款方式等……) */
+    @Excel(name = "参考号(银行账号、付款方式等……)")
+    private String refNo;
+
+    /** 业务完成日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "业务完成日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date postDate;
+
+    /** 状态(1新建，2暂存，6提交) */
+    @Excel(name = "状态(1新建，2暂存，6提交)")
+    private Long billStatus;
+
+    /** 删除状态 */
+    private String delFlag;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+
+    /**
+     * 货权方
+     */
+    @Excel(name = "货权方")
+    private String fCtrlcorpid;
+
+    /**
+     * 提单号
+     */
+    @Excel(name = "提单号")
+    private String tMblno;
+
+    /**
+     * 单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)
+     */
+    @Excel(name = "单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)")
+    private String fBilltype;
+
+    /**
+     * 账单日期(审批流结束后更新)
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "账单日期(审批流结束后更新)", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fAccbilldate;
+
+    /**
+     * 业务编号(唯一格式+YYYY+YY+NNN，
+     * 编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。)
+     * 对账 DZ
+     * <p>
+     * 收费 SF
+     * <p>
+     * 付费 FF
+     * <p>
+     * 发票 FP
+     */
+    @Excel(name = "业务编号(唯一格式+YYYY+YY+NNN，编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。) 对账 DZ 收费 SF 付费 FF 发票 FP")
+    private String fBillno;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setAccYear(Long accYear) 
+    {
+        this.accYear = accYear;
+    }
+
+    public Long getAccYear() 
+    {
+        return accYear;
+    }
+    public void setAccMonth(Long accMonth) 
+    {
+        this.accMonth = accMonth;
+    }
+
+    public Long getAccMonth() 
+    {
+        return accMonth;
+    }
+    public void setActId(Long actId) 
+    {
+        this.actId = actId;
+    }
+
+    public Long getActId() 
+    {
+        return actId;
+    }
+    public void setBillNo(String billNo) 
+    {
+        this.billNo = billNo;
+    }
+
+    public String getBillNo() 
+    {
+        return billNo;
+    }
+    public void setCorpId(Long corpId) 
+    {
+        this.corpId = corpId;
+    }
+
+    public Long getCorpId() 
+    {
+        return corpId;
+    }
+    public void setTransactId(Long transactId) 
+    {
+        this.transactId = transactId;
+    }
+
+    public Long getTransactId() 
+    {
+        return transactId;
+    }
+    public void setFromDate(Date fromDate) 
+    {
+        this.fromDate = fromDate;
+    }
+
+    public Date getFromDate() 
+    {
+        return fromDate;
+    }
+    public void setToDate(Date toDate) 
+    {
+        this.toDate = toDate;
+    }
+
+    public Date getToDate() 
+    {
+        return toDate;
+    }
+    public void setAmt(BigDecimal amt) 
+    {
+        this.amt = amt;
+    }
+
+    public BigDecimal getAmt() 
+    {
+        return amt;
+    }
+    public void setRefNo(String refNo) 
+    {
+        this.refNo = refNo;
+    }
+
+    public String getRefNo() 
+    {
+        return refNo;
+    }
+    public void setPostDate(Date postDate) 
+    {
+        this.postDate = postDate;
+    }
+
+    public Date getPostDate() 
+    {
+        return postDate;
+    }
+    public void setBillStatus(Long billStatus) 
+    {
+        this.billStatus = billStatus;
+    }
+
+    public Long getBillStatus() 
+    {
+        return billStatus;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    public String getfCtrlcorpid() {
+        return fCtrlcorpid;
+    }
+
+    public void setfCtrlcorpid(String fCtrlcorpid) {
+        this.fCtrlcorpid = fCtrlcorpid;
+    }
+
+    public String gettMblno() {
+        return tMblno;
+    }
+
+    public void settMblno(String tMblno) {
+        this.tMblno = tMblno;
+    }
+
+    public String getfBilltype() {
+        return fBilltype;
+    }
+
+    public void setfBilltype(String fBilltype) {
+        this.fBilltype = fBilltype;
+    }
+
+    public Date getfAccbilldate() {
+        return fAccbilldate;
+    }
+
+    public void setfAccbilldate(Date fAccbilldate) {
+        this.fAccbilldate = fAccbilldate;
+    }
+
+    public String getfBillno() {
+        return fBillno;
+    }
+
+    public void setfBillno(String fBillno) {
+        this.fBillno = fBillno;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("accYear", getAccYear())
+            .append("accMonth", getAccMonth())
+            .append("actId", getActId())
+            .append("billNo", getBillNo())
+            .append("corpId", getCorpId())
+            .append("transactId", getTransactId())
+            .append("fromDate", getFromDate())
+            .append("toDate", getToDate())
+            .append("amt", getAmt())
+            .append("refNo", getRefNo())
+            .append("postDate", getPostDate())
+            .append("billStatus", getBillStatus())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/domain/FTmsaccbillsFees.java

@@ -0,0 +1,243 @@
+package com.ruoyi.orderManagement.finance.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+
+import java.util.Date;
+import java.util.List;
+
+public class FTmsaccbillsFees {
+
+    /**
+     * 客户名称，t_corps 中的no或 name，模糊查找选择后，存储id，显示name
+     */
+    @Excel(name = "客户名称，t_corps 中的no或 name，模糊查找选择后，存储id，显示name")
+    private Long fCorpid;
+
+    /**
+     * 结算客户名称,t_corps 中的no或 name，模糊查找选择后，存储id，显示name
+     */
+    @Excel(name = "客户名称,t_corps 中的no或 name，模糊查找选择后，存储id，显示name")
+    private Long fToCorpid;
+
+    /**
+     * 提单号
+     */
+    @Excel(name = "提单号")
+    private String fMblno;
+
+    /**
+     * 收、付,D:收 C 付
+     */
+    @Excel(name = "收、付,D:收 C 付")
+    private String fDc;
+
+    /**
+     * 费用名称,存储id 显示名称,t_fees 中的no或 name，模糊查找选择后，存储f_id，显示name
+     */
+    @Excel(name = "费用名称,存储id 显示名称,t_fees 中的no或 name，模糊查找选择后，存储f_id，显示name")
+    private Long[] fFeeid;
+
+    /**
+     * 入（出）库日期
+     */
+    @Excel(name = "入", readConverterExp = "出=")
+    private Date fBsdate;
+
+    /**
+     * 账单日期(审批流结束后更新)
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "账单日期(审批流结束后更新)", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fAccbilldate;
+
+    /**
+     * 对账单号
+     */
+    @Excel(name = "对账单号")
+    private String fStatementNo;
+
+
+    /**
+     *  是否对账 0 否 1 是 ; 结算状态 0 未收 1 全部
+     */
+    @Excel(name = "对账")
+    private String fReconciliation;
+
+    /**
+     *   费用状态
+     */
+    @Excel(name = "费用状态")
+    private String fBillstatus;
+
+    /**
+     * 唛头
+     */
+    @Excel(name = "唛头")
+    private String fMarks;
+
+    /** 明细品名合计 */
+    @Excel(name = "明细品名合计")
+    private String fProductName;
+
+    /** 业务类型(存汉字的，用来区别 如: 来车提货,出库装箱  区别) */
+    @Excel(name = "业务类型(存汉字的，用来区别 如: 来车提货,出库装箱  区别)")
+    private Long []  fBusinessType;
+
+    /**
+     * 单据类型(数据字典)SJRK（入库） SJCK（实际出库） CKDB（调拨） HQZY（货权转移）
+     */
+    @Excel(name = "单据类型(数据字典)SJRK", readConverterExp = "入=库")
+    private String fBilltype;
+
+    /**
+     * 查询时间区间 审核日期
+     */
+    private List<String> timeExamine;
+
+    public List<String> getTimeExamine() {
+        return timeExamine;
+    }
+
+    public void setTimeExamine(List<String> timeExamine) {
+        this.timeExamine = timeExamine;
+    }
+
+
+    /**
+     * 查询时间区间 对账日期
+     */
+    private List<String> timeReconci;
+
+    public List<String> getTimeReconci() {
+        return timeReconci;
+    }
+
+    public void setTimeReconci(List<String> timeReconci) {
+        this.timeReconci = timeReconci;
+    }
+
+    /**
+     * 查询时间区间 入（出）库日期
+     */
+    private List<String> timeInterval;
+    public void settimeInterval(List<String> timeInterval) {
+        this.timeInterval = timeInterval;
+    }
+    public List<String> gettimeInterval() {
+        return timeInterval;
+    }
+
+
+    public String getfMarks() {
+        return fMarks;
+    }
+
+    public void setfMarks(String fMarks) {
+        this.fMarks = fMarks;
+    }
+
+    public String getfBillstatus() {
+        return fBillstatus;
+    }
+
+    public void setfBillstatus(String fBillstatus) {
+        this.fBillstatus = fBillstatus;
+    }
+
+    public String getfProductName() {
+        return fProductName;
+    }
+
+    public void setfProductName(String fProductName) {
+        this.fProductName = fProductName;
+    }
+
+    public String getfStatementNo() {
+        return fStatementNo;
+    }
+
+    public void setfStatementNo(String fStatementNo) {
+        this.fStatementNo = fStatementNo;
+    }
+
+    public Long getfCorpid() {
+        return fCorpid;
+    }
+
+    public void setfCorpid(Long fCorpid) {
+        this.fCorpid = fCorpid;
+    }
+
+    public Long getfToCorpid() {
+        return fToCorpid;
+    }
+
+    public void setfToCorpid(Long fToCorpid) {
+        this.fToCorpid = fToCorpid;
+    }
+
+    public String getfMblno() {
+        return fMblno;
+    }
+
+    public void setfMblno(String fMblno) {
+        this.fMblno = fMblno;
+    }
+
+    public String getfDc() {
+        return fDc;
+    }
+
+    public void setfDc(String fDc) {
+        this.fDc = fDc;
+    }
+
+    public Long[] getfFeeid() {
+        return fFeeid;
+    }
+
+    public void setfFeeid(Long[] fFeeid) {
+        this.fFeeid = fFeeid;
+    }
+
+    public Date getfBsdate() {
+        return fBsdate;
+    }
+
+    public void setfBsdate(Date fBsdate) {
+        this.fBsdate = fBsdate;
+    }
+
+    public Date getfAccbilldate() {
+        return fAccbilldate;
+    }
+
+    public void setfAccbilldate(Date fAccbilldate) {
+        this.fAccbilldate = fAccbilldate;
+    }
+
+    public String getfReconciliation() {
+        return fReconciliation;
+    }
+
+    public void setfReconciliation(String fReconciliation) {
+        this.fReconciliation = fReconciliation;
+    }
+
+    public Long[] getfBusinessType() {
+        return fBusinessType;
+    }
+
+    public void setfBusinessType(Long[] fBusinessType) {
+        this.fBusinessType = fBusinessType;
+    }
+
+    public String getfBilltype() {
+        return fBilltype;
+    }
+
+    public void setfBilltype(String fBilltype) {
+        this.fBilltype = fBilltype;
+    }
+}

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/domain/FTmsaccbillsitems.java

@@ -0,0 +1,225 @@
+package com.ruoyi.orderManagement.finance.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 财务明细对象 F_TMSACCBILLSITEMS
+ * 
+ * @author ruoyi
+ * @date 2021-03-14
+ */
+public class FTmsaccbillsitems extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 来源id */
+    @Excel(name = "来源id")
+    private Long srcId;
+
+    /** 活动号 */
+    @Excel(name = "活动号")
+    private Long actId;
+
+    /** orderbillsplans表 */
+    @Excel(name = "orderbillsplans表")
+    private String orderNo;
+
+    /** 收、付 */
+    @Excel(name = "收、付")
+    private String dc;
+
+    /** 应处理金额 */
+    @Excel(name = "应处理金额")
+    private BigDecimal amtOrg;
+
+    /** 已经处理金额 */
+    @Excel(name = "已经处理金额")
+    private BigDecimal amtStl;
+
+    /** 剩余金额 */
+    @Excel(name = "剩余金额")
+    private BigDecimal amtBlc;
+
+    /** 本次处理金额 */
+    @Excel(name = "本次处理金额")
+    private BigDecimal amtCur;
+
+    /** 状态(1新建，2暂存，6提交) */
+    @Excel(name = "状态(1新建，2暂存，6提交)")
+    private Long billStatus;
+
+    /** 删除状态 */
+    private String delFlag;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /**
+     * 来源id
+     */
+    @Excel(name = "来源id")
+    private Long fSrcid;
+
+
+    /**
+     * 来源id
+     */
+    @Excel(name = "来源id")
+    private Long fSrcpid;
+
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setSrcId(Long srcId) 
+    {
+        this.srcId = srcId;
+    }
+
+    public Long getSrcId() 
+    {
+        return srcId;
+    }
+    public void setActId(Long actId) 
+    {
+        this.actId = actId;
+    }
+
+    public Long getActId() 
+    {
+        return actId;
+    }
+    public void setOrderNo(String orderNo) 
+    {
+        this.orderNo = orderNo;
+    }
+
+    public String getOrderNo() 
+    {
+        return orderNo;
+    }
+    public void setDc(String dc) 
+    {
+        this.dc = dc;
+    }
+
+    public String getDc() 
+    {
+        return dc;
+    }
+    public void setAmtOrg(BigDecimal amtOrg) 
+    {
+        this.amtOrg = amtOrg;
+    }
+
+    public BigDecimal getAmtOrg() 
+    {
+        return amtOrg;
+    }
+    public void setAmtStl(BigDecimal amtStl) 
+    {
+        this.amtStl = amtStl;
+    }
+
+    public BigDecimal getAmtStl() 
+    {
+        return amtStl;
+    }
+    public void setAmtBlc(BigDecimal amtBlc) 
+    {
+        this.amtBlc = amtBlc;
+    }
+
+    public BigDecimal getAmtBlc() 
+    {
+        return amtBlc;
+    }
+    public void setAmtCur(BigDecimal amtCur) 
+    {
+        this.amtCur = amtCur;
+    }
+
+    public BigDecimal getAmtCur() 
+    {
+        return amtCur;
+    }
+    public void setBillStatus(Long billStatus) 
+    {
+        this.billStatus = billStatus;
+    }
+
+    public Long getBillStatus() 
+    {
+        return billStatus;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    public Long getfSrcid() {
+        return fSrcid;
+    }
+
+    public void setfSrcid(Long fSrcid) {
+        this.fSrcid = fSrcid;
+    }
+
+    public Long getfSrcpid() {
+        return fSrcpid;
+    }
+
+    public void setfSrcpid(Long fSrcpid) {
+        this.fSrcpid = fSrcpid;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("srcId", getSrcId())
+            .append("actId", getActId())
+            .append("orderNo", getOrderNo())
+            .append("dc", getDc())
+            .append("amtOrg", getAmtOrg())
+            .append("amtStl", getAmtStl())
+            .append("amtBlc", getAmtBlc())
+            .append("amtCur", getAmtCur())
+            .append("billStatus", getBillStatus())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/mapper/FTmsaccbillsMapper.java

@@ -0,0 +1,67 @@
+package com.ruoyi.orderManagement.finance.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.orderManagement.finance.domain.FTmsaccbills;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 财务主Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-12
+ */
+public interface FTmsaccbillsMapper 
+{
+    /**
+     * 查询财务主
+     * 
+     * @param id 财务主ID
+     * @return 财务主
+     */
+    public FTmsaccbills selectFTmsaccbillsById(Long id);
+
+    /**
+     * 查询财务主列表
+     * 
+     * @param fTmsaccbills 财务主
+     * @return 财务主集合
+     */
+    public List<FTmsaccbills> selectFTmsaccbillsList(FTmsaccbills fTmsaccbills);
+
+    /**
+     * 新增财务主
+     * 
+     * @param fTmsaccbills 财务主
+     * @return 结果
+     */
+    public int insertFTmsaccbills(FTmsaccbills fTmsaccbills);
+
+    /**
+     * 修改财务主
+     * 
+     * @param fTmsaccbills 财务主
+     * @return 结果
+     */
+    public int updateFTmsaccbills(FTmsaccbills fTmsaccbills);
+
+    /**
+     * 删除财务主
+     * 
+     * @param id 财务主ID
+     * @return 结果
+     */
+    public int deleteFTmsaccbillsById(Long id);
+
+    /**
+     * 批量删除财务主
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteFTmsaccbillsByIds(Long[] ids);
+
+    public List<Map<String, Object>> fTmsaccbillsListAccamount(@Param("map") Map<String, Object> map);
+
+}

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/mapper/FTmsaccbillsitemsMapper.java

@@ -0,0 +1,65 @@
+package com.ruoyi.orderManagement.finance.mapper;
+
+import com.ruoyi.orderManagement.finance.domain.FTmsaccbillsitems;
+
+import java.util.List;
+
+
+/**
+ * 财务明细Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-14
+ */
+public interface FTmsaccbillsitemsMapper 
+{
+    /**
+     * 查询财务明细
+     * 
+     * @param id 财务明细ID
+     * @return 财务明细
+     */
+    public FTmsaccbillsitems selectFTmsaccbillsitemsById(Long id);
+
+    /**
+     * 查询财务明细列表
+     * 
+     * @param fTmsaccbillsitems 财务明细
+     * @return 财务明细集合
+     */
+    public List<FTmsaccbillsitems> selectFTmsaccbillsitemsList(FTmsaccbillsitems fTmsaccbillsitems);
+
+    /**
+     * 新增财务明细
+     * 
+     * @param fTmsaccbillsitems 财务明细
+     * @return 结果
+     */
+    public int insertFTmsaccbillsitems(FTmsaccbillsitems fTmsaccbillsitems);
+
+    /**
+     * 修改财务明细
+     * 
+     * @param fTmsaccbillsitems 财务明细
+     * @return 结果
+     */
+    public int updateFTmsaccbillsitems(FTmsaccbillsitems fTmsaccbillsitems);
+
+    /**
+     * 删除财务明细
+     * 
+     * @param id 财务明细ID
+     * @return 结果
+     */
+    public int deleteFTmsaccbillsitemsById(Long id);
+
+    /**
+     * 批量删除财务明细
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteFTmsaccbillsitemsByIds(Long[] ids);
+
+    int deleteByFPid(Long fId);
+}

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/service/IFTmsaccbillsService.java

@@ -0,0 +1,74 @@
+package com.ruoyi.orderManagement.finance.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.finance.domain.TWareHouseFees;
+import com.ruoyi.orderManagement.finance.domain.FTmsaccbills;
+import com.ruoyi.orderManagement.finance.domain.FTmsaccbillsFees;
+
+
+/**
+ * 财务主Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-12
+ */
+public interface IFTmsaccbillsService 
+{
+    /**
+     * 查询财务主
+     * 
+     * @param id 财务主ID
+     * @return 财务主
+     */
+    public FTmsaccbills selectFTmsaccbillsById(Long id);
+
+    public Map<String, Object> selectFTmsaccbillsAndItemsById(Long fId);
+
+    /**
+     * 查询财务主列表
+     * 
+     * @param fTmsaccbills 财务主
+     * @return 财务主集合
+     */
+    public List<FTmsaccbills> selectFTmsaccbillsList(FTmsaccbills fTmsaccbills);
+
+    /**
+     * 新增财务主
+     * 
+     * @param fTmsaccbills 财务主
+     * @return 结果
+     */
+    public int insertFTmsaccbills(FTmsaccbills fTmsaccbills);
+
+    /**
+     * 修改财务主
+     * 
+     * @param fTmsaccbills 财务主
+     * @return 结果
+     */
+    public int updateFTmsaccbills(FTmsaccbills fTmsaccbills);
+
+    /**
+     * 批量删除财务主
+     * 
+     * @param ids 需要删除的财务主ID
+     * @return 结果
+     */
+    public int deleteFTmsaccbillsByIds(Long[] ids);
+
+    /**
+     * 删除财务主信息
+     * 
+     * @param id 财务主ID
+     * @return 结果
+     */
+    public int deleteFTmsaccbillsById(Long id);
+
+    public List<Map<String, Object>> fTmsaccbillsList(FTmsaccbillsFees fTmsaccbillsFees, String billsType);
+
+    public AjaxResult insertTFeeTFeeDo(String tfee, String tfeeDo , LoginUser loginUser, String fBilltype);
+}

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/service/IFTmsaccbillsitemsService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.orderManagement.finance.service;
+
+import com.ruoyi.orderManagement.finance.domain.FTmsaccbillsitems;
+
+import java.util.List;
+
+
+/**
+ * 财务明细Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-03-14
+ */
+public interface IFTmsaccbillsitemsService 
+{
+    /**
+     * 查询财务明细
+     * 
+     * @param id 财务明细ID
+     * @return 财务明细
+     */
+    public FTmsaccbillsitems selectFTmsaccbillsitemsById(Long id);
+
+    /**
+     * 查询财务明细列表
+     * 
+     * @param fTmsaccbillsitems 财务明细
+     * @return 财务明细集合
+     */
+    public List<FTmsaccbillsitems> selectFTmsaccbillsitemsList(FTmsaccbillsitems fTmsaccbillsitems);
+
+    /**
+     * 新增财务明细
+     * 
+     * @param fTmsaccbillsitems 财务明细
+     * @return 结果
+     */
+    public int insertFTmsaccbillsitems(FTmsaccbillsitems fTmsaccbillsitems);
+
+    /**
+     * 修改财务明细
+     * 
+     * @param fTmsaccbillsitems 财务明细
+     * @return 结果
+     */
+    public int updateFTmsaccbillsitems(FTmsaccbillsitems fTmsaccbillsitems);
+
+    /**
+     * 批量删除财务明细
+     * 
+     * @param ids 需要删除的财务明细ID
+     * @return 结果
+     */
+    public int deleteFTmsaccbillsitemsByIds(Long[] ids);
+
+    /**
+     * 删除财务明细信息
+     * 
+     * @param id 财务明细ID
+     * @return 结果
+     */
+    public int deleteFTmsaccbillsitemsById(Long id);
+}

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/service/impl/FTmsaccbillsServiceImpl.java

@@ -0,0 +1,267 @@
+package com.ruoyi.orderManagement.finance.service.impl;
+
+import java.util.*;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.basicData.domain.TCorps;
+import com.ruoyi.basicData.domain.TFees;
+import com.ruoyi.basicData.mapper.TCorpsMapper;
+import com.ruoyi.basicData.mapper.TFeesMapper;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.orderManagement.domain.Ftmsorderbills;
+import com.ruoyi.orderManagement.domain.Ftmsorderbillscars;
+import com.ruoyi.orderManagement.finance.domain.FTmsaccbills;
+import com.ruoyi.orderManagement.finance.domain.FTmsaccbillsFees;
+import com.ruoyi.orderManagement.finance.domain.FTmsaccbillsitems;
+import com.ruoyi.orderManagement.finance.mapper.FTmsaccbillsMapper;
+import com.ruoyi.orderManagement.finance.mapper.FTmsaccbillsitemsMapper;
+import com.ruoyi.orderManagement.finance.service.IFTmsaccbillsService;
+import com.ruoyi.orderManagement.mapper.FtmsorderbillsMapper;
+import com.ruoyi.orderManagement.mapper.FtmsorderbillscarsMapper;
+import com.ruoyi.orderManagement.statusTracking.domain.Ftmsorderbillsfees;
+import com.ruoyi.orderManagement.statusTracking.mapper.FtmsorderbillsfeesMapper;
+import com.ruoyi.system.service.ISysDictDataService;
+import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
+import com.ruoyi.warehouseBusiness.domain.TWarehousebillsfees;
+import com.ruoyi.warehouseBusiness.service.impl.BillnoSerialServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 财务主Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-03-12
+ */
+@Service
+public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService
+{
+    @Autowired
+    private FTmsaccbillsMapper fTmsaccbillsMapper;
+
+    @Autowired
+    private BillnoSerialServiceImpl billnoSerialServiceImpl;
+
+    @Autowired
+    private FTmsaccbillsitemsMapper fTmsaccbillsitemsMapper;
+
+    @Autowired
+    private FtmsorderbillsfeesMapper ftmsorderbillsfeesMapper;
+    @Autowired
+    private FtmsorderbillsMapper ftmsorderbillsMapper;
+    @Autowired
+    private FtmsorderbillscarsMapper ftmsorderbillscarsMapper;
+
+    @Autowired
+    private TCorpsMapper tCorpsMapper;
+
+    @Autowired
+    private TFeesMapper tFeesMapper;
+
+    @Autowired
+    private ISysDictDataService iSysDictDataService;
+
+    /**
+     * 查询财务主
+     * 
+     * @param id 财务主ID
+     * @return 财务主
+     */
+    @Override
+    public FTmsaccbills selectFTmsaccbillsById(Long id)
+    {
+        return fTmsaccbillsMapper.selectFTmsaccbillsById(id);
+    }
+
+    @Override
+    public Map<String, Object> selectFTmsaccbillsAndItemsById(Long fId) {
+        Map<String, Object> map = new HashMap<>();
+        // 客户表
+        List<Long> corpsId = new ArrayList<>();
+        // 费用
+        List<Long> feesId = new ArrayList<>();
+
+        FTmsaccbills fTmsaccbills = fTmsaccbillsMapper.selectFTmsaccbillsById(fId);
+        if (StringUtils.isNotNull(fTmsaccbills.getCorpId())) {
+            corpsId.add(fTmsaccbills.getCorpId());
+        }
+
+        // 查询从表数据
+        FTmsaccbillsitems fTmsaccbillsitems = new FTmsaccbillsitems();
+        fTmsaccbillsitems.setSrcId(fId);
+        List<FTmsaccbillsitems> fTmsaccbillsitemsList=  fTmsaccbillsitemsMapper.selectFTmsaccbillsitemsList(fTmsaccbillsitems);
+        List<Map<String, Object>> feeDoList=new ArrayList<>();
+        if (StringUtils.isNotEmpty(fTmsaccbillsitemsList)) {
+            for (FTmsaccbillsitems  fees : fTmsaccbillsitemsList) {
+                Map<String, Object> map1 = new HashMap<>();
+                // 主表数据  cars --> bills
+                Ftmsorderbillsfees ftmsorderbillsfees = ftmsorderbillsfeesMapper.selectFTmsorderbillsfeesById(fees.getfSrcid());
+                Ftmsorderbills ftmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(fees.getfSrcpid());
+                TFees tFees= tFeesMapper.selectTFeesById(ftmsorderbillsfees.getfFeeid());
+                // 字典宝
+                SysDictData sysDictData =new SysDictData();
+                sysDictData.setDictType("data_unitfees");
+                sysDictData.setDictValue(String.valueOf(ftmsorderbillsfees.getfFeeunitid()));
+                sysDictData.setStatus("0");
+                List<SysDictData> sysDictDataList = iSysDictDataService.selectDictDataList(sysDictData);
+
+
+                map1.put("fSrcid",fees.getfSrcid());
+                map1.put("fSrcpid",fees.getfSrcpid());
+                map1.put("fMblno",ftmsorderbills.getMblno());
+                map1.put("fFeeName",tFees.getfName());
+                map1.put("fSrcdc",fees.getDc());
+                map1.put("fFeeunitid",sysDictDataList.get(0).getDictLabel());
+                map1.put("fQty",ftmsorderbillsfees.getfQty()); // 费用表的金额
+                map1.put("amtOrg",fees.getAmtOrg());
+                map1.put("amtStl",fees.getAmtStl());
+
+
+                feeDoList.add(map1);
+            }
+        }
+
+        List<TCorps> corpsList = new ArrayList<>();
+        List<Long> corpsIdList = StringUtils.integerDeduplication(corpsId);
+        for (Long corpId : corpsIdList) {
+            TCorps corps = tCorpsMapper.selectTCorpsById(corpId);
+            if (StringUtils.isNotNull(corps)) {
+                corpsList.add(corps);
+            }
+        }
+        List<TFees> feesList = new ArrayList<>();
+        List<Long> longList = StringUtils.integerDeduplication(feesId);
+        for (Long fees : longList) {
+            TFees tFees = tFeesMapper.selectTFeesById(fees);
+            if (StringUtils.isNotNull(tFees)) {
+                feesList.add(tFees);
+            }
+        }
+        map.put("tFee",fTmsaccbills);
+        map.put("corps",corpsList);
+        map.put("feesList", feesList);
+        map.put("feeDoList",feeDoList);
+        return map;
+    }
+
+    /**
+     * 查询财务主列表
+     * 
+     * @param fTmsaccbills 财务主
+     * @return 财务主
+     */
+    @Override
+    public List<FTmsaccbills> selectFTmsaccbillsList(FTmsaccbills fTmsaccbills)
+    {
+        return fTmsaccbillsMapper.selectFTmsaccbillsList(fTmsaccbills);
+    }
+
+    /**
+     * 新增财务主
+     * 
+     * @param fTmsaccbills 财务主
+     * @return 结果
+     */
+    @Override
+    public int insertFTmsaccbills(FTmsaccbills fTmsaccbills)
+    {
+        fTmsaccbills.setCreateTime(DateUtils.getNowDate());
+        return fTmsaccbillsMapper.insertFTmsaccbills(fTmsaccbills);
+    }
+
+    /**
+     * 修改财务主
+     * 
+     * @param fTmsaccbills 财务主
+     * @return 结果
+     */
+    @Override
+    public int updateFTmsaccbills(FTmsaccbills fTmsaccbills)
+    {
+        fTmsaccbills.setUpdateTime(DateUtils.getNowDate());
+        return fTmsaccbillsMapper.updateFTmsaccbills(fTmsaccbills);
+    }
+
+    /**
+     * 批量删除财务主
+     * 
+     * @param ids 需要删除的财务主ID
+     * @return 结果
+     */
+    @Override
+    public int deleteFTmsaccbillsByIds(Long[] ids)
+    {
+        return fTmsaccbillsMapper.deleteFTmsaccbillsByIds(ids);
+    }
+
+    /**
+     * 删除财务主信息
+     * 
+     * @param id 财务主ID
+     * @return 结果
+     */
+    @Override
+    public int deleteFTmsaccbillsById(Long id)
+    {
+        return fTmsaccbillsMapper.deleteFTmsaccbillsById(id);
+    }
+
+    @Override
+    public List<Map<String, Object>> fTmsaccbillsList(FTmsaccbillsFees fTmsaccbillsFees, String billsType) {
+        List<Map<String, Object>> maps =new ArrayList<Map<String, Object>>();
+        Map<String, Object> map = new HashMap<>();
+        map.put("tWareHouseFees", fTmsaccbillsFees);
+        List<Map<String, Object>> mapList =new ArrayList<>();
+        if(billsType.equals("DZ")){
+            mapList = fTmsaccbillsMapper.fTmsaccbillsListAccamount(map);
+        } else{
+           // mapList = fTmsaccbillsMapper.warehouseBillsFeesList(map);
+        }
+        return mapList;
+    }
+
+    @Override
+    public AjaxResult insertTFeeTFeeDo(String tfee, String tfeeDo, LoginUser loginUser, String fBilltype) {
+        Long fPid = null;
+        Map<String, Object> map = new HashMap<>();
+        FTmsaccbills fTmsaccbills = JSONArray.parseObject(tfee, FTmsaccbills.class);
+        if (StringUtils.isNull(fTmsaccbills.getId())) {
+            // 如果是新数据
+            fTmsaccbills.setCreateBy(loginUser.getUser().getUserName());
+            fTmsaccbills.setCreateTime(new Date());
+            // 业务编码
+            Date time = new Date();
+            String billNo = billnoSerialServiceImpl.getBillNo(fBilltype, time);
+            fTmsaccbills.setfBillno(billNo);
+            fTmsaccbills.setfBilltype(fBilltype);
+            fTmsaccbillsMapper.insertFTmsaccbills(fTmsaccbills);
+            fPid = fTmsaccbills.getId();
+        } else {
+            fPid = fTmsaccbills.getId();
+            fTmsaccbills.setUpdateBy(loginUser.getUser().getUserName());
+            fTmsaccbills.setUpdateTime(new Date());
+            fTmsaccbillsMapper.updateFTmsaccbills(fTmsaccbills);
+            // 删除从表
+            fTmsaccbillsitemsMapper.deleteByFPid(fPid);
+        }
+        //  财务从表
+        if (StringUtils.isNotNull(tfeeDo)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(tfeeDo);
+            List<FTmsaccbillsitems> tFeeDoList = JSONObject.parseArray(jsonDrArray.toJSONString(), FTmsaccbillsitems.class);
+            for (FTmsaccbillsitems tFeeDo : tFeeDoList) {
+                tFeeDo.setSrcId(fPid);
+                tFeeDo.setCreateBy(loginUser.getUser().getUserName());
+                tFeeDo.setCreateTime(new Date());
+                fTmsaccbillsitemsMapper.insertFTmsaccbillsitems(tFeeDo);
+            }
+        }
+        map.put("tFee", fTmsaccbills);
+        return AjaxResult.success("成功", map);
+    }
+}

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/service/impl/FTmsaccbillsitemsServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.orderManagement.finance.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.orderManagement.finance.domain.FTmsaccbillsitems;
+import com.ruoyi.orderManagement.finance.mapper.FTmsaccbillsitemsMapper;
+import com.ruoyi.orderManagement.finance.service.IFTmsaccbillsitemsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 财务明细Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-03-14
+ */
+@Service
+public class FTmsaccbillsitemsServiceImpl implements IFTmsaccbillsitemsService
+{
+    @Autowired
+    private FTmsaccbillsitemsMapper fTmsaccbillsitemsMapper;
+
+    /**
+     * 查询财务明细
+     * 
+     * @param id 财务明细ID
+     * @return 财务明细
+     */
+    @Override
+    public FTmsaccbillsitems selectFTmsaccbillsitemsById(Long id)
+    {
+        return fTmsaccbillsitemsMapper.selectFTmsaccbillsitemsById(id);
+    }
+
+    /**
+     * 查询财务明细列表
+     * 
+     * @param fTmsaccbillsitems 财务明细
+     * @return 财务明细
+     */
+    @Override
+    public List<FTmsaccbillsitems> selectFTmsaccbillsitemsList(FTmsaccbillsitems fTmsaccbillsitems)
+    {
+        return fTmsaccbillsitemsMapper.selectFTmsaccbillsitemsList(fTmsaccbillsitems);
+    }
+
+    /**
+     * 新增财务明细
+     * 
+     * @param fTmsaccbillsitems 财务明细
+     * @return 结果
+     */
+    @Override
+    public int insertFTmsaccbillsitems(FTmsaccbillsitems fTmsaccbillsitems)
+    {
+        fTmsaccbillsitems.setCreateTime(DateUtils.getNowDate());
+        return fTmsaccbillsitemsMapper.insertFTmsaccbillsitems(fTmsaccbillsitems);
+    }
+
+    /**
+     * 修改财务明细
+     * 
+     * @param fTmsaccbillsitems 财务明细
+     * @return 结果
+     */
+    @Override
+    public int updateFTmsaccbillsitems(FTmsaccbillsitems fTmsaccbillsitems)
+    {
+        fTmsaccbillsitems.setUpdateTime(DateUtils.getNowDate());
+        return fTmsaccbillsitemsMapper.updateFTmsaccbillsitems(fTmsaccbillsitems);
+    }
+
+    /**
+     * 批量删除财务明细
+     * 
+     * @param ids 需要删除的财务明细ID
+     * @return 结果
+     */
+    @Override
+    public int deleteFTmsaccbillsitemsByIds(Long[] ids)
+    {
+        return fTmsaccbillsitemsMapper.deleteFTmsaccbillsitemsByIds(ids);
+    }
+
+    /**
+     * 删除财务明细信息
+     * 
+     * @param id 财务明细ID
+     * @return 结果
+     */
+    @Override
+    public int deleteFTmsaccbillsitemsById(Long id)
+    {
+        return fTmsaccbillsitemsMapper.deleteFTmsaccbillsitemsById(id);
+    }
+}

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/impl/FtmsorderbillsfeesServiceImpl.java

@@ -1,90 +0,0 @@
-package com.ruoyi.orderManagement.service.impl;
-
-import java.util.List;
-
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.orderManagement.domain.Ftmsorderbillsfees;
-import com.ruoyi.orderManagement.mapper.FtmsorderbillsfeesMapper;
-import com.ruoyi.orderManagement.service.IftmsorderbillsfeesService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 订单费用Service业务层处理
- *
- * @author ruoyi
- * @date 2021-02-22
- */
-@Service
-public class FtmsorderbillsfeesServiceImpl implements IftmsorderbillsfeesService {
-    @Autowired
-    private FtmsorderbillsfeesMapper fTmsorderbillsfeesMapper;
-
-    /**
-     * 查询车队费用
-     *
-     * @param fId 车队费用ID
-     * @return 车队费用
-     */
-    @Override
-    public Ftmsorderbillsfees selectFTmsorderbillsfeesById(Long fId) {
-        return fTmsorderbillsfeesMapper.selectFTmsorderbillsfeesById(fId);
-    }
-
-    /**
-     * 查询车队费用列表
-     *
-     * @param fTmsorderbillsfees 车队费用
-     * @return 车队费用
-     */
-    @Override
-    public List<Ftmsorderbillsfees> selectFTmsorderbillsfeesList(Ftmsorderbillsfees fTmsorderbillsfees) {
-        return fTmsorderbillsfeesMapper.selectFTmsorderbillsfeesList(fTmsorderbillsfees);
-    }
-
-    /**
-     * 新增车队费用
-     *
-     * @param fTmsorderbillsfees 车队费用
-     * @return 结果
-     */
-    @Override
-    public int insertFTmsorderbillsfees(Ftmsorderbillsfees fTmsorderbillsfees) {
-        fTmsorderbillsfees.setCreateTime(DateUtils.getNowDate());
-        return fTmsorderbillsfeesMapper.insertFTmsorderbillsfees(fTmsorderbillsfees);
-    }
-
-    /**
-     * 修改车队费用
-     *
-     * @param fTmsorderbillsfees 车队费用
-     * @return 结果
-     */
-    @Override
-    public int updateFTmsorderbillsfees(Ftmsorderbillsfees fTmsorderbillsfees) {
-        fTmsorderbillsfees.setUpdateTime(DateUtils.getNowDate());
-        return fTmsorderbillsfeesMapper.updateFTmsorderbillsfees(fTmsorderbillsfees);
-    }
-
-    /**
-     * 批量删除车队费用
-     *
-     * @param fIds 需要删除的车队费用ID
-     * @return 结果
-     */
-    @Override
-    public int deleteFTmsorderbillsfeesByIds(Long[] fIds) {
-        return fTmsorderbillsfeesMapper.deleteFTmsorderbillsfeesByIds(fIds);
-    }
-
-    /**
-     * 删除车队费用信息
-     *
-     * @param fId 车队费用ID
-     * @return 结果
-     */
-    @Override
-    public int deleteFTmsorderbillsfeesById(Long fId) {
-        return fTmsorderbillsfeesMapper.deleteFTmsorderbillsfeesById(fId);
-    }
-}

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/statusTracking/mapper/FtmsorderbillsfeesMapper.java

@@ -65,4 +65,6 @@ public interface FtmsorderbillsfeesMapper {
      * @return  结果
      */
     public int deleteFTmsorderbillsfeesByPId(long pId);
+
+    public int deleteFTmsorderbillsfeesByPIdAndActId(long pId);
 }

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/statusTracking/service/impl/FtmsorderbillsfeesServiceImpl.java

@@ -161,17 +161,17 @@ public class FtmsorderbillsfeesServiceImpl implements IftmsorderbillsfeesService
         if (StringUtils.isNotNull(Ftmsorderbillsfees) && !"[]".equals(Ftmsorderbillsfees)) {
             JSONArray jsonDrArray = JSONArray.parseArray(Ftmsorderbillsfees);
             List<Ftmsorderbillsfees> ftmsorderbillsfeesList = JSONObject.parseArray(jsonDrArray.toJSONString(), Ftmsorderbillsfees.class);
+            // 删除1080数据 统一添加
+            id = ftmsorderbillsfeesList.get(0).getfPid();
+            fTmsorderbillsfeesMapper.deleteFTmsorderbillsfeesByPIdAndActId(id);
             for (Ftmsorderbillsfees ftmsorderbillsfees : ftmsorderbillsfeesList) {
                 // 只处理新追加的数据
-                if(StringUtils.isNull(ftmsorderbillsfees.getfId())){
-                    ftmsorderbillsfees.setfPid(ftmsorderbillsfees.getfPid());
-                    ftmsorderbillsfees.setActId(1080L); // 追加费用
+                if(null!=ftmsorderbillsfees.getActId() &&  ftmsorderbillsfees.getActId()==1080 ){
                     ftmsorderbillsfees.setOrgId(ftmsorderbillsfees.getfPid());
                     ftmsorderbillsfees.setCreateBy(SecurityUtils.getUsername());
                     ftmsorderbillsfees.setCreateTime(new Date());
                     fTmsorderbillsfeesMapper.insertFTmsorderbillsfees(ftmsorderbillsfees);
                 }
-                id= ftmsorderbillsfees.getfPid();
             }
         }
         Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();

ruoyi-fleet/src/main/resources/mapper/finance/FTmsaccbillsMapper.xml

@@ -0,0 +1,300 @@
+<?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.ruoyi.orderManagement.finance.mapper.FTmsaccbillsMapper">
+    
+    <resultMap type="FTmsaccbills" id="FTmsaccbillsResult">
+        <result property="id"    column="id"    />
+        <result property="accYear"    column="acc_year"    />
+        <result property="accMonth"    column="acc_month"    />
+        <result property="actId"    column="act_id"    />
+        <result property="billNo"    column="bill_no"    />
+        <result property="corpId"    column="corp_id"    />
+        <result property="transactId"    column="transact_id"    />
+        <result property="fromDate"    column="from_date"    />
+        <result property="toDate"    column="to_date"    />
+        <result property="amt"    column="amt"    />
+        <result property="refNo"    column="ref_no"    />
+        <result property="postDate"    column="post_date"    />
+        <result property="billStatus"    column="bill_status"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="fCtrlcorpid"    column="f_ctrlcorpid"    />
+        <result property="tMblno"    column="t_mblno"    />
+        <result property="fBilltype"    column="f_billtype"    />
+        <result property="fAccbilldate"    column="f_accbilldate"    />
+        <result property="fBillno"    column="f_billno"    />
+    </resultMap>
+
+    <sql id="selectFTmsaccbillsVo">
+        select id, acc_year, acc_month, act_id, bill_no, corp_id, transact_id, from_date, to_date, amt, ref_no, post_date, bill_status, del_flag, create_by, create_time, update_by, update_time, remarks ,
+               f_ctrlcorpid ,t_mblno ,f_billtype,f_accbilldate,f_billno   from F_TMSACCBILLS
+    </sql>
+
+    <select id="selectFTmsaccbillsList" parameterType="FTmsaccbills" resultMap="FTmsaccbillsResult">
+        <include refid="selectFTmsaccbillsVo"/>
+        <where>  
+            <if test="accYear != null "> and acc_year = #{accYear}</if>
+            <if test="accMonth != null "> and acc_month = #{accMonth}</if>
+            <if test="actId != null "> and act_id = #{actId}</if>
+            <if test="billNo != null  and billNo != ''"> and bill_no = #{billNo}</if>
+            <if test="corpId != null "> and corp_id = #{corpId}</if>
+            <if test="transactId != null "> and transact_id = #{transactId}</if>
+            <if test="fromDate != null "> and from_date = #{fromDate}</if>
+            <if test="toDate != null "> and to_date = #{toDate}</if>
+            <if test="amt != null "> and amt = #{amt}</if>
+            <if test="refNo != null  and refNo != ''"> and ref_no = #{refNo}</if>
+            <if test="postDate != null "> and post_date = #{postDate}</if>
+            <if test="billStatus != null "> and bill_status = #{billStatus}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectFTmsaccbillsById" parameterType="Long" resultMap="FTmsaccbillsResult">
+        <include refid="selectFTmsaccbillsVo"/>
+        where id = #{id}
+    </select>
+
+
+    <insert id="insertFTmsaccbills" parameterType="FTmsaccbills" useGeneratedKeys="true" keyProperty="id">
+        insert into F_TMSACCBILLS
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="accYear != null">acc_year,</if>
+            <if test="accMonth != null">acc_month,</if>
+            <if test="actId != null">act_id,</if>
+            <if test="billNo != null">bill_no,</if>
+            <if test="corpId != null">corp_id,</if>
+            <if test="transactId != null">transact_id,</if>
+            <if test="fromDate != null">from_date,</if>
+            <if test="toDate != null">to_date,</if>
+            <if test="amt != null">amt,</if>
+            <if test="refNo != null">ref_no,</if>
+            <if test="postDate != null">post_date,</if>
+            <if test="billStatus != null">bill_status,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="fCtrlcorpid != null">f_ctrlcorpid,</if>
+            <if test="tMblno != null">t_mblno,</if>
+            <if test="fBilltype != null">f_billtype,</if>
+            <if test="fAccbilldate != null">f_accbilldate,</if>
+            <if test="fBillno != null">f_billno,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="accYear != null">#{accYear},</if>
+            <if test="accMonth != null">#{accMonth},</if>
+            <if test="actId != null">#{actId},</if>
+            <if test="billNo != null">#{billNo},</if>
+            <if test="corpId != null">#{corpId},</if>
+            <if test="transactId != null">#{transactId},</if>
+            <if test="fromDate != null">#{fromDate},</if>
+            <if test="toDate != null">#{toDate},</if>
+            <if test="amt != null">#{amt},</if>
+            <if test="refNo != null">#{refNo},</if>
+            <if test="postDate != null">#{postDate},</if>
+            <if test="billStatus != null">#{billStatus},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="fCtrlcorpid != null">#{fCtrlcorpid},</if>
+            <if test="tMblno != null">#{tMblno},</if>
+            <if test="fBilltype != null">#{fBilltype},</if>
+            <if test="fAccbilldate != null">#{fAccbilldate},</if>
+            <if test="fBillno != null">#{fBillno},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFTmsaccbills" parameterType="FTmsaccbills">
+        update F_TMSACCBILLS
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="accYear != null">acc_year = #{accYear},</if>
+            <if test="accMonth != null">acc_month = #{accMonth},</if>
+            <if test="actId != null">act_id = #{actId},</if>
+            <if test="billNo != null">bill_no = #{billNo},</if>
+            <if test="corpId != null">corp_id = #{corpId},</if>
+            <if test="transactId != null">transact_id = #{transactId},</if>
+            <if test="fromDate != null">from_date = #{fromDate},</if>
+            <if test="toDate != null">to_date = #{toDate},</if>
+            <if test="amt != null">amt = #{amt},</if>
+            <if test="refNo != null">ref_no = #{refNo},</if>
+            <if test="postDate != null">post_date = #{postDate},</if>
+            <if test="billStatus != null">bill_status = #{billStatus},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteFTmsaccbillsById" parameterType="Long">
+        delete from F_TMSACCBILLS where id = #{id}
+    </delete>
+
+    <delete id="deleteFTmsaccbillsByIds" parameterType="String">
+        delete from F_TMSACCBILLS where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="fTmsaccbillsListAccamount" resultType="java.util.Map">
+        SELECT
+            w.f_id AS fSrcid,
+            t.id AS fSrcpid,
+            t.corp_id AS fCorpid,
+            c.f_name AS fName,
+            w.fName AS fFeesName,
+            w.f_mblno AS fMblno,
+            w.f_product_name AS fProductName,
+            w.f_bsdate AS fBsdate,
+            t.bill_type AS fBilltype,
+            w.f_review_date AS fReviewDate,
+            w.f_marks AS fMarks,
+            w.f_feeid AS fFeeid,
+            w.f_billtype AS fBilltype,
+            w.f_chargedate AS fChargedate,
+            w.f_originalbilldate AS fOriginalbilldate,
+            w.f_billing_deadline AS fBillingDeadline,
+            w.f_billing_days AS fBillingDays,
+            w.f_inventory_days AS fInventoryDays,
+            f.f_name AS fFeeName,
+            w.f_dc AS fSrcdc,
+            ifnull( w.f_amount, 0 ) - ifnull( w.f_accamount, 0 ) AS fAmtdr,
+            ifnull( w.f_amount, 0 ) - ifnull( w.f_accamount, 0 ) AS fAmt,
+            w.f_qty AS fQty,
+            w.f_unitprice AS fUnitprice
+        FROM
+            f_tmsorderbills t
+            LEFT JOIN t_corps c ON c.f_id = t.corp_id
+            LEFT JOIN f_tmsorderbillscars car ON car.p_id = t.id
+            LEFT JOIN (
+                SELECT
+                f.f_id,
+                f.f_pid,
+                f.act_id,
+                f.org_id,
+                f.f_lineno,
+                f.f_corpid,
+                f.f_feeid,
+                f.f_feeUnitid,
+                f.f_qty,
+                f.f_unitprice,
+                f.f_amount,
+                f.f_currency,
+                f.f_exrate,
+                f.f_taxrate,
+                f.f_dc,
+                f.f_review_date,
+                f.f_billstatus,
+                f.f_statement_no,
+                f.f_accamount,
+                f.f_accamount_date,
+                f.f_stlamount_no,
+                f.f_stlamount,
+                f.f_stlamount_date,
+                f.f_invnos,
+                f.f_invamount,
+                f.f_askamount,
+                f.f_status,
+                f.del_flag,
+                f.create_by,
+                f.update_by,
+                f.create_time,
+                f.update_time,
+                f.remark,
+                f.src_id,
+                f.src_bill_no,
+                f.f_mblno,
+                f.f_product_name,
+                f.f_marks,
+                f.f_chargedate,
+                f.f_billing_deadline,
+                f.f_inventory_days,
+                f.f_amt,
+                f.f_billing_days,
+                f.f_billing_qty,
+                f.f_billtype,
+                f.f_billingway,
+                f.f_bsdate,
+                f.f_originalbilldate,
+                f.f_stltypeid,
+                f.remarks,
+                c.f_id AS fId,
+                c.f_name AS fName
+                FROM
+                f_tmsorderbillsfees AS f
+                LEFT JOIN t_corps AS c ON f.f_corpid = c.f_id
+                ) w ON w.f_pid = car.id
+            LEFT JOIN t_fees f ON w.f_feeid = f.f_id
+            LEFT JOIN sys_dict_data dict ON dict.dict_value = w.f_feeUnitid
+        <where>
+            dict.status = '0'
+            AND dict.dict_type = 'data_unitfees'
+            <if test="map.tWareHouseFees.fCorpid != null  and map.tWareHouseFees.fCorpid != ''">and t.corp_id = #{map.tWareHouseFees.fCorpid} </if>
+            <if test="map.tWareHouseFees.fToCorpid != null  and map.tWareHouseFees.fToCorpid != ''">and w.f_corpid = #{map.tWareHouseFees.fToCorpid} </if>
+            <if test="map.tWareHouseFees.fMblno != null  and map.tWareHouseFees.fMblno != ''">and w.f_mblno  like concat('%', #{map.tWareHouseFees.fMblno}, '%') </if>
+            <if test="map.tWareHouseFees.fStatementNo != null and map.tWareHouseFees.fStatementNo != ''">and w.f_statement_no  like concat('%', #{map.tWareHouseFees.fStatementNo}, '%') </if>
+
+            <if test='map.tWareHouseFees.fReconciliation != null and map.tWareHouseFees.fReconciliation != "" and map.tWareHouseFees.fReconciliation == "1" '>
+                and w.f_accamount_date IS NOT NULL
+            </if>
+            <if test='map.tWareHouseFees.fReconciliation != null and map.tWareHouseFees.fReconciliation != "" and map.tWareHouseFees.fReconciliation == "0" '>
+                and w.f_accamount_date IS  NULL
+            </if>
+
+            <if test='map.tWareHouseFees.fDc != null and map.tWareHouseFees.fDc != "" and map.tWareHouseFees.fDc == "D" '>
+                and w.f_dc = #{map.tWareHouseFees.fDc}
+            </if>
+            <if test='map.tWareHouseFees.fDc != null and map.tWareHouseFees.fDc != "" and map.tWareHouseFees.fDc == "C" '>
+                and w.f_dc = #{map.tWareHouseFees.fDc}
+            </if>
+            <if test="map.tWareHouseFees.fFeeid != null  and  map.tWareHouseFees.fFeeid != '' ">
+                and  w.f_feeid in
+                <foreach collection="map.tWareHouseFees.fFeeid" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+            <if test='map.tWareHouseFees.timeExamine != null and map.tWareHouseFees.timeExamine[0] != null and map.tWareHouseFees.timeExamine[0]!= ""'>
+                and w.f_review_date &gt;= #{map.tWareHouseFees.timeExamine[0]}
+            </if>
+            <if test='map.tWareHouseFees.timeExamine != null and map.tWareHouseFees.timeExamine[1] != null and map.tWareHouseFees.timeExamine[1]!= ""'>
+                and w.f_review_date &lt;= #{map.tWareHouseFees.timeExamine[1]}
+            </if>
+            <if test='map.tWareHouseFees.timeInterval != null and map.tWareHouseFees.timeInterval[0] != null and map.tWareHouseFees.timeInterval[0]!= ""'>
+                and t.f_bsdate &gt;= #{map.tWareHouseFees.timeInterval[0]}
+            </if>
+            <if test='map.tWareHouseFees.timeInterval != null and map.tWareHouseFees.timeInterval[1] != null and map.tWareHouseFees.timeInterval[1]!= ""'>
+                and t.f_bsdate &lt;= #{map.tWareHouseFees.timeInterval[1]}
+            </if>
+            <if test='map.tWareHouseFees.timeReconci != null and map.tWareHouseFees.timeReconci[0] != null and map.tWareHouseFees.timeReconci[0]!= ""'>
+                and w.f_accamount_date &gt;= #{map.tWareHouseFees.timeReconci[0]}
+            </if>
+            <if test='map.tWareHouseFees.timeReconci != null and map.tWareHouseFees.timeReconci[1] != null and map.tWareHouseFees.timeReconci[1]!= ""'>
+                and w.f_accamount_date &lt;= #{map.tWareHouseFees.timeReconci[1]}
+            </if>
+            <if test="map.tWareHouseFees.fBusinessType != null  and map.tWareHouseFees.fBusinessType != '' ">
+                and  w.f_business_type in
+                <foreach collection="map.tWareHouseFees.fBusinessType" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+            and  w.f_review_date IS NOT NULL
+            and  ifnull(w.f_amount, 0) - ifnull(w.f_accamount, 0) != 0
+            GROUP BY  w.f_id
+        </where>
+    </select>
+</mapper>

ruoyi-fleet/src/main/resources/mapper/finance/FTmsaccbillsitemsMapper.xml

@@ -0,0 +1,135 @@
+<?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.ruoyi.orderManagement.finance.mapper.FTmsaccbillsitemsMapper">
+    
+    <resultMap type="FTmsaccbillsitems" id="FTmsaccbillsitemsResult">
+        <result property="id"    column="id"    />
+        <result property="srcId"    column="src_id"    />
+        <result property="actId"    column="act_id"    />
+        <result property="orderNo"    column="order_no"    />
+        <result property="dc"    column="dc"    />
+        <result property="amtOrg"    column="amt_org"    />
+        <result property="amtStl"    column="amt_stl"    />
+        <result property="amtBlc"    column="amt_blc"    />
+        <result property="amtCur"    column="amt_cur"    />
+        <result property="billStatus"    column="bill_status"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="fSrcid" column="f_srcid"/>
+        <result property="fSrcpid" column="f_srcpid"/>
+    </resultMap>
+
+    <sql id="selectFTmsaccbillsitemsVo">
+        select id, src_id, act_id, order_no, dc, amt_org, amt_stl, amt_blc, amt_cur, bill_status, del_flag, create_by, create_time, update_by, update_time, remarks ,
+               f_srcid,f_srcpid  from F_TMSACCBILLSITEMS
+    </sql>
+
+    <select id="selectFTmsaccbillsitemsList" parameterType="FTmsaccbillsitems" resultMap="FTmsaccbillsitemsResult">
+        <include refid="selectFTmsaccbillsitemsVo"/>
+        <where>  
+            <if test="srcId != null "> and src_id = #{srcId}</if>
+            <if test="actId != null "> and act_id = #{actId}</if>
+            <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
+            <if test="dc != null  and dc != ''"> and dc = #{dc}</if>
+            <if test="amtOrg != null "> and amt_org = #{amtOrg}</if>
+            <if test="amtStl != null "> and amt_stl = #{amtStl}</if>
+            <if test="amtBlc != null "> and amt_blc = #{amtBlc}</if>
+            <if test="amtCur != null "> and amt_cur = #{amtCur}</if>
+            <if test="billStatus != null "> and bill_status = #{billStatus}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="fSrcid != null ">and f_srcid = #{fSrcid}</if>
+            <if test="fSrcpid != null ">and f_srcpid = #{fSrcpid}</if>
+        </where>
+    </select>
+    
+    <select id="selectFTmsaccbillsitemsById" parameterType="Long" resultMap="FTmsaccbillsitemsResult">
+        <include refid="selectFTmsaccbillsitemsVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertFTmsaccbillsitems" parameterType="FTmsaccbillsitems" useGeneratedKeys="true" keyProperty="id">
+        insert into F_TMSACCBILLSITEMS
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="srcId != null">src_id,</if>
+            <if test="actId != null">act_id,</if>
+            <if test="orderNo != null">order_no,</if>
+            <if test="dc != null">dc,</if>
+            <if test="amtOrg != null">amt_org,</if>
+            <if test="amtStl != null">amt_stl,</if>
+            <if test="amtBlc != null">amt_blc,</if>
+            <if test="amtCur != null">amt_cur,</if>
+            <if test="billStatus != null">bill_status,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="fSrcid != null">f_srcid,</if>
+            <if test="fSrcpid != null">f_srcpid,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="srcId != null">#{srcId},</if>
+            <if test="actId != null">#{actId},</if>
+            <if test="orderNo != null">#{orderNo},</if>
+            <if test="dc != null">#{dc},</if>
+            <if test="amtOrg != null">#{amtOrg},</if>
+            <if test="amtStl != null">#{amtStl},</if>
+            <if test="amtBlc != null">#{amtBlc},</if>
+            <if test="amtCur != null">#{amtCur},</if>
+            <if test="billStatus != null">#{billStatus},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="fSrcid != null">#{fSrcid},</if>
+            <if test="fSrcpid != null">#{fSrcpid},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFTmsaccbillsitems" parameterType="FTmsaccbillsitems">
+        update F_TMSACCBILLSITEMS
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="srcId != null">src_id = #{srcId},</if>
+            <if test="actId != null">act_id = #{actId},</if>
+            <if test="orderNo != null">order_no = #{orderNo},</if>
+            <if test="dc != null">dc = #{dc},</if>
+            <if test="amtOrg != null">amt_org = #{amtOrg},</if>
+            <if test="amtStl != null">amt_stl = #{amtStl},</if>
+            <if test="amtBlc != null">amt_blc = #{amtBlc},</if>
+            <if test="amtCur != null">amt_cur = #{amtCur},</if>
+            <if test="billStatus != null">bill_status = #{billStatus},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="fSrcid != null">f_srcid = #{fSrcid},</if>
+            <if test="fSrcpid != null">f_srcpid = #{fSrcpid},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteFTmsaccbillsitemsById" parameterType="Long">
+        delete from F_TMSACCBILLSITEMS where id = #{id}
+    </delete>
+
+    <delete id="deleteFTmsaccbillsitemsByIds" parameterType="String">
+        delete from F_TMSACCBILLSITEMS where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <delete id="deleteByFPid" parameterType="Long">
+        delete from F_TMSACCBILLSITEMS where src_id = #{fId}
+    </delete>
+</mapper>

ruoyi-fleet/src/main/resources/mapper/statusTracking/ftmsorderbillsfeesMapper.xml

@@ -58,7 +58,7 @@
     </resultMap>
 
     <sql id="selectFTmsorderbillsfeesVo">
-        select f_id, f_pid, f_lineno, f_corpid, f_feeid, f_feeUnitid, f_qty, f_unitprice, f_amount, f_currency, f_exrate, f_taxrate, f_dc, f_review_date, f_billstatus, f_statement_no, f_accamount, f_accamount_date, f_stlamount_no, f_stlamount, f_stlamount_date, f_invnos, f_invamount, f_askamount, f_status, del_flag, create_by, create_time, update_by, update_time, remark, src_id, src_bill_no, f_mblno, f_product_name, f_marks, f_chargedate, f_billing_deadline, f_inventory_days, f_amt, f_billing_days, f_billing_qty, f_billtype, f_billingway, f_bsdate, f_originalbilldate, f_stltypeid, remarks from F_TMSORDERBILLSFEES
+        select f_id, f_pid, act_id ,org_id, f_lineno, f_corpid, f_feeid, f_feeUnitid, f_qty, f_unitprice, f_amount, f_currency, f_exrate, f_taxrate, f_dc, f_review_date, f_billstatus, f_statement_no, f_accamount, f_accamount_date, f_stlamount_no, f_stlamount, f_stlamount_date, f_invnos, f_invamount, f_askamount, f_status, del_flag, create_by, create_time, update_by, update_time, remark, src_id, src_bill_no, f_mblno, f_product_name, f_marks, f_chargedate, f_billing_deadline, f_inventory_days, f_amt, f_billing_days, f_billing_qty, f_billtype, f_billingway, f_bsdate, f_originalbilldate, f_stltypeid, remarks from F_TMSORDERBILLSFEES
     </sql>
 
     <select id="selectFTmsorderbillsfeesList" parameterType="FTmsorderbillsfees" resultMap="FTmsorderbillsfeesResult">
@@ -293,5 +293,8 @@
             #{fId}
         </foreach>
     </delete>
+    <delete id="deleteFTmsorderbillsfeesByPIdAndActId" parameterType="Long">
+        delete from F_TMSORDERBILLSFEES where f_pid = #{fId} and act_id = 1080
+    </delete>
 
 </mapper>

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/BillnoSerialServiceImpl.java

@@ -87,6 +87,8 @@ public class BillnoSerialServiceImpl implements IBillnoSerialService {
             billNo = "SF" + billNo;
         } else if ("FF".equals(billType)) {
             billNo = "FF" + billNo;
+        } else if ("SFDZ".equals(billType)) {
+            billNo = "SFDZ" + billNo;
         }
         return billNo;
     }