From 8c84c7b050f44f63fc81b725708e526f35ab2f47 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 26 Nov 2024 17:55:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=93=E7=AE=97=E7=94=B3?= =?UTF-8?q?=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBillSettelApplyDetailsVo.java | 7 +- .../SettleGoodsDetailsVo.java | 10 + .../api/asbillsettelapply/SettleSitemVo.java | 9 + .../flow/SubmitSettleDto.java | 3 +- .../AsBillSettelApplyAitem.java | 38 ++ .../AsBillSettelApplyAitemspec.java | 33 ++ .../AsBillSettelApplyDetail.java | 66 +++ .../AsBillSettelApplySitem.java | 70 +++ .../anrui/as/api/asbusrepairbill/AitemVo.java | 2 +- .../asbusrepairbill/AsBusrepairBillDto.java | 4 + .../api/asbusrepairbill/GoodsDetailsVo.java | 2 +- .../as/api/asbusrepairbill/InvoiceVo.java | 2 +- .../anrui/as/api/asbusrepairbill/SitemVo.java | 5 + ...AsBusrepairBillReverseSettleDetailsVo.java | 9 + .../AsBillSettelApplyRest.java | 12 +- .../AsBillSettelApplyService.java | 423 +++++++++++++++- .../AsBillSettelApplyAitemMapper.java | 51 ++ .../AsBillSettelApplyAitemMapper.xml | 6 + .../AsBillSettelApplyAitemRest.java | 45 ++ .../AsBillSettelApplyAitemService.java | 51 ++ .../AsBillSettelApplyAitemSpecMapper.java | 51 ++ .../AsBillSettelApplyAitemSpecMapper.xml | 6 + .../AsBillSettelApplyAitemSpecRest.java | 45 ++ .../AsBillSettelApplyAitemSpecService.java | 51 ++ .../AsBillSettelApplyDetailMapper.java | 51 ++ .../AsBillSettelApplyDetailMapper.xml | 6 + .../AsBillSettelApplyDetailRest.java | 45 ++ .../AsBillSettelApplyDetailService.java | 51 ++ .../AsBillSettelApplySitemMapper.java | 51 ++ .../AsBillSettelApplySitemMapper.xml | 6 + .../AsBillSettelApplySitemRest.java | 45 ++ .../AsBillSettelApplySitemService.java | 51 ++ .../AsBusrepairBillService.java | 461 +++++++++--------- 33 files changed, 1523 insertions(+), 245 deletions(-) create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplyaitem/AsBillSettelApplyAitem.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplyaitemspec/AsBillSettelApplyAitemspec.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplydetail/AsBillSettelApplyDetail.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplysitem/AsBillSettelApplySitem.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitem/AsBillSettelApplyAitemMapper.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitem/AsBillSettelApplyAitemMapper.xml create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitem/AsBillSettelApplyAitemRest.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitem/AsBillSettelApplyAitemService.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitemspec/AsBillSettelApplyAitemSpecMapper.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitemspec/AsBillSettelApplyAitemSpecMapper.xml create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitemspec/AsBillSettelApplyAitemSpecRest.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitemspec/AsBillSettelApplyAitemSpecService.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplydetail/AsBillSettelApplyDetailMapper.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplydetail/AsBillSettelApplyDetailMapper.xml create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplydetail/AsBillSettelApplyDetailRest.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplydetail/AsBillSettelApplyDetailService.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplysitem/AsBillSettelApplySitemMapper.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplysitem/AsBillSettelApplySitemMapper.xml create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplysitem/AsBillSettelApplySitemRest.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplysitem/AsBillSettelApplySitemService.java diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyDetailsVo.java index 64c8628c48..a0f1ee83e4 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyDetailsVo.java @@ -59,6 +59,7 @@ public class AsBillSettelApplyDetailsVo implements Vo { * 附加费 */ private String addAmount; + private String sid; /** * 附加项目 */ @@ -176,7 +177,7 @@ public class AsBillSettelApplyDetailsVo implements Vo { * 结算金额 */ private String settleAmount; - private String sid; + /** * 维修项目 */ @@ -238,6 +239,7 @@ public class AsBillSettelApplyDetailsVo implements Vo { * 服务顾问 */ private String waitorName; + private String sourceBillType; private String procInsId; private String outCost; //外出成本 @@ -246,4 +248,7 @@ public class AsBillSettelApplyDetailsVo implements Vo { private String subsidyPrint; //厂家补助利润额 private String rescueCost; //施救费成本 private String rescuePrint; //施救费利润额 + private String outSid; //外出费sid + private String subsidySid; //厂家补助SID + private String rescueSid; //施救费sid } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/SettleGoodsDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/SettleGoodsDetailsVo.java index f8994c933f..6e5e6ad521 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/SettleGoodsDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/SettleGoodsDetailsVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.as.api.asbillsettelapply; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -9,6 +10,12 @@ import lombok.Data; */ @Data public class SettleGoodsDetailsVo { + @ApiModelProperty("出/退库数量") + private String count; + @ApiModelProperty("销售价（元）") + private String price; + //折扣（0-10，0免费，10不打折） + private String discount; /** * 优惠金额 */ @@ -44,4 +51,7 @@ public class SettleGoodsDetailsVo { private String sid; private String inventorySid; private String goodsID; + private String goodsDetailsSid; + @ApiModelProperty("配件销售人") + private String partsSellers; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/SettleSitemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/SettleSitemVo.java index 2c697b6bb1..4e94889d01 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/SettleSitemVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/SettleSitemVo.java @@ -1,7 +1,11 @@ package com.yxt.anrui.as.api.asbillsettelapply; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * @author Fan * @description @@ -51,4 +55,9 @@ public class SettleSitemVo { * 结算金额，应收金额 - 优惠金额 */ private String sitemSettleAmount; + private String price; + @ApiModelProperty("折扣（0-10，0免费，10不打折）") + private String discount; + private String repairerName; + } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/flow/SubmitSettleDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/flow/SubmitSettleDto.java index 72ffcf6194..bb35190b67 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/flow/SubmitSettleDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/flow/SubmitSettleDto.java @@ -1,5 +1,6 @@ package com.yxt.anrui.as.api.asbillsettelapply.flow; +import com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyDetailsVo; import com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyDto; import com.yxt.anrui.as.api.asbusrepairbillreversesettle.AsBusrepairBillReverseSettleDto; import io.swagger.annotations.ApiModel; @@ -14,7 +15,7 @@ import lombok.Data; */ @ApiModel("提交") @Data -public class SubmitSettleDto extends AsBillSettelApplyDto { +public class SubmitSettleDto extends AsBillSettelApplyDetailsVo { @ApiModelProperty("意见") private String comment; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplyaitem/AsBillSettelApplyAitem.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplyaitem/AsBillSettelApplyAitem.java new file mode 100644 index 0000000000..b67686c4e8 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplyaitem/AsBillSettelApplyAitem.java @@ -0,0 +1,38 @@ +package com.yxt.anrui.as.api.asbillsettelapplyaitem; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author Fan + * @description + * @date 2024/4/17 14:56 + */ +@Data +@ApiModel(value = "维修工单-附加项目", description = "维修工单-附加项目") +@TableName("as_bill_settel_apply_aitem") +public class AsBillSettelApplyAitem extends BaseEntity { + @ApiModelProperty("结算单sid") + private String mainSid; + @ApiModelProperty("附加项目sid") + private String attachItemSid; + @ApiModelProperty("附加项目名称") + private String attachItem; + @ApiModelProperty("销售价") + private BigDecimal price; + @ApiModelProperty("销售价常量") + private BigDecimal aitemPrice; + @ApiModelProperty("业务类型Key") + private String billBusTypeKey; + @ApiModelProperty("业务类型Value") + private String billBusTypeValue; + @ApiModelProperty("成本价") + private BigDecimal cost; + @ApiModelProperty("成本合计（成本价*数量）") + private BigDecimal costTotal; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplyaitemspec/AsBillSettelApplyAitemspec.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplyaitemspec/AsBillSettelApplyAitemspec.java new file mode 100644 index 0000000000..d39641f975 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplyaitemspec/AsBillSettelApplyAitemspec.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.as.api.asbillsettelapplyaitemspec; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author Fan + * @description + * @date 2024/4/17 14:56 + */ +@Data +@ApiModel(value = "维修工单-固定附加项目", description = "维修工单-固定附加项目") +@TableName("as_bill_settel_apply_aitemspec") +public class AsBillSettelApplyAitemspec extends BaseEntity { + @ApiModelProperty("工单sid") + private String mainSid; + @ApiModelProperty("附加项目sid") + private String attachItemSid; + @ApiModelProperty("项目名称") + private String attachItem; + @ApiModelProperty("项目费用") + private BigDecimal price; + @ApiModelProperty("开票价") + private BigDecimal taxPrice; + @ApiModelProperty("成本合计（成本价*数量）") + private BigDecimal costTotal; + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplydetail/AsBillSettelApplyDetail.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplydetail/AsBillSettelApplyDetail.java new file mode 100644 index 0000000000..98c9a533da --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplydetail/AsBillSettelApplyDetail.java @@ -0,0 +1,66 @@ +package com.yxt.anrui.as.api.asbillsettelapplydetail; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/7 + **/ +@Data +@TableName("as_bill_settel_apply_detail") +public class AsBillSettelApplyDetail extends BaseEntity { + private static final long serialVersionUID = 7134535185685249599L; + @ApiModelProperty("单据sid") + private String mainSid; + private String sid; + @ApiModelProperty("出/退库数量") + private String count; + @ApiModelProperty("销售价（元）") + private String price; + //折扣（0-10，0免费，10不打折） + private String discount; + /** + * 优惠金额 + */ + private String discountAmount; + /** + * 成本 + */ + private String goodsCost; + /** + * 利润额，结算金额 - 成本 + */ + private String goodsPrint; + /** + * 应收金额，销售价 * 数量 + */ + private String goodsReceivableAmount; + /** + * 结算金额，应收金额 - 优惠金额 + */ + private String goodsSettleAmount; + /** + * 图号 + */ + private String goodsSkuCode; + /** + * 商品名称 + */ + private String goodsSpuName; + /** + * 备注 + */ + private String remarks; + private String inventorySid; + private String goodsID; + @ApiModelProperty("配件销售人") + private String partsSellers; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplysitem/AsBillSettelApplySitem.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplysitem/AsBillSettelApplySitem.java new file mode 100644 index 0000000000..3430c297ae --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapplysitem/AsBillSettelApplySitem.java @@ -0,0 +1,70 @@ +package com.yxt.anrui.as.api.asbillsettelapplysitem; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author Fan + * @description + * @date 2024/4/17 15:08 + */ +@Data +@ApiModel(value = "维修工单-服务项目", description = "维修工单-服务项目") +@TableName("as_bill_settel_apply_sitem") +public class AsBillSettelApplySitem extends BaseEntity { + + @ApiModelProperty("工单sid") + private String mainSid; + private String serviceItemSid; + /** + * 优惠金额 + */ + private String discountAmount; + /** + * 工时单价 + */ + private String hourPrice; + /** + * 工时数 + */ + private String hours; + /** + * 备注 + */ + private String remarks; + /** + * 维修项目名称 + */ + private String serviceItem; + /** + * 工种 + */ + private String serviceType; + private String serviceTypeSid; + /** + * 成本 + */ + private String sitemCost; + /** + * 利润额，结算金额 - 成本 + */ + private String sitemPrint; + /** + * 应收合计，销售价 + */ + private String sitemReceivableAmount; + /** + * 结算金额，应收金额 - 优惠金额 + */ + private String sitemSettleAmount; + private String price; + @ApiModelProperty("折扣（0-10，0免费，10不打折）") + private String discount; + private String repairerName; + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AitemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AitemVo.java index c2fb118070..fc9f49b985 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AitemVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AitemVo.java @@ -12,7 +12,7 @@ import java.math.BigDecimal; */ @Data public class AitemVo { - + private String sid; @ApiModelProperty("附加项目sid") private String aitemSid; @ApiModelProperty("附加项目名称") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java index 9a8f2123c1..216a391b27 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java @@ -181,4 +181,8 @@ public class AsBusrepairBillDto implements Dto { private String shClaimTypeKey; @ApiModelProperty("索赔类型value") private String shClaimTypeValue; + + private String outSid; //外出费sid + private String subsidySid; //厂家补助SID + private String rescueSid; //施救费sid } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java index fb7d1f9fc8..e95b0726a2 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java @@ -73,5 +73,5 @@ public class GoodsDetailsVo implements Vo { private String serviceItem; @ApiModelProperty("配件销售人") private String partsSellers2; - + private String goodsDetailsSid; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java index ba6f106300..9b0f6ba550 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java @@ -36,7 +36,7 @@ public class InvoiceVo { @ApiModelProperty("开票单位") private String invoiceCompany; @ApiModelProperty("加税点项目“,”英文逗号拼接") - private List taxItems = new ArrayList<>(); + private List taxItems; @ApiModelProperty("加税点项目") private String taxItems2; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java index ca304690b5..79a9af8618 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/SitemVo.java @@ -14,6 +14,7 @@ import java.util.List; */ @Data public class SitemVo { + private String sid; @ApiModelProperty("项目sid") private String serviceItemSid; @ApiModelProperty("项目名称") @@ -49,6 +50,10 @@ public class SitemVo { private String staffNames; @ApiModelProperty("单价-100，工时数-5小时，提成-100") private String manHourInfo; + @ApiModelProperty("成本价") + private String cost; + @ApiModelProperty("成本合计（成本价*数量）") + private String costTotal; //-------------维修人员--------------- // @ApiModelProperty("维修人员sid") // private String repairerSid; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleDetailsVo.java index 5856caa78f..3381f64ab2 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleDetailsVo.java @@ -151,4 +151,13 @@ public class AsBusrepairBillReverseSettleDetailsVo implements Vo { @ApiModelProperty("施救费开票金额") private String rescueKPAmount; private List files = new ArrayList<>(); //文件名称 + + private String outPrint; //外出利润额 + private String subsidyCost; //厂家补助成本 + private String subsidyPrint; //厂家补助利润额 + private String rescueCost; //施救费成本 + private String rescuePrint; //施救费利润额 + private String outSid; //外出费sid + private String subsidySid; //厂家补助SID + private String rescueSid; //施救费sid } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyRest.java index 3f42066e29..488624e3c0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyRest.java @@ -84,7 +84,7 @@ public class AsBillSettelApplyRest { @ApiOperation("新增或修改") @PostMapping("/save") - public ResultBean save(@RequestBody AsBillSettelApplyDto dto){ + public ResultBean save(@RequestBody AsBillSettelApplyDetailsVo dto){ ResultBean rb = ResultBean.fireFail(); asBillSettelApplyService.saveOrUpdateDto(dto); return rb.success(); @@ -99,6 +99,16 @@ public class AsBillSettelApplyRest { return rb.success(); } + @ApiOperation("维修单初始化") + @GetMapping("/busrepairbillInit") + public ResultBean busrepairbillInit(@RequestParam("sid") String sid, + @RequestParam("userSid") String userSid, + @RequestParam("orgPath") String orgPath + ){ + ResultBean rb = ResultBean.fireFail(); + AsBillSettelApplyDetailsVo vo = asBillSettelApplyService.busrepairbillInit(sid,userSid,orgPath); + return rb.success().setData(vo); + } @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java index 5b347cb023..2e95c3b99c 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java @@ -37,6 +37,10 @@ import com.yxt.anrui.as.api.asbillsettelapply.flow.app.AppSettleDelegateQuery; import com.yxt.anrui.as.api.asbillsettelapply.flow.app.AppSettleTaskQuery; import com.yxt.anrui.as.api.asbillsettelapply.flow.app.CompleteSettleDto; import com.yxt.anrui.as.api.asbillsettelapply.flow.app.SettleFlowableQuery; +import com.yxt.anrui.as.api.asbillsettelapplyaitem.AsBillSettelApplyAitem; +import com.yxt.anrui.as.api.asbillsettelapplyaitemspec.AsBillSettelApplyAitemspec; +import com.yxt.anrui.as.api.asbillsettelapplydetail.AsBillSettelApplyDetail; +import com.yxt.anrui.as.api.asbillsettelapplysitem.AsBillSettelApplySitem; import com.yxt.anrui.as.api.asbusrepairbill.*; import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNode; import com.yxt.anrui.as.api.asbusrepairbillreversesettle.AsBusrepairBillReverseSettle; @@ -47,6 +51,10 @@ import com.yxt.anrui.as.api.enums.AsBillTypeEnum; import com.yxt.anrui.as.api.utils.AsRule; import com.yxt.anrui.as.api.utils.FileUrlQuery; import com.yxt.anrui.as.api.utils.domain.AsBillNo; +import com.yxt.anrui.as.biz.asbillsettelapplyaitem.AsBillSettelApplyAitemService; +import com.yxt.anrui.as.biz.asbillsettelapplyaitemspec.AsBillSettelApplyAitemSpecService; +import com.yxt.anrui.as.biz.asbillsettelapplydetail.AsBillSettelApplyDetailService; +import com.yxt.anrui.as.biz.asbillsettelapplysitem.AsBillSettelApplySitemService; import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService; import com.yxt.anrui.as.biz.asserviceattachitem.AsServiceAttachItemService; import com.yxt.anrui.as.biz.asserviceitem.AsServiceItemService; @@ -126,6 +134,15 @@ public class AsBillSettelApplyService extends MybatisBaseService createQueryWrapper(AsBillSettelApplyQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -209,14 +226,115 @@ public class AsBillSettelApplyService extends MybatisBaseService 0) { + List aitemVos = dto.getAitemVos(); + for (SettleAitemVo aitemVo : aitemVos) { + AsBillSettelApplyAitem a = new AsBillSettelApplyAitem(); + BeanUtil.copyProperties(aitemVo,a,"sid"); + a.setMainSid(sid); + asBillSettelApplyAitemService.insert(a); + } + } + if (!dto.getSitemVos().isEmpty() && dto.getSitemVos().size() > 0) { + List sitemVos = dto.getSitemVos(); + for (SettleSitemVo sitemVo : sitemVos) { + AsBillSettelApplySitem a = new AsBillSettelApplySitem(); + BeanUtil.copyProperties(sitemVo,a,"sid"); + a.setMainSid(sid); + asBillSettelApplySitemService.insert(a); + } + } + if (!dto.getGoodsDetailsVos().isEmpty() && dto.getGoodsDetailsVos().size() > 0) { + List goodsDetailsVos = dto.getGoodsDetailsVos(); + for (SettleGoodsDetailsVo g : goodsDetailsVos) { + AsBillSettelApplyDetail d = new AsBillSettelApplyDetail(); + BeanUtil.copyProperties(g,d,"sid"); + d.setMainSid(sid); + asBillSettelApplyDetailService.insert(d); + } + } + if (StringUtils.isNotBlank(dto.getOutAmount())) { + BigDecimal outAmount = new BigDecimal(dto.getOutAmount()); + if (outAmount.compareTo(BigDecimal.ZERO) > 0) { + AsBillSettelApplyAitemspec s = new AsBillSettelApplyAitemspec(); + s.setMainSid(sid); + s.setAttachItem("外出费"); + s.setPrice(outAmount); + if (StringUtils.isNotBlank(dto.getOutKPAmount())) { + s.setTaxPrice(new BigDecimal(dto.getOutKPAmount())); + } + if (StringUtils.isNotBlank(dto.getOutCost())) { + s.setCostTotal(new BigDecimal(dto.getOutCost())); + } + if (StringUtils.isNotBlank(dto.getOutRemarks())) { + s.setRemarks(dto.getOutRemarks()); + } + asBillSettelApplyAitemSpecService.insert(s); + } + } + if (StringUtils.isNotBlank(dto.getSubsidyAmount())) { + BigDecimal amount = new BigDecimal(dto.getSubsidyAmount()); + if (amount.compareTo(BigDecimal.ZERO) > 0) { + AsBillSettelApplyAitemspec s = new AsBillSettelApplyAitemspec(); + s.setMainSid(sid); + s.setAttachItem("厂家补助"); + s.setPrice(amount); + if (StringUtils.isNotBlank(dto.getSubsidyKPAmount())) { + s.setTaxPrice(new BigDecimal(dto.getSubsidyKPAmount())); + } + if (StringUtils.isNotBlank(dto.getSubsidyCost())) { + s.setCostTotal(new BigDecimal(dto.getSubsidyCost())); + } + if (StringUtils.isNotBlank(dto.getSubsidyRemarks())) { + s.setRemarks(dto.getSubsidyRemarks()); + } + asBillSettelApplyAitemSpecService.insert(s); + } + } + if (StringUtils.isNotBlank(dto.getRescueAmount())) { + BigDecimal amount = new BigDecimal(dto.getRescueAmount()); + if (amount.compareTo(BigDecimal.ZERO) > 0) { + AsBillSettelApplyAitemspec s = new AsBillSettelApplyAitemspec(); + s.setMainSid(sid); + s.setAttachItem("施救费"); + s.setPrice(amount); + if (StringUtils.isNotBlank(dto.getRescueKPAmount())) { + s.setTaxPrice(new BigDecimal(dto.getRescueKPAmount())); + } + if (StringUtils.isNotBlank(dto.getRescueCost())) { + s.setCostTotal(new BigDecimal(dto.getRescueCost())); + } + if (StringUtils.isNotBlank(dto.getRescueRemarks())) { + s.setRemarks(dto.getRescueRemarks()); + } + asBillSettelApplyAitemSpecService.insert(s); + } } - this.updateByDto(dto); - return dtoSid; + + + + return sid; } /** @@ -238,7 +356,7 @@ public class AsBillSettelApplyService extends MybatisBaseService sitemVos = data.getSitemVos(); + if (!sitemVos.isEmpty()) { + List settleSitemVos = new ArrayList<>(); + for (SitemVo s : sitemVos) { + SettleSitemVo v = new SettleSitemVo(); + BeanUtil.copyProperties(s,v); + BigDecimal yingshou = BigDecimal.ZERO; //应收 + BigDecimal youhui = BigDecimal.ZERO; //优惠 + BigDecimal jiesuan = BigDecimal.ZERO; //结算 + BigDecimal chengben = BigDecimal.ZERO; //成本 + BigDecimal lirun = BigDecimal.ZERO; //利润 + if (StringUtils.isNotBlank(s.getAmount())) { + yingshou = new BigDecimal(s.getAmount()); + v.setSitemReceivableAmount(yingshou.toString()); + } + if (StringUtils.isNotBlank(s.getDiscountAmount())) { + youhui = new BigDecimal(s.getDiscountAmount()); + } + jiesuan = yingshou.subtract(youhui); + v.setSitemSettleAmount(jiesuan.toString()); + if (StringUtils.isNotBlank(s.getCostTotal())) { + chengben = new BigDecimal(s.getCostTotal()); + } + v.setSitemCost(chengben.toString()); + lirun = jiesuan.subtract(chengben); + v.setSitemPrint(lirun.toString()); + costAmount = costAmount.add(chengben); + profit = profit.add(lirun); + settleSitemVos.add(v); + } + vo.setSitemVos(settleSitemVos); + } + List goodsDetailsVos = data.getGoodsDetailsVos(); + if (!goodsDetailsVos.isEmpty()) { + List goodsList = new ArrayList<>(); + for (GoodsDetailsVo g : goodsDetailsVos) { + SettleGoodsDetailsVo v = new SettleGoodsDetailsVo(); + BeanUtil.copyProperties(g,v); + if (StringUtils.isNotBlank(g.getPartsSellers2())) { + v.setPartsSellers(g.getPartsSellers2()); + } + BigDecimal yingshou = BigDecimal.ZERO; //应收 + BigDecimal youhui = BigDecimal.ZERO; //优惠 + BigDecimal jiesuan = BigDecimal.ZERO; //结算 + BigDecimal chengben = BigDecimal.ZERO; //成本 + BigDecimal chengbenPrice = BigDecimal.ZERO; //成本单价 + BigDecimal lirun = BigDecimal.ZERO; //利润 + BigDecimal count = BigDecimal.ZERO; //数量 + if (StringUtils.isNotBlank(g.getCount())) { + count = new BigDecimal(g.getCount()); + } + if (StringUtils.isNotBlank(g.getPrice())) { + BigDecimal price = new BigDecimal(g.getPrice()); + yingshou = price.multiply(count); + v.setGoodsReceivableAmount(yingshou.toString()); + } + if (StringUtils.isNotBlank(g.getDiscountAmount())) { + youhui = new BigDecimal(g.getDiscountAmount()); + } + jiesuan = yingshou.subtract(youhui); + v.setGoodsSettleAmount(jiesuan.toString()); + //求成本 + if (StringUtils.isNotBlank(g.getInventorySid())) { + String inventorySid = g.getInventorySid(); + WmsInventory inventory = wmsInventoryFeign.fetchEntityBySid(inventorySid).getData(); + if (null != inventory) { + if (null != inventory.getCost()) { + chengbenPrice = inventory.getCost(); + chengben = chengbenPrice.multiply(count); + } + } + } + v.setGoodsCost(chengben.toString()); + lirun = jiesuan.subtract(chengben); + v.setGoodsPrint(lirun.toString()); + costAmount = costAmount.add(chengben); + profit = profit.add(lirun); + goodsList.add(v); + } + vo.setGoodsDetailsVos(goodsList); + } + List aitemVos = data.getAitemVos(); + if (!aitemVos.isEmpty()) { + List aitemVoList = new ArrayList<>(); + for (AitemVo a : aitemVos) { + SettleAitemVo v = new SettleAitemVo(); + BeanUtil.copyProperties(a,v); + BigDecimal yingshou = BigDecimal.ZERO; //应收 + BigDecimal chengben = BigDecimal.ZERO; //成本 + BigDecimal lirun = BigDecimal.ZERO; //利润 + if (StringUtils.isNotBlank(a.getPrice())) { + yingshou = new BigDecimal(a.getPrice()); + v.setAitemReceivableAmount(yingshou.toString()); + } + //求成本 + if (StringUtils.isNotBlank(a.getAitemSid())) { + String aitemsid = a.getAitemSid(); + AsServiceAttachItem attachItem = asServiceAttachItemService.fetchBySid(aitemsid); + if (null != attachItem) { + if (null != attachItem.getCost()) { + chengben = attachItem.getCost(); + } + } + } + v.setAitemCost(chengben.toString()); + lirun = yingshou.subtract(chengben); + v.setAitemPrint(lirun.toString()); + costAmount = costAmount.add(chengben); + profit = profit.add(lirun); + aitemVoList.add(v); + } + vo.setAitemVos(aitemVoList); + } +// if (outKPAmount.compareTo(BigDecimal.ZERO) > 0) { +// profit = profit.add(outKPAmount); +// } else { +// profit = profit.add(outAmount); +// } +// if (subsidyKPAmount.compareTo(BigDecimal.ZERO) > 0) { +// profit = profit.add(subsidyKPAmount); +// } else { +// profit = profit.add(subsidyAmount); +// } +// if (rescueKPAmount.compareTo(BigDecimal.ZERO) > 0) { +// profit = profit.add(rescueKPAmount); +// } else { +// profit = profit.add(rescueAmount); +// } + vo.setProfit(profit.toString()); + vo.setCostAmount(costAmount.toString()); + List fileName = data.getFileName(); + if (!fileName.isEmpty()) { + vo.setFileName(fileName); + List files = new ArrayList<>(); + for (FileUrlQuery fileUrlQuery : fileName) { + files.add(fileUrlQuery.getUrl()); + } + vo.setFileName2(files); + } + } + //根据用户查询发起人、发起部门、发起日期为当前日期 + String deptName = ""; + String deptSid = ""; + String useOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + deptName = sysOrganization.getName() + "/" + sysOrganization1.getName(); + deptName = sysOrganization1.getName(); + deptSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + deptName = sysOrganization.getName(); + deptName = sysOrganization.getName(); + deptSid = sysOrganization.getSid(); + } + useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + } + //创建组织使用组织 + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(useOrgSid); + if (organizationResultBean.getData() != null) { + vo.setUseOrgName(organizationResultBean.getData().getName()); + } + //根据用户sid查询人员姓名 + ResultBean userVoResultBean = sysUserFeign.fetchBySid(userSid); + vo.setDept(deptName); + vo.setDeptSid(deptSid); + vo.setCreateByName(userVoResultBean.getData().getName()); + vo.setApplyDate(DateUtil.today()); + vo.setOrgPath(orgPath); + vo.setCreateBySid(userSid); + vo.setUseOrgSid(useOrgSid); + vo.setSourceBillType("1"); + return vo; + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitem/AsBillSettelApplyAitemMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitem/AsBillSettelApplyAitemMapper.java new file mode 100644 index 0000000000..e5b037ee36 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitem/AsBillSettelApplyAitemMapper.java @@ -0,0 +1,51 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbillsettelapplyaitem; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.as.api.asbillsettelapplyaitem.AsBillSettelApplyAitem; +import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface AsBillSettelApplyAitemMapper extends BaseMapper { + + @Select("select * from as_bill_settel_apply_aitem where mainSid = #{billSid}") + List fetchByBillSid(@Param("billSid") String billSid); + + @Delete("delete from as_bill_settel_apply_aitem where mainSid = #{billSid}") + void delByBillSid(String billSid); +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitem/AsBillSettelApplyAitemMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitem/AsBillSettelApplyAitemMapper.xml new file mode 100644 index 0000000000..a0c4e79f02 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitem/AsBillSettelApplyAitemMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitem/AsBillSettelApplyAitemRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitem/AsBillSettelApplyAitemRest.java new file mode 100644 index 0000000000..ec1ff2d29f --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitem/AsBillSettelApplyAitemRest.java @@ -0,0 +1,45 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbillsettelapplyaitem; + + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "维修工单-保险信息") +@RestController +@RequestMapping("v1/AsBillSettelApplyAitem") +public class AsBillSettelApplyAitemRest { + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitem/AsBillSettelApplyAitemService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitem/AsBillSettelApplyAitemService.java new file mode 100644 index 0000000000..33ea910bea --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitem/AsBillSettelApplyAitemService.java @@ -0,0 +1,51 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbillsettelapplyaitem; + +import com.yxt.anrui.as.api.asbillsettelapplyaitem.AsBillSettelApplyAitem; +import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class AsBillSettelApplyAitemService extends MybatisBaseService { + + public List fetchByBillSid(String billSid) { + return baseMapper.fetchByBillSid(billSid); + } + + public void delByBillSid(String billSid) { + baseMapper.delByBillSid(billSid); + } + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitemspec/AsBillSettelApplyAitemSpecMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitemspec/AsBillSettelApplyAitemSpecMapper.java new file mode 100644 index 0000000000..ef8c78a3f9 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitemspec/AsBillSettelApplyAitemSpecMapper.java @@ -0,0 +1,51 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbillsettelapplyaitemspec; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.as.api.asbillsettelapplyaitemspec.AsBillSettelApplyAitemspec; +import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface AsBillSettelApplyAitemSpecMapper extends BaseMapper { + + @Select("select * from as_bill_settel_apply_aitemspec where mainSid = #{billSid}") + List fetchByBillSid(@Param("billSid") String billSid); + + @Delete("delete from as_bill_settel_apply_aitemspec where mainSid = #{billSid}") + void delByBillSid(String billSid); +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitemspec/AsBillSettelApplyAitemSpecMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitemspec/AsBillSettelApplyAitemSpecMapper.xml new file mode 100644 index 0000000000..058f5b12dc --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitemspec/AsBillSettelApplyAitemSpecMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitemspec/AsBillSettelApplyAitemSpecRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitemspec/AsBillSettelApplyAitemSpecRest.java new file mode 100644 index 0000000000..22d17d691b --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitemspec/AsBillSettelApplyAitemSpecRest.java @@ -0,0 +1,45 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbillsettelapplyaitemspec; + + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "维修工单-保险信息") +@RestController +@RequestMapping("v1/AsBillSettelApplyAitemspec") +public class AsBillSettelApplyAitemSpecRest { + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitemspec/AsBillSettelApplyAitemSpecService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitemspec/AsBillSettelApplyAitemSpecService.java new file mode 100644 index 0000000000..c4e171b8bf --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplyaitemspec/AsBillSettelApplyAitemSpecService.java @@ -0,0 +1,51 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbillsettelapplyaitemspec; + +import com.yxt.anrui.as.api.asbillsettelapplyaitemspec.AsBillSettelApplyAitemspec; +import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class AsBillSettelApplyAitemSpecService extends MybatisBaseService { + + public List fetchByBillSid(String billSid) { + return baseMapper.fetchByBillSid(billSid); + } + + public void delByBillSid(String billSid) { + baseMapper.delByBillSid(billSid); + } + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplydetail/AsBillSettelApplyDetailMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplydetail/AsBillSettelApplyDetailMapper.java new file mode 100644 index 0000000000..edd2d02604 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplydetail/AsBillSettelApplyDetailMapper.java @@ -0,0 +1,51 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbillsettelapplydetail; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.as.api.asbillsettelapplydetail.AsBillSettelApplyDetail; +import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface AsBillSettelApplyDetailMapper extends BaseMapper { + + @Select("select * from as_bill_settel_apply_detail where mainSid = #{billSid}") + List fetchByBillSid(@Param("billSid") String billSid); + + @Delete("delete from as_bill_settel_apply_detail where mainSid = #{billSid}") + void delByBillSid(String billSid); +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplydetail/AsBillSettelApplyDetailMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplydetail/AsBillSettelApplyDetailMapper.xml new file mode 100644 index 0000000000..ac8f4ebba1 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplydetail/AsBillSettelApplyDetailMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplydetail/AsBillSettelApplyDetailRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplydetail/AsBillSettelApplyDetailRest.java new file mode 100644 index 0000000000..5fb232e771 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplydetail/AsBillSettelApplyDetailRest.java @@ -0,0 +1,45 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbillsettelapplydetail; + + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "维修工单-保险信息") +@RestController +@RequestMapping("v1/AsBillSettelApplyDetail") +public class AsBillSettelApplyDetailRest { + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplydetail/AsBillSettelApplyDetailService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplydetail/AsBillSettelApplyDetailService.java new file mode 100644 index 0000000000..133f4adcf4 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplydetail/AsBillSettelApplyDetailService.java @@ -0,0 +1,51 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbillsettelapplydetail; + +import com.yxt.anrui.as.api.asbillsettelapplydetail.AsBillSettelApplyDetail; +import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class AsBillSettelApplyDetailService extends MybatisBaseService { + + public List fetchByBillSid(String billSid) { + return baseMapper.fetchByBillSid(billSid); + } + + public void delByBillSid(String billSid) { + baseMapper.delByBillSid(billSid); + } + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplysitem/AsBillSettelApplySitemMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplysitem/AsBillSettelApplySitemMapper.java new file mode 100644 index 0000000000..f1f62df2d1 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplysitem/AsBillSettelApplySitemMapper.java @@ -0,0 +1,51 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbillsettelapplysitem; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.as.api.asbillsettelapplysitem.AsBillSettelApplySitem; +import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface AsBillSettelApplySitemMapper extends BaseMapper { + + @Select("select * from as_bill_settel_apply_sitem where mainSid = #{billSid}") + List fetchByBillSid(@Param("billSid") String billSid); + + @Delete("delete from as_bill_settel_apply_sitem where mainSid = #{billSid}") + void delByBillSid(String billSid); +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplysitem/AsBillSettelApplySitemMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplysitem/AsBillSettelApplySitemMapper.xml new file mode 100644 index 0000000000..a539104503 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplysitem/AsBillSettelApplySitemMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplysitem/AsBillSettelApplySitemRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplysitem/AsBillSettelApplySitemRest.java new file mode 100644 index 0000000000..79e14ba7f6 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplysitem/AsBillSettelApplySitemRest.java @@ -0,0 +1,45 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbillsettelapplysitem; + + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "维修工单-保险信息") +@RestController +@RequestMapping("v1/AsBillSettelApplySitem") +public class AsBillSettelApplySitemRest { + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplysitem/AsBillSettelApplySitemService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplysitem/AsBillSettelApplySitemService.java new file mode 100644 index 0000000000..41213eec23 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapplysitem/AsBillSettelApplySitemService.java @@ -0,0 +1,51 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.biz.asbillsettelapplysitem; + +import com.yxt.anrui.as.api.asbillsettelapplysitem.AsBillSettelApplySitem; +import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class AsBillSettelApplySitemService extends MybatisBaseService { + + public List fetchByBillSid(String billSid) { + return baseMapper.fetchByBillSid(billSid); + } + + public void delByBillSid(String billSid) { + baseMapper.delByBillSid(billSid); + } + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index 6b59506d60..3f24b8dd54 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -727,6 +727,7 @@ public class AsBusrepairBillService extends MybatisBaseService file = new ArrayList<>(); List file2 = new ArrayList<>(); List asAppendices = asAppendixService.fetchByLinkSid(sid); @@ -1470,231 +1471,231 @@ public class AsBusrepairBillService extends MybatisBaseService sitems = asBusrepairBillSitemService.fetchByBillSid(sid); - if (sitems != null) { - if (!sitems.isEmpty()) { - for (AsBusrepairBillSitem sitem : sitems) { - BigDecimal examineHourPrice = BigDecimal.ZERO; - if (null != sitem.getExamineHourPrice()) { - examineHourPrice = sitem.getExamineHourPrice(); - } - if (examineHourPrice.compareTo(BigDecimal.ZERO) > 0) { - String billSid = sitem.getBillSid(); - String serviceItemSid = sitem.getServiceItemSid(); - List repairers = asBusrepairBillSitemRepairerService.fetchByBillSid(billSid, serviceItemSid); - if (null != repairers) { - if (!repairers.isEmpty()) { - //查询权重之和 - BigDecimal sum = BigDecimal.ZERO; - Map map = new HashMap<>(); - for (AsBusrepairBillSitemRepairer repairer : repairers) { - String rSid = repairer.getSid(); - String pSid = repairer.getRepairerSid(); - BigDecimal weight = BigDecimal.ZERO; - String w = asTechTitleDetailService.selWeightByUserSid(pSid); - if (StringUtils.isNotBlank(w)) { - weight = new BigDecimal(w); - } - sum = sum.add(weight); - map.put(rSid, weight); - } - if (sum.compareTo(BigDecimal.ZERO) > 0) { - if (map.size() > 0) { - for (Map.Entry entry : map.entrySet()) { - String mSid = entry.getKey(); - BigDecimal mWeight = entry.getValue(); - AsBusrepairBillSitemRepairer repairer = asBusrepairBillSitemRepairerService.fetchBySid(mSid); - BigDecimal finalWeight = mWeight.divide(sum, 2, BigDecimal.ROUND_HALF_UP).multiply(examineHourPrice); - repairer.setCommission(finalWeight); - asBusrepairBillSitemRepairerService.updateById(repairer); - } - } - } - } - } - } - } - } - } +// //计算工时提成分配维修人员 +// List sitems = asBusrepairBillSitemService.fetchByBillSid(sid); +// if (sitems != null) { +// if (!sitems.isEmpty()) { +// for (AsBusrepairBillSitem sitem : sitems) { +// BigDecimal examineHourPrice = BigDecimal.ZERO; +// if (null != sitem.getExamineHourPrice()) { +// examineHourPrice = sitem.getExamineHourPrice(); +// } +// if (examineHourPrice.compareTo(BigDecimal.ZERO) > 0) { +// String billSid = sitem.getBillSid(); +// String serviceItemSid = sitem.getServiceItemSid(); +// List repairers = asBusrepairBillSitemRepairerService.fetchByBillSid(billSid, serviceItemSid); +// if (null != repairers) { +// if (!repairers.isEmpty()) { +// //查询权重之和 +// BigDecimal sum = BigDecimal.ZERO; +// Map map = new HashMap<>(); +// for (AsBusrepairBillSitemRepairer repairer : repairers) { +// String rSid = repairer.getSid(); +// String pSid = repairer.getRepairerSid(); +// BigDecimal weight = BigDecimal.ZERO; +// String w = asTechTitleDetailService.selWeightByUserSid(pSid); +// if (StringUtils.isNotBlank(w)) { +// weight = new BigDecimal(w); +// } +// sum = sum.add(weight); +// map.put(rSid, weight); +// } +// if (sum.compareTo(BigDecimal.ZERO) > 0) { +// if (map.size() > 0) { +// for (Map.Entry entry : map.entrySet()) { +// String mSid = entry.getKey(); +// BigDecimal mWeight = entry.getValue(); +// AsBusrepairBillSitemRepairer repairer = asBusrepairBillSitemRepairerService.fetchBySid(mSid); +// BigDecimal finalWeight = mWeight.divide(sum, 2, BigDecimal.ROUND_HALF_UP).multiply(examineHourPrice); +// repairer.setCommission(finalWeight); +// asBusrepairBillSitemRepairerService.updateById(repairer); +// } +// } +// } +// } +// } +// } +// } +// } +// } if (asBusrepairBill.getSubject().equals("保内")) { if (asBusrepairBill.getOldIsReclaim() != 1) { return rb.setMsg("请先完成旧件入库，再进行操作！"); } - asBusrepairBill.setNodeCode(6); - asBusrepairBill.setNodeName("已结算"); - asBusrepairBill.setNodeTime(new DateTime()); - asBusrepairBill.setSettleTime(DateUtil.formatDate(new Date())); - if (asBusrepairBill.getMaterialConfirm().intValue() == 0) { - asBusrepairBill.setMaterialConfirm(1); - asBusrepairBill.setOutDoorState("2"); - } - baseMapper.updateById(asBusrepairBill); - //新增工单环节信息 - AsBusrepairBillNode billNode = new AsBusrepairBillNode(); - billNode.setBillSid(sid); - billNode.setCreateByName(dto.getOperator()); - billNode.setNodeName("已结算"); - billNode.setCreateBySid(dto.getOperatorSid()); - billNode.setNodeCode("6"); - asBusrepairBillNodeService.insert(billNode); - } - if (asBusrepairBill.getSubject().equals("保外")) { - SettleVo settleVo = dto.getSettleVo(); - if (null != settleVo) { - FmsReceivesettleDto settleDto = new FmsReceivesettleDto(); - BeanUtil.copyProperties(settleVo, settleDto, "id", "sid"); - settleDto.setCreateBySid(dto.getOperatorSid()); - settleDto.setCreateByName(dto.getOperator()); - settleDto.setSourceBillSid(dto.getSid()); - settleDto.setSourceBillNo(asBusrepairBill.getBillNo()); - fmsReceivesettleFeign.save(settleDto); - if (null != asBusrepairBill.getHourAmount()) { - if (asBusrepairBill.getHourAmount().compareTo(BigDecimal.ZERO) > 0) { - FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto(); - finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName()); - finUncollectedReceivablesDetailedDto.setCreateBySid(asBusrepairBill.getCreateBySid()); - finUncollectedReceivablesDetailedDto.setCustomerSid(asBusrepairBill.getCustomerSid()); - finUncollectedReceivablesDetailedDto.setCustomerName(asBusrepairBill.getCustomerName()); - finUncollectedReceivablesDetailedDto.setContractSid(asBusrepairBill.getSid()); - finUncollectedReceivablesDetailedDto.setContractNo(asBusrepairBill.getBillNo()); - AsBusrepairBillVech billVech = asBusrepairBillVechService.fetchByBillSid(asBusrepairBill.getSid()); - if (null != billVech) { - if (StringUtils.isNotBlank(billVech.getVinNo())) { - finUncollectedReceivablesDetailedDto.setVIN(billVech.getVinNo()); - finUncollectedReceivablesDetailedDto.setBusVinSid(billVech.getSid()); - } - } - finUncollectedReceivablesDetailedDto.setStaffDeptSid(asBusrepairBill.getDeptSid()); - finUncollectedReceivablesDetailedDto.setStaffDeptName(asBusrepairBill.getDeptName()); - finUncollectedReceivablesDetailedDto.setCustomerPhone(asBusrepairBill.getMobile()); - finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid()); - finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath()); - finUncollectedReceivablesDetailedDto.setReceivablesName("工时费"); - finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney((asBusrepairBill.getHourAmount()).toString()); - finUncollectedReceivablesDetailedDto.setReveivableMoney((asBusrepairBill.getHourAmount()).toString()); - finUncollectedReceivablesDetailedDto.setUseOrgName(asBusrepairBill.getUseOrgName()); - finUncollectedReceivablesDetailedDto.setKxState("01"); - finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto); - } - } - if (null != asBusrepairBill.getGoodsAmount()) { - if (asBusrepairBill.getGoodsAmount().compareTo(BigDecimal.ZERO) > 0) { - FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto(); - finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName()); - finUncollectedReceivablesDetailedDto.setCreateBySid(asBusrepairBill.getCreateBySid()); - finUncollectedReceivablesDetailedDto.setCustomerSid(asBusrepairBill.getCustomerSid()); - finUncollectedReceivablesDetailedDto.setCustomerName(asBusrepairBill.getCustomerName()); - finUncollectedReceivablesDetailedDto.setContractSid(asBusrepairBill.getSid()); - finUncollectedReceivablesDetailedDto.setContractNo(asBusrepairBill.getBillNo()); - AsBusrepairBillVech billVech = asBusrepairBillVechService.fetchByBillSid(asBusrepairBill.getSid()); - if (null != billVech) { - if (StringUtils.isNotBlank(billVech.getVinNo())) { - finUncollectedReceivablesDetailedDto.setVIN(billVech.getVinNo()); - finUncollectedReceivablesDetailedDto.setBusVinSid(billVech.getSid()); - } - } - finUncollectedReceivablesDetailedDto.setStaffDeptSid(asBusrepairBill.getDeptSid()); - finUncollectedReceivablesDetailedDto.setStaffDeptName(asBusrepairBill.getDeptName()); - finUncollectedReceivablesDetailedDto.setCustomerPhone(asBusrepairBill.getMobile()); - finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid()); - finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath()); - finUncollectedReceivablesDetailedDto.setReceivablesName("材料费"); - finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney((asBusrepairBill.getGoodsAmount()).toString()); - finUncollectedReceivablesDetailedDto.setReveivableMoney((asBusrepairBill.getGoodsAmount()).toString()); - finUncollectedReceivablesDetailedDto.setUseOrgName(asBusrepairBill.getUseOrgName()); - finUncollectedReceivablesDetailedDto.setKxState("01"); - finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto); - } - } - BigDecimal addAmount = BigDecimal.ZERO; - BigDecimal outAmount = BigDecimal.ZERO; - BigDecimal subsidyAmount = BigDecimal.ZERO; - BigDecimal rescueAmount = BigDecimal.ZERO; - if (null != asBusrepairBill.getAddAmount()) { - addAmount = asBusrepairBill.getAddAmount(); - } - if (null != asBusrepairBill.getOutAmount()) { - outAmount = asBusrepairBill.getOutAmount(); - } - if (null != asBusrepairBill.getSubsidyAmount()) { - subsidyAmount = asBusrepairBill.getSubsidyAmount(); - } - if (null != asBusrepairBill.getRescueAmount()) { - rescueAmount = asBusrepairBill.getRescueAmount(); - } - BigDecimal otherAmountAll = addAmount.add(outAmount).add(subsidyAmount).add(rescueAmount); - if (otherAmountAll.compareTo(BigDecimal.ZERO) > 0) { - FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto(); - finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName()); - finUncollectedReceivablesDetailedDto.setCreateBySid(asBusrepairBill.getCreateBySid()); - finUncollectedReceivablesDetailedDto.setCustomerSid(asBusrepairBill.getCustomerSid()); - finUncollectedReceivablesDetailedDto.setCustomerName(asBusrepairBill.getCustomerName()); - finUncollectedReceivablesDetailedDto.setContractSid(asBusrepairBill.getSid()); - finUncollectedReceivablesDetailedDto.setContractNo(asBusrepairBill.getBillNo()); - AsBusrepairBillVech billVech = asBusrepairBillVechService.fetchByBillSid(asBusrepairBill.getSid()); - if (null != billVech) { - if (StringUtils.isNotBlank(billVech.getVinNo())) { - finUncollectedReceivablesDetailedDto.setVIN(billVech.getVinNo()); - finUncollectedReceivablesDetailedDto.setBusVinSid(billVech.getSid()); - } - } - finUncollectedReceivablesDetailedDto.setStaffDeptSid(asBusrepairBill.getDeptSid()); - finUncollectedReceivablesDetailedDto.setStaffDeptName(asBusrepairBill.getDeptName()); - finUncollectedReceivablesDetailedDto.setCustomerPhone(asBusrepairBill.getMobile()); - finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid()); - finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath()); - finUncollectedReceivablesDetailedDto.setReceivablesName("其他费用"); - finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney(otherAmountAll.toString()); - finUncollectedReceivablesDetailedDto.setReveivableMoney(otherAmountAll.toString()); - finUncollectedReceivablesDetailedDto.setUseOrgName(asBusrepairBill.getUseOrgName()); - finUncollectedReceivablesDetailedDto.setKxState("01"); - finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto); - } - } - asBusrepairBill.setSettleTime(DateUtil.formatDate(new Date())); - asBusrepairBill.setNodeCode(6); - asBusrepairBill.setNodeName("已结算"); - asBusrepairBill.setNodeTime(new DateTime()); - asBusrepairBill.setOutDoorState("2"); - baseMapper.updateById(asBusrepairBill); - //保外推送结算申请 - AsBillSettelApplyDto settelApplyDto = new AsBillSettelApplyDto(); - settelApplyDto.setNodeState("待提交"); - settelApplyDto.setSourceBillType(0); - settelApplyDto.setCreateByName(dto.getCreateByName()); - settelApplyDto.setCreateTime(new Date()); - settelApplyDto.setCreateBySid(dto.getCreateBySid()); - settelApplyDto.setUseOrgSid(dto.getUseOrgSid()); - settelApplyDto.setDept(dto.getDeptName()); - settelApplyDto.setDeptSid(dto.getDeptSid()); - settelApplyDto.setSourceSid(dto.getSid()); - settelApplyDto.setSourceBillNo(dto.getBillNo()); - settelApplyDto.setCustomerSid(dto.getCustomerSid()); - settelApplyDto.setCustomerName(dto.getCustomerName()); - BigDecimal receivableAmount = BigDecimal.ZERO; // 应收金额 - BigDecimal discountAmount = BigDecimal.ZERO; // 优惠金额 - BigDecimal settleAmount = BigDecimal.ZERO; // 结算金额 - if (StringUtils.isNotBlank(dto.getReceivableAmount())) { - receivableAmount = new BigDecimal(dto.getReceivableAmount()); - } - if (StringUtils.isNotBlank(dto.getDiscountAmount())) { - discountAmount = new BigDecimal(dto.getDiscountAmount()); - } - settleAmount = receivableAmount.subtract(discountAmount); - settelApplyDto.setReceivableAmount(receivableAmount.toString()); - settelApplyDto.setSettleAmount(settleAmount.toString()); - asBillSettelApplyService.saveOrUpdateDto(settelApplyDto); - //新增工单环节信息 - AsBusrepairBillNode billNode = new AsBusrepairBillNode(); - billNode.setBillSid(sid); - billNode.setCreateByName(dto.getOperator()); - billNode.setNodeName("已结算"); - billNode.setCreateBySid(dto.getOperatorSid()); - billNode.setNodeCode("6"); - asBusrepairBillNodeService.insert(billNode); - } +// asBusrepairBill.setNodeCode(6); +// asBusrepairBill.setNodeName("已结算"); +// asBusrepairBill.setNodeTime(new DateTime()); +// asBusrepairBill.setSettleTime(DateUtil.formatDate(new Date())); +// if (asBusrepairBill.getMaterialConfirm().intValue() == 0) { +// asBusrepairBill.setMaterialConfirm(1); +// asBusrepairBill.setOutDoorState("2"); +// } +// baseMapper.updateById(asBusrepairBill); +// //新增工单环节信息 +// AsBusrepairBillNode billNode = new AsBusrepairBillNode(); +// billNode.setBillSid(sid); +// billNode.setCreateByName(dto.getOperator()); +// billNode.setNodeName("已结算"); +// billNode.setCreateBySid(dto.getOperatorSid()); +// billNode.setNodeCode("6"); +// asBusrepairBillNodeService.insert(billNode); + } +// if (asBusrepairBill.getSubject().equals("保外")) { +// SettleVo settleVo = dto.getSettleVo(); +// if (null != settleVo) { +// FmsReceivesettleDto settleDto = new FmsReceivesettleDto(); +// BeanUtil.copyProperties(settleVo, settleDto, "id", "sid"); +// settleDto.setCreateBySid(dto.getOperatorSid()); +// settleDto.setCreateByName(dto.getOperator()); +// settleDto.setSourceBillSid(dto.getSid()); +// settleDto.setSourceBillNo(asBusrepairBill.getBillNo()); +// fmsReceivesettleFeign.save(settleDto); +// if (null != asBusrepairBill.getHourAmount()) { +// if (asBusrepairBill.getHourAmount().compareTo(BigDecimal.ZERO) > 0) { +// FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto(); +// finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName()); +// finUncollectedReceivablesDetailedDto.setCreateBySid(asBusrepairBill.getCreateBySid()); +// finUncollectedReceivablesDetailedDto.setCustomerSid(asBusrepairBill.getCustomerSid()); +// finUncollectedReceivablesDetailedDto.setCustomerName(asBusrepairBill.getCustomerName()); +// finUncollectedReceivablesDetailedDto.setContractSid(asBusrepairBill.getSid()); +// finUncollectedReceivablesDetailedDto.setContractNo(asBusrepairBill.getBillNo()); +// AsBusrepairBillVech billVech = asBusrepairBillVechService.fetchByBillSid(asBusrepairBill.getSid()); +// if (null != billVech) { +// if (StringUtils.isNotBlank(billVech.getVinNo())) { +// finUncollectedReceivablesDetailedDto.setVIN(billVech.getVinNo()); +// finUncollectedReceivablesDetailedDto.setBusVinSid(billVech.getSid()); +// } +// } +// finUncollectedReceivablesDetailedDto.setStaffDeptSid(asBusrepairBill.getDeptSid()); +// finUncollectedReceivablesDetailedDto.setStaffDeptName(asBusrepairBill.getDeptName()); +// finUncollectedReceivablesDetailedDto.setCustomerPhone(asBusrepairBill.getMobile()); +// finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid()); +// finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath()); +// finUncollectedReceivablesDetailedDto.setReceivablesName("工时费"); +// finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney((asBusrepairBill.getHourAmount()).toString()); +// finUncollectedReceivablesDetailedDto.setReveivableMoney((asBusrepairBill.getHourAmount()).toString()); +// finUncollectedReceivablesDetailedDto.setUseOrgName(asBusrepairBill.getUseOrgName()); +// finUncollectedReceivablesDetailedDto.setKxState("01"); +// finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto); +// } +// } +// if (null != asBusrepairBill.getGoodsAmount()) { +// if (asBusrepairBill.getGoodsAmount().compareTo(BigDecimal.ZERO) > 0) { +// FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto(); +// finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName()); +// finUncollectedReceivablesDetailedDto.setCreateBySid(asBusrepairBill.getCreateBySid()); +// finUncollectedReceivablesDetailedDto.setCustomerSid(asBusrepairBill.getCustomerSid()); +// finUncollectedReceivablesDetailedDto.setCustomerName(asBusrepairBill.getCustomerName()); +// finUncollectedReceivablesDetailedDto.setContractSid(asBusrepairBill.getSid()); +// finUncollectedReceivablesDetailedDto.setContractNo(asBusrepairBill.getBillNo()); +// AsBusrepairBillVech billVech = asBusrepairBillVechService.fetchByBillSid(asBusrepairBill.getSid()); +// if (null != billVech) { +// if (StringUtils.isNotBlank(billVech.getVinNo())) { +// finUncollectedReceivablesDetailedDto.setVIN(billVech.getVinNo()); +// finUncollectedReceivablesDetailedDto.setBusVinSid(billVech.getSid()); +// } +// } +// finUncollectedReceivablesDetailedDto.setStaffDeptSid(asBusrepairBill.getDeptSid()); +// finUncollectedReceivablesDetailedDto.setStaffDeptName(asBusrepairBill.getDeptName()); +// finUncollectedReceivablesDetailedDto.setCustomerPhone(asBusrepairBill.getMobile()); +// finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid()); +// finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath()); +// finUncollectedReceivablesDetailedDto.setReceivablesName("材料费"); +// finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney((asBusrepairBill.getGoodsAmount()).toString()); +// finUncollectedReceivablesDetailedDto.setReveivableMoney((asBusrepairBill.getGoodsAmount()).toString()); +// finUncollectedReceivablesDetailedDto.setUseOrgName(asBusrepairBill.getUseOrgName()); +// finUncollectedReceivablesDetailedDto.setKxState("01"); +// finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto); +// } +// } +// BigDecimal addAmount = BigDecimal.ZERO; +// BigDecimal outAmount = BigDecimal.ZERO; +// BigDecimal subsidyAmount = BigDecimal.ZERO; +// BigDecimal rescueAmount = BigDecimal.ZERO; +// if (null != asBusrepairBill.getAddAmount()) { +// addAmount = asBusrepairBill.getAddAmount(); +// } +// if (null != asBusrepairBill.getOutAmount()) { +// outAmount = asBusrepairBill.getOutAmount(); +// } +// if (null != asBusrepairBill.getSubsidyAmount()) { +// subsidyAmount = asBusrepairBill.getSubsidyAmount(); +// } +// if (null != asBusrepairBill.getRescueAmount()) { +// rescueAmount = asBusrepairBill.getRescueAmount(); +// } +// BigDecimal otherAmountAll = addAmount.add(outAmount).add(subsidyAmount).add(rescueAmount); +// if (otherAmountAll.compareTo(BigDecimal.ZERO) > 0) { +// FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto(); +// finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName()); +// finUncollectedReceivablesDetailedDto.setCreateBySid(asBusrepairBill.getCreateBySid()); +// finUncollectedReceivablesDetailedDto.setCustomerSid(asBusrepairBill.getCustomerSid()); +// finUncollectedReceivablesDetailedDto.setCustomerName(asBusrepairBill.getCustomerName()); +// finUncollectedReceivablesDetailedDto.setContractSid(asBusrepairBill.getSid()); +// finUncollectedReceivablesDetailedDto.setContractNo(asBusrepairBill.getBillNo()); +// AsBusrepairBillVech billVech = asBusrepairBillVechService.fetchByBillSid(asBusrepairBill.getSid()); +// if (null != billVech) { +// if (StringUtils.isNotBlank(billVech.getVinNo())) { +// finUncollectedReceivablesDetailedDto.setVIN(billVech.getVinNo()); +// finUncollectedReceivablesDetailedDto.setBusVinSid(billVech.getSid()); +// } +// } +// finUncollectedReceivablesDetailedDto.setStaffDeptSid(asBusrepairBill.getDeptSid()); +// finUncollectedReceivablesDetailedDto.setStaffDeptName(asBusrepairBill.getDeptName()); +// finUncollectedReceivablesDetailedDto.setCustomerPhone(asBusrepairBill.getMobile()); +// finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid()); +// finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath()); +// finUncollectedReceivablesDetailedDto.setReceivablesName("其他费用"); +// finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney(otherAmountAll.toString()); +// finUncollectedReceivablesDetailedDto.setReveivableMoney(otherAmountAll.toString()); +// finUncollectedReceivablesDetailedDto.setUseOrgName(asBusrepairBill.getUseOrgName()); +// finUncollectedReceivablesDetailedDto.setKxState("01"); +// finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto); +// } +// } +// asBusrepairBill.setSettleTime(DateUtil.formatDate(new Date())); +// asBusrepairBill.setNodeCode(6); +// asBusrepairBill.setNodeName("已结算"); +// asBusrepairBill.setNodeTime(new DateTime()); +// asBusrepairBill.setOutDoorState("2"); +// baseMapper.updateById(asBusrepairBill); +// //保外推送结算申请 +// AsBillSettelApplyDto settelApplyDto = new AsBillSettelApplyDto(); +// settelApplyDto.setNodeState("待提交"); +// settelApplyDto.setSourceBillType(0); +// settelApplyDto.setCreateByName(dto.getCreateByName()); +// settelApplyDto.setCreateTime(new Date()); +// settelApplyDto.setCreateBySid(dto.getCreateBySid()); +// settelApplyDto.setUseOrgSid(dto.getUseOrgSid()); +// settelApplyDto.setDept(dto.getDeptName()); +// settelApplyDto.setDeptSid(dto.getDeptSid()); +// settelApplyDto.setSourceSid(dto.getSid()); +// settelApplyDto.setSourceBillNo(dto.getBillNo()); +// settelApplyDto.setCustomerSid(dto.getCustomerSid()); +// settelApplyDto.setCustomerName(dto.getCustomerName()); +// BigDecimal receivableAmount = BigDecimal.ZERO; // 应收金额 +// BigDecimal discountAmount = BigDecimal.ZERO; // 优惠金额 +// BigDecimal settleAmount = BigDecimal.ZERO; // 结算金额 +// if (StringUtils.isNotBlank(dto.getReceivableAmount())) { +// receivableAmount = new BigDecimal(dto.getReceivableAmount()); +// } +// if (StringUtils.isNotBlank(dto.getDiscountAmount())) { +// discountAmount = new BigDecimal(dto.getDiscountAmount()); +// } +// settleAmount = receivableAmount.subtract(discountAmount); +// settelApplyDto.setReceivableAmount(receivableAmount.toString()); +// settelApplyDto.setSettleAmount(settleAmount.toString()); +// asBillSettelApplyService.saveOrUpdateDto(settelApplyDto); +// //新增工单环节信息 +// AsBusrepairBillNode billNode = new AsBusrepairBillNode(); +// billNode.setBillSid(sid); +// billNode.setCreateByName(dto.getOperator()); +// billNode.setNodeName("已结算"); +// billNode.setCreateBySid(dto.getOperatorSid()); +// billNode.setNodeCode("6"); +// asBusrepairBillNodeService.insert(billNode); +// } } return rb.success(); }