瀏覽代碼

[CODE]: 费用详情,费用追加

maxianghua 4 年之前
父節點
當前提交
19dce64dd2

+ 66 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/statusTracking/ftmsorderbillsfeesController.java

@@ -0,0 +1,66 @@
+package com.ruoyi.web.controller.fleet.statusTracking;
+
+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.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.orderManagement.domain.Ftmsorderbillscars;
+import com.ruoyi.orderManagement.service.IftmsorderbillscarsService;
+import com.ruoyi.orderManagement.statusTracking.service.IftmsorderbillsfeesService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 单趟费用Controller
+ *
+ * @author ruoyi
+ * @date 2021-02-22
+ */
+@RestController
+@RequestMapping("/fleet/ftmsorderbillsfees")
+public class ftmsorderbillsfeesController extends BaseController {
+
+    @Autowired
+    private IftmsorderbillsfeesService iftmsorderbillsfeesService;
+
+
+    /**
+     * 根据id查询费用详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillsfees:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        if (StringUtils.isNull(id)) {
+            return AjaxResult.error("未找到查询条件,请确认");
+        }
+        return AjaxResult.success(iftmsorderbillsfeesService.selectFTmsorderbillsfeesByIdMap(id));
+    }
+
+    /**
+     *   费用提交
+     */
+    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillsfees:add')")
+    @Log(title = "【车辆】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestParam("ftmsorderbillsfees") String ftmsorderbillsfees )
+    {
+        return iftmsorderbillsfeesService.insertFTmsorderbillsfeesAdd(ftmsorderbillsfees);
+    }
+
+
+
+
+
+
+}

+ 0 - 203
ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/domain/Ftmsorderbillsfees.java

@@ -1,203 +0,0 @@
-package com.ruoyi.orderManagement.domain;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-import lombok.Data;
-
-/**
- * 订单费用对象 F_TMSORDERBILLSFEES
- *
- * @author ruoyi
- * @date 2021-02-22
- */
-@Data
-public class Ftmsorderbillsfees extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    private Long fId;
-
-    /** 对应主表id */
-    @Excel(name = "对应主表id")
-    private Long fPid;
-
-    /** 活动号 */
-    @Excel(name = "活动号")
-    private Long actId;
-
-    /** 原始来源id */
-    @Excel(name = "原始来源id")
-    private Long orgId;
-
-    /** 行号 */
-    @Excel(name = "行号")
-    private Long fLineno;
-
-    /** 客户名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name */
-    @Excel(name = "客户名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name")
-    private Long fCorpid;
-
-    /** 费用名称,存储id 显示名称,t_fees 中的no或 name,模糊查找选择后,存储f_id,显示name */
-    @Excel(name = "费用名称,存储id 显示名称,t_fees 中的no或 name,模糊查找选择后,存储f_id,显示name")
-    private Long fFeeid;
-
-    /** 计价单位(数据字典),对应,t_unitfees f_id,如果选择为毛重,数量(f_qty)取主表的毛重,如果选择净重,取主表的净重,如果为箱量,取主表的箱量 */
-    @Excel(name = "计价单位(数据字典),对应,t_unitfees f_id,如果选择为毛重,数量", readConverterExp = "f=_qty")
-    private Long fFeeunitid;
-
-    /** 数量 */
-    @Excel(name = "数量")
-    private BigDecimal fQty;
-
-    /** 单价 */
-    @Excel(name = "单价")
-    private BigDecimal fUnitprice;
-
-    /** 金额,2位小数f_qty* f_amount */
-    @Excel(name = "金额,2位小数f_qty* f_amount")
-    private BigDecimal fAmount;
-
-    /** 币别 */
-    @Excel(name = "币别")
-    private String fCurrency;
-
-    /** 汇率 */
-    @Excel(name = "汇率")
-    private BigDecimal fExrate;
-
-    /** 税率,显示是 3 6 16 用13% */
-    @Excel(name = "税率,显示是 3 6 16 用13%")
-    private BigDecimal fTaxrate;
-
-    /** 收、付,D:收 C 付 */
-    @Excel(name = "收、付,D:收 C 付")
-    private String fDc;
-
-    /** 审核日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "审核日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fReviewDate;
-
-    /** 状态,1 录入,4审核中,6审核通过,只有录入状态的数据可以修改 */
-    @Excel(name = "状态,1 录入,4审核中,6审核通过,只有录入状态的数据可以修改")
-    private Long fBillstatus;
-
-    /** 对账单号 */
-    @Excel(name = "对账单号")
-    private String fStatementNo;
-
-    /** 对账金额 */
-    @Excel(name = "对账金额")
-    private BigDecimal fAccamount;
-
-    /** 对账日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "对账日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fAccamountDate;
-
-    /** 结算单号 */
-    @Excel(name = "结算单号")
-    private String fStlamountNo;
-
-    /** 结算金额 */
-    @Excel(name = "结算金额")
-    private BigDecimal fStlamount;
-
-    /** 结算日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "结算日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fStlamountDate;
-
-    /** 发票号 */
-    @Excel(name = "发票号")
-    private String fInvnos;
-
-    /** 开票金额 */
-    @Excel(name = "开票金额")
-    private BigDecimal fInvamount;
-
-    /** 申请金额 */
-    @Excel(name = "申请金额")
-    private BigDecimal fAskamount;
-
-    /** 状态 */
-    @Excel(name = "状态")
-    private Long fStatus;
-
-    /** 删除状态 */
-    private String delFlag;
-
-    /** 来源id */
-    @Excel(name = "来源id")
-    private Long srcId;
-
-    /** 来源编号 */
-    @Excel(name = "来源编号")
-    private String srcBillNo;
-
-    /** 提单号 */
-    @Excel(name = "提单号")
-    private String fMblno;
-
-    /** 明细品名合计 */
-    @Excel(name = "明细品名合计")
-    private String fProductName;
-
-    /** 唛头合计 */
-    @Excel(name = "唛头合计")
-    private String fMarks;
-
-    /** 仓储计费日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "仓储计费日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fChargedate;
-
-    /** 仓储费计费截至日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "仓储费计费截至日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date fBillingDeadline;
-
-    /** 库存天数(出库日期-仓储费计费日期) */
-    @Excel(name = "库存天数(出库日期-仓储费计费日期)")
-    private Long fInventoryDays;
-
-    /** 金额 */
-    @Excel(name = "金额")
-    private BigDecimal fAmt;
-
-    /** 计费天数 */
-    @Excel(name = "计费天数")
-    private Long fBillingDays;
-
-    /** 计费数量 */
-    @Excel(name = "计费数量")
-    private BigDecimal fBillingQty;
-
-    /** 单据类型(数据字典)SJRK(入库) SJCK(实际出库) CKDB(调拨) HQZY(货权转移) */
-    @Excel(name = "单据类型(数据字典)SJRK", readConverterExp = "入=库")
-    private String fBilltype;
-
-    /** 计费方式 */
-    @Excel(name = "计费方式")
-    private Long fBillingway;
-
-    /** 入(出)库日期 */
-    @Excel(name = "入", readConverterExp = "出=")
-    private Date fBsdate;
-
-    /** 入库日期(原始) */
-    @Excel(name = "入库日期", readConverterExp = "原=始")
-    private Date fOriginalbilldate;
-
-    /** 结算方式,默认提取corps中stltypeid	也可以从表t_stltypes中下拉选择,存储id,显示name */
-    @Excel(name = "结算方式,默认提取corps中stltypeid	也可以从表t_stltypes中下拉选择,存储id,显示name")
-    private Long fStltypeid;
-
-    /** 备注 */
-    @Excel(name = "备注")
-    private String remarks;
-}

+ 563 - 0
ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/statusTracking/domain/Ftmsorderbillsfees.java

@@ -0,0 +1,563 @@
+package com.ruoyi.orderManagement.statusTracking.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 订单费用对象 F_TMSORDERBILLSFEES
+ *
+ * @author ruoyi
+ * @date 2021-02-22
+ */
+
+public class Ftmsorderbillsfees extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long fId;
+
+    /** 对应主表id */
+    @Excel(name = "对应主表id")
+    private Long fPid;
+
+    /** 活动号 */
+    @Excel(name = "活动号")
+    private Long actId;
+
+    /** 原始来源id */
+    @Excel(name = "原始来源id")
+    private Long orgId;
+
+    /** 行号 */
+    @Excel(name = "行号")
+    private Long fLineno;
+
+    /** 客户名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name */
+    @Excel(name = "客户名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name")
+    private Long fCorpid;
+
+    /** 费用名称,存储id 显示名称,t_fees 中的no或 name,模糊查找选择后,存储f_id,显示name */
+    @Excel(name = "费用名称,存储id 显示名称,t_fees 中的no或 name,模糊查找选择后,存储f_id,显示name")
+    private Long fFeeid;
+
+    /** 计价单位(数据字典),对应,t_unitfees f_id,如果选择为毛重,数量(f_qty)取主表的毛重,如果选择净重,取主表的净重,如果为箱量,取主表的箱量 */
+    @Excel(name = "计价单位(数据字典),对应,t_unitfees f_id,如果选择为毛重,数量", readConverterExp = "f=_qty")
+    private Long fFeeunitid;
+
+    /** 数量 */
+    @Excel(name = "数量")
+    private BigDecimal fQty;
+
+    /** 单价 */
+    @Excel(name = "单价")
+    private BigDecimal fUnitprice;
+
+    /** 金额,2位小数f_qty* f_amount */
+    @Excel(name = "金额,2位小数f_qty* f_amount")
+    private BigDecimal fAmount;
+
+    /** 币别 */
+    @Excel(name = "币别")
+    private String fCurrency;
+
+    /** 汇率 */
+    @Excel(name = "汇率")
+    private BigDecimal fExrate;
+
+    /** 税率,显示是 3 6 16 用13% */
+    @Excel(name = "税率,显示是 3 6 16 用13%")
+    private BigDecimal fTaxrate;
+
+    /** 收、付,D:收 C 付 */
+    @Excel(name = "收、付,D:收 C 付")
+    private String fDc;
+
+    /** 审核日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fReviewDate;
+
+    /** 状态,1 录入,4审核中,6审核通过,只有录入状态的数据可以修改 */
+    @Excel(name = "状态,1 录入,4审核中,6审核通过,只有录入状态的数据可以修改")
+    private Long fBillstatus;
+
+    /** 对账单号 */
+    @Excel(name = "对账单号")
+    private String fStatementNo;
+
+    /** 对账金额 */
+    @Excel(name = "对账金额")
+    private BigDecimal fAccamount;
+
+    /** 对账日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "对账日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fAccamountDate;
+
+    /** 结算单号 */
+    @Excel(name = "结算单号")
+    private String fStlamountNo;
+
+    /** 结算金额 */
+    @Excel(name = "结算金额")
+    private BigDecimal fStlamount;
+
+    /** 结算日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结算日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fStlamountDate;
+
+    /** 发票号 */
+    @Excel(name = "发票号")
+    private String fInvnos;
+
+    /** 开票金额 */
+    @Excel(name = "开票金额")
+    private BigDecimal fInvamount;
+
+    /** 申请金额 */
+    @Excel(name = "申请金额")
+    private BigDecimal fAskamount;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long fStatus;
+
+    /** 删除状态 */
+    private String delFlag;
+
+    /** 来源id */
+    @Excel(name = "来源id")
+    private Long srcId;
+
+    /** 来源编号 */
+    @Excel(name = "来源编号")
+    private String srcBillNo;
+
+    /** 提单号 */
+    @Excel(name = "提单号")
+    private String fMblno;
+
+    /** 明细品名合计 */
+    @Excel(name = "明细品名合计")
+    private String fProductName;
+
+    /** 唛头合计 */
+    @Excel(name = "唛头合计")
+    private String fMarks;
+
+    /** 仓储计费日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "仓储计费日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fChargedate;
+
+    /** 仓储费计费截至日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "仓储费计费截至日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fBillingDeadline;
+
+    /** 库存天数(出库日期-仓储费计费日期) */
+    @Excel(name = "库存天数(出库日期-仓储费计费日期)")
+    private Long fInventoryDays;
+
+    /** 金额 */
+    @Excel(name = "金额")
+    private BigDecimal fAmt;
+
+    /** 计费天数 */
+    @Excel(name = "计费天数")
+    private Long fBillingDays;
+
+    /** 计费数量 */
+    @Excel(name = "计费数量")
+    private BigDecimal fBillingQty;
+
+    /** 单据类型(数据字典)SJRK(入库) SJCK(实际出库) CKDB(调拨) HQZY(货权转移) */
+    @Excel(name = "单据类型(数据字典)SJRK", readConverterExp = "入=库")
+    private String fBilltype;
+
+    /** 计费方式 */
+    @Excel(name = "计费方式")
+    private Long fBillingway;
+
+    /** 入(出)库日期 */
+    @Excel(name = "入", readConverterExp = "出=")
+    private Date fBsdate;
+
+    /** 入库日期(原始) */
+    @Excel(name = "入库日期", readConverterExp = "原=始")
+    private Date fOriginalbilldate;
+
+    /** 结算方式,默认提取corps中stltypeid	也可以从表t_stltypes中下拉选择,存储id,显示name */
+    @Excel(name = "结算方式,默认提取corps中stltypeid	也可以从表t_stltypes中下拉选择,存储id,显示name")
+    private Long fStltypeid;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public Long getfId() {
+        return fId;
+    }
+
+    public void setfId(Long fId) {
+        this.fId = fId;
+    }
+
+    public Long getfPid() {
+        return fPid;
+    }
+
+    public void setfPid(Long fPid) {
+        this.fPid = fPid;
+    }
+
+    public Long getActId() {
+        return actId;
+    }
+
+    public void setActId(Long actId) {
+        this.actId = actId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
+    public Long getfLineno() {
+        return fLineno;
+    }
+
+    public void setfLineno(Long fLineno) {
+        this.fLineno = fLineno;
+    }
+
+    public Long getfCorpid() {
+        return fCorpid;
+    }
+
+    public void setfCorpid(Long fCorpid) {
+        this.fCorpid = fCorpid;
+    }
+
+    public Long getfFeeid() {
+        return fFeeid;
+    }
+
+    public void setfFeeid(Long fFeeid) {
+        this.fFeeid = fFeeid;
+    }
+
+    public Long getfFeeunitid() {
+        return fFeeunitid;
+    }
+
+    public void setfFeeunitid(Long fFeeunitid) {
+        this.fFeeunitid = fFeeunitid;
+    }
+
+    public BigDecimal getfQty() {
+        return fQty;
+    }
+
+    public void setfQty(BigDecimal fQty) {
+        this.fQty = fQty;
+    }
+
+    public BigDecimal getfUnitprice() {
+        return fUnitprice;
+    }
+
+    public void setfUnitprice(BigDecimal fUnitprice) {
+        this.fUnitprice = fUnitprice;
+    }
+
+    public BigDecimal getfAmount() {
+        return fAmount;
+    }
+
+    public void setfAmount(BigDecimal fAmount) {
+        this.fAmount = fAmount;
+    }
+
+    public String getfCurrency() {
+        return fCurrency;
+    }
+
+    public void setfCurrency(String fCurrency) {
+        this.fCurrency = fCurrency;
+    }
+
+    public BigDecimal getfExrate() {
+        return fExrate;
+    }
+
+    public void setfExrate(BigDecimal fExrate) {
+        this.fExrate = fExrate;
+    }
+
+    public BigDecimal getfTaxrate() {
+        return fTaxrate;
+    }
+
+    public void setfTaxrate(BigDecimal fTaxrate) {
+        this.fTaxrate = fTaxrate;
+    }
+
+    public String getfDc() {
+        return fDc;
+    }
+
+    public void setfDc(String fDc) {
+        this.fDc = fDc;
+    }
+
+    public Date getfReviewDate() {
+        return fReviewDate;
+    }
+
+    public void setfReviewDate(Date fReviewDate) {
+        this.fReviewDate = fReviewDate;
+    }
+
+    public Long getfBillstatus() {
+        return fBillstatus;
+    }
+
+    public void setfBillstatus(Long fBillstatus) {
+        this.fBillstatus = fBillstatus;
+    }
+
+    public String getfStatementNo() {
+        return fStatementNo;
+    }
+
+    public void setfStatementNo(String fStatementNo) {
+        this.fStatementNo = fStatementNo;
+    }
+
+    public BigDecimal getfAccamount() {
+        return fAccamount;
+    }
+
+    public void setfAccamount(BigDecimal fAccamount) {
+        this.fAccamount = fAccamount;
+    }
+
+    public Date getfAccamountDate() {
+        return fAccamountDate;
+    }
+
+    public void setfAccamountDate(Date fAccamountDate) {
+        this.fAccamountDate = fAccamountDate;
+    }
+
+    public String getfStlamountNo() {
+        return fStlamountNo;
+    }
+
+    public void setfStlamountNo(String fStlamountNo) {
+        this.fStlamountNo = fStlamountNo;
+    }
+
+    public BigDecimal getfStlamount() {
+        return fStlamount;
+    }
+
+    public void setfStlamount(BigDecimal fStlamount) {
+        this.fStlamount = fStlamount;
+    }
+
+    public Date getfStlamountDate() {
+        return fStlamountDate;
+    }
+
+    public void setfStlamountDate(Date fStlamountDate) {
+        this.fStlamountDate = fStlamountDate;
+    }
+
+    public String getfInvnos() {
+        return fInvnos;
+    }
+
+    public void setfInvnos(String fInvnos) {
+        this.fInvnos = fInvnos;
+    }
+
+    public BigDecimal getfInvamount() {
+        return fInvamount;
+    }
+
+    public void setfInvamount(BigDecimal fInvamount) {
+        this.fInvamount = fInvamount;
+    }
+
+    public BigDecimal getfAskamount() {
+        return fAskamount;
+    }
+
+    public void setfAskamount(BigDecimal fAskamount) {
+        this.fAskamount = fAskamount;
+    }
+
+    public Long getfStatus() {
+        return fStatus;
+    }
+
+    public void setfStatus(Long fStatus) {
+        this.fStatus = fStatus;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Long getSrcId() {
+        return srcId;
+    }
+
+    public void setSrcId(Long srcId) {
+        this.srcId = srcId;
+    }
+
+    public String getSrcBillNo() {
+        return srcBillNo;
+    }
+
+    public void setSrcBillNo(String srcBillNo) {
+        this.srcBillNo = srcBillNo;
+    }
+
+    public String getfMblno() {
+        return fMblno;
+    }
+
+    public void setfMblno(String fMblno) {
+        this.fMblno = fMblno;
+    }
+
+    public String getfProductName() {
+        return fProductName;
+    }
+
+    public void setfProductName(String fProductName) {
+        this.fProductName = fProductName;
+    }
+
+    public String getfMarks() {
+        return fMarks;
+    }
+
+    public void setfMarks(String fMarks) {
+        this.fMarks = fMarks;
+    }
+
+    public Date getfChargedate() {
+        return fChargedate;
+    }
+
+    public void setfChargedate(Date fChargedate) {
+        this.fChargedate = fChargedate;
+    }
+
+    public Date getfBillingDeadline() {
+        return fBillingDeadline;
+    }
+
+    public void setfBillingDeadline(Date fBillingDeadline) {
+        this.fBillingDeadline = fBillingDeadline;
+    }
+
+    public Long getfInventoryDays() {
+        return fInventoryDays;
+    }
+
+    public void setfInventoryDays(Long fInventoryDays) {
+        this.fInventoryDays = fInventoryDays;
+    }
+
+    public BigDecimal getfAmt() {
+        return fAmt;
+    }
+
+    public void setfAmt(BigDecimal fAmt) {
+        this.fAmt = fAmt;
+    }
+
+    public Long getfBillingDays() {
+        return fBillingDays;
+    }
+
+    public void setfBillingDays(Long fBillingDays) {
+        this.fBillingDays = fBillingDays;
+    }
+
+    public BigDecimal getfBillingQty() {
+        return fBillingQty;
+    }
+
+    public void setfBillingQty(BigDecimal fBillingQty) {
+        this.fBillingQty = fBillingQty;
+    }
+
+    public String getfBilltype() {
+        return fBilltype;
+    }
+
+    public void setfBilltype(String fBilltype) {
+        this.fBilltype = fBilltype;
+    }
+
+    public Long getfBillingway() {
+        return fBillingway;
+    }
+
+    public void setfBillingway(Long fBillingway) {
+        this.fBillingway = fBillingway;
+    }
+
+    public Date getfBsdate() {
+        return fBsdate;
+    }
+
+    public void setfBsdate(Date fBsdate) {
+        this.fBsdate = fBsdate;
+    }
+
+    public Date getfOriginalbilldate() {
+        return fOriginalbilldate;
+    }
+
+    public void setfOriginalbilldate(Date fOriginalbilldate) {
+        this.fOriginalbilldate = fOriginalbilldate;
+    }
+
+    public Long getfStltypeid() {
+        return fStltypeid;
+    }
+
+    public void setfStltypeid(Long fStltypeid) {
+        this.fStltypeid = fStltypeid;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+}

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

@@ -1,6 +1,6 @@
-package com.ruoyi.orderManagement.mapper;
+package com.ruoyi.orderManagement.statusTracking.mapper;
 
-import com.ruoyi.orderManagement.domain.Ftmsorderbillsfees;
+import com.ruoyi.orderManagement.statusTracking.domain.Ftmsorderbillsfees;
 
 import java.util.List;
 

+ 9 - 2
ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/service/IftmsorderbillsfeesService.java → ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/statusTracking/service/IftmsorderbillsfeesService.java

@@ -1,8 +1,10 @@
-package com.ruoyi.orderManagement.service;
+package com.ruoyi.orderManagement.statusTracking.service;
 
-import com.ruoyi.orderManagement.domain.Ftmsorderbillsfees;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.orderManagement.statusTracking.domain.Ftmsorderbillsfees;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 订单费用Service接口
@@ -19,6 +21,11 @@ public interface IftmsorderbillsfeesService {
      */
     public Ftmsorderbillsfees selectFTmsorderbillsfeesById(Long fId);
 
+    public Map<String, Object> selectFTmsorderbillsfeesByIdMap(Long id);
+
+    public AjaxResult insertFTmsorderbillsfeesAdd(String Ftmsorderbillsfees);
+
+
     /**
      * 查询车队费用列表
      *

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

@@ -0,0 +1,240 @@
+package com.ruoyi.orderManagement.statusTracking.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.domain.TGoods;
+import com.ruoyi.basicData.mapper.TCorpsMapper;
+import com.ruoyi.basicData.mapper.TFeesMapper;
+import com.ruoyi.basicData.mapper.TGoodsMapper;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.TWarehouse;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.orderManagement.BasicData.domain.FleetCompanyMsg;
+import com.ruoyi.orderManagement.domain.Ftmsorderbills;
+import com.ruoyi.orderManagement.domain.Ftmsorderbillsattachs;
+import com.ruoyi.orderManagement.domain.Ftmsorderbillscars;
+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.orderManagement.statusTracking.service.IftmsorderbillsfeesService;
+import com.ruoyi.system.mapper.SysDeptMapper;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.warehouseBusiness.domain.TWarehousebillsfees;
+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;
+
+    @Autowired
+    private FtmsorderbillscarsMapper ftmsorderbillscarsMapper;
+
+    @Autowired
+    private FtmsorderbillsMapper ftmsorderbillsMapper;
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+
+    @Autowired
+    private TGoodsMapper tGoodsMapper;
+
+    @Autowired
+    private TFeesMapper tFeesMapper;
+
+    @Autowired
+    private TCorpsMapper tCorpsMapper;
+
+
+
+    /**
+     * 查询车队费用
+     *
+     * @param fId 车队费用ID
+     * @return 车队费用
+     */
+    @Override
+    public Ftmsorderbillsfees selectFTmsorderbillsfeesById(Long fId) {
+        return fTmsorderbillsfeesMapper.selectFTmsorderbillsfeesById(fId);
+    }
+
+    @Override
+    public Map<String, Object> selectFTmsorderbillsfeesByIdMap(Long id) {
+        Map<String, Object> map = new HashMap<>();
+        // 客户表
+        List<Long> corpsId = new ArrayList<>();
+        // 用户表
+        List<SysUser> sysUserList = new ArrayList<>();
+        // 费用
+        List<Long> feesId = new ArrayList<>();
+        // 商品
+        List<Long> goodsId = new ArrayList<>();
+        // cars
+        Ftmsorderbillscars ftmsorderbillscars = ftmsorderbillscarsMapper.selectftmsorderbillscarsById(id);
+        // 主表
+        Ftmsorderbills ftmsorderbills = ftmsorderbillsMapper.selectftmsorderbillsById(ftmsorderbillscars.getPId());
+        if (!StringUtils.isNull(ftmsorderbills)) {
+            if (StringUtils.isNotNull(ftmsorderbills.getCorpId())) {
+                corpsId.add(ftmsorderbills.getCorpId());
+            }
+            if (StringUtils.isNotNull(ftmsorderbills.getGoodsId())) {
+                goodsId.add(ftmsorderbills.getGoodsId());
+            }
+            // 查询制单人
+            SysUser logUser = sysUserMapper.selectUserByUserName(ftmsorderbills.getCreateBy());
+            if (StringUtils.isNotNull(logUser)) {
+                SysDept sysDept = sysDeptMapper.selectDeptById(logUser.getDeptId());
+                sysUserList.add(logUser);
+                map.put("dept", sysDept);
+            }
+        }
+        // 费用信息
+        Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
+        //ftmsorderbillsfees.setFPid(id);
+        ftmsorderbillsfees.setfPid(id);
+        List<Ftmsorderbillsfees> ftmsorderbillsfeesList= fTmsorderbillsfeesMapper.selectFTmsorderbillsfeesList(ftmsorderbillsfees);
+        if (StringUtils.isNotEmpty(ftmsorderbillsfeesList)) {
+            for (Ftmsorderbillsfees fees : ftmsorderbillsfeesList) {
+                //feesId.add(fees.getFFeeid());
+                feesId.add(fees.getfFeeid());
+            }
+        }
+        // 客户
+        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<TGoods> goodsList = new ArrayList<>();
+        List<Long> goodsIdList = StringUtils.integerDeduplication(goodsId);
+        for (Long goods : goodsIdList) {
+            TGoods tGoods = tGoodsMapper.selectTGoodsById(goods);
+            if (StringUtils.isNotNull(tGoods)) {
+                goodsList.add(tGoods);
+            }
+        }
+        // 费用
+        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("corps", corpsList);
+        map.put("goodsList", goodsList);
+        map.put("feesList", feesList);
+        map.put("ftmsorderbills", ftmsorderbills); // 主表
+        map.put("ftmsorderbillsfees", ftmsorderbillsfeesList); // 费用
+        return map;
+    }
+
+    @Override
+    public AjaxResult insertFTmsorderbillsfeesAdd(String Ftmsorderbillsfees) {
+        Map<String, Object> map = new HashMap<>();
+        Long id =null;
+        //  费用添加
+        if (StringUtils.isNotNull(Ftmsorderbillsfees) && !"[]".equals(Ftmsorderbillsfees)) {
+            JSONArray jsonDrArray = JSONArray.parseArray(Ftmsorderbillsfees);
+            List<Ftmsorderbillsfees> ftmsorderbillsfeesList = JSONObject.parseArray(jsonDrArray.toJSONString(), Ftmsorderbillsfees.class);
+            for (Ftmsorderbillsfees ftmsorderbillsfees : ftmsorderbillsfeesList) {
+                // 只处理新追加的数据
+                if(StringUtils.isNull(ftmsorderbillsfees.getfId())){
+                    ftmsorderbillsfees.setfPid(ftmsorderbillsfees.getfPid());
+                    ftmsorderbillsfees.setActId(1080L); // 追加费用
+                    ftmsorderbillsfees.setOrgId(ftmsorderbillsfees.getfPid());
+                    ftmsorderbillsfees.setCreateBy(SecurityUtils.getUsername());
+                    ftmsorderbillsfees.setCreateTime(new Date());
+                    fTmsorderbillsfeesMapper.insertFTmsorderbillsfees(ftmsorderbillsfees);
+                }
+                id= ftmsorderbillsfees.getfPid();
+            }
+        }
+        Ftmsorderbillsfees ftmsorderbillsfees = new Ftmsorderbillsfees();
+        ftmsorderbillsfees.setfPid(id);
+        List<Ftmsorderbillsfees> ftmsorderbillsfeesListNew = fTmsorderbillsfeesMapper.selectFTmsorderbillsfeesList(ftmsorderbillsfees);
+        map.put("ftmsorderbillsfeesList",ftmsorderbillsfeesListNew);
+        return AjaxResult.success("成功", map);
+    }
+
+    /**
+     * 查询车队费用列表
+     *
+     * @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);
+    }
+}