diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBillListReturnGoodsQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBillListReturnGoodsQuery.java new file mode 100644 index 0000000000..cbfa79b73c --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBillListReturnGoodsQuery.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.as.api.asbusrepairbill; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/6/21 14:02 + */ +@Data +public class AsBillListReturnGoodsQuery implements Query { + + private String deptSid; //部门sid + private String billNo;//工单编号 + private String customerName;//客户 + private String vehMark;//车牌号 + private String startDate; //进厂开始日期 + private String endDate; //进厂结束日期 + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBillListReturnGoodsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBillListReturnGoodsVo.java new file mode 100644 index 0000000000..349b529c75 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBillListReturnGoodsVo.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.as.api.asbusrepairbill; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author Fan + * @description + * @date 2024/6/21 14:01 + */ +@Data +public class AsBillListReturnGoodsVo implements Vo { + + private String sid; + private String billNo;//工单编号 + @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") + private String billType; + @ApiModelProperty("是否外出") + private String isGoOut; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("联系电话") + private String mobile; + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("进厂时间") + private String entryTime; + + +} 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 a052cac46f..a41101597e 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 @@ -14,10 +14,11 @@ import java.math.BigDecimal; @Data public class GoodsDetailsVo implements Vo { private String sid; + private String goodsID; //商品名称 private String goodsSpuName; -// //商品Sku名称 -// private String goodsSkuTitle; + //商品Sku名称 + private String goodsSkuTitle; //商品编码（图号） private String goodsSkuCode; //规格型号 @@ -51,5 +52,7 @@ public class GoodsDetailsVo implements Vo { // private String operName; @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("厂家") + private String manufacturerName; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java index 7cf6937255..c4eb04ae54 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java @@ -45,4 +45,6 @@ public interface AsBusrepairBillMapper extends BaseMapper { AsBusrepairBill selectOneByBillNo(String billNo); IPage bwBillPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage listReturnGoods(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml index bc92cf0576..6c7bf00de7 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml @@ -165,4 +165,20 @@ ${ew.sqlSegment} + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java index 3a63066d26..857c3a6f53 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java @@ -28,6 +28,14 @@ public class AsBusrepairBillRest { return rb.success().setData(pv); } + @PostMapping("/listReturnGoods") + @ApiOperation("工单查询列表") + ResultBean> listReturnGoods(@RequestBody PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = asBusrepairBillService.listReturnGoods(pagerQuery); + return rb.success().setData(pv); + } + @PostMapping("/saveBill") @ApiOperation("保存修改") ResultBean saveBill(@RequestBody AsBusrepairBillDto dto) { 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 f0b0ab1664..0825436a7c 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 @@ -485,6 +485,12 @@ public class AsBusrepairBillService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public PagerVo listReturnGoods(PagerQuery pagerQuery) { + AsBillListReturnGoodsQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + String deptSid = query.getDeptSid(); + //维修工单编号 + if (StringUtils.isNotBlank(query.getBillNo())) { + qw.like("a.billNo", query.getBillNo()); + } + //客户名称 + if (StringUtils.isNotBlank(query.getCustomerName())) { + qw.like("a.customerName", query.getCustomerName()); + } + //车牌号 + if (StringUtils.isNotBlank(query.getVehMark())) { + qw.like("b.vehMark", query.getVehMark()); + } + //进厂时间开始时间-进厂时间结束时间 + qw.apply(StringUtils.isNotBlank(query.getStartDate()), "date_format (a.entryTime,'%Y-%m-%d') >= date_format('" + query.getStartDate() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getEndDate()), "date_format (a.entryTime,'%Y-%m-%d') <= date_format('" + query.getEndDate() + "','%Y-%m-%d')" + ); + qw.eq("a.deptSid", deptSid); + qw.gt("a.nodeCode", 5); + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.listReturnGoods(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesBillRest.java b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesBillRest.java index 86fe3d0add..3f1c9d7dd1 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesBillRest.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesBillRest.java @@ -74,6 +74,15 @@ public class SmsSalesBillRest { @Autowired HttpServletResponse response; + + @ApiOperation("商品退货选择销售单") + @PostMapping("/listReturnGoods") + public ResultBean> listReturnGoods(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = smsSalesBillService.listReturnGoods(pq); + return rb.success().setData(pv); + } + @ApiOperation("销售价趋势报表") @PostMapping("/goodsTrendReport") public ResultBean> goodsTrendReport(@RequestBody PagerQuery pq) { diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesReturnRest.java b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesReturnRest.java index 274d2d8cf6..1e473b3d09 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesReturnRest.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesReturnRest.java @@ -144,5 +144,11 @@ public class SmsSalesReturnRest { return rb.success().setData(vo); } - + @ApiOperation("商品退货初始化") + @GetMapping("/returnGoodsBillInit") + public ResultBean returnGoodsBillInit(@RequestParam("sid") String sid,@RequestParam("type") String type){ + ResultBean rb = ResultBean.fireFail(); + SmsSalesReturnNewDetailsVo vo = smsSalesReturnService.returnGoodsBillInit(sid,type); + return rb.success().setData(vo); + } } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java index 5b088c3614..a958344b50 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java @@ -12,7 +12,8 @@ import java.math.BigDecimal; */ @Data public class SalesGoodsVo { - + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; // 商品Sku名称 private String sid; //商品sid private String goodSpuSid; diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsBillListReturnGoodsQuery.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsBillListReturnGoodsQuery.java new file mode 100644 index 0000000000..473fa491b5 --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsBillListReturnGoodsQuery.java @@ -0,0 +1,21 @@ +package com.yxt.sms.biz.smssalesbill; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/6/21 14:02 + */ +@Data +public class SmsBillListReturnGoodsQuery implements Query { + + private String deptSid; //部门sid + private String billNo;//工单编号 + private String customerName;//客户 + private String vehMark;//车牌号 + private String startDate; //进厂开始日期 + private String endDate; //进厂结束日期 + private String salesName; // 服务顾问 +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsBillListReturnGoodsVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsBillListReturnGoodsVo.java new file mode 100644 index 0000000000..8206f2298d --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsBillListReturnGoodsVo.java @@ -0,0 +1,31 @@ +package com.yxt.sms.biz.smssalesbill; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/6/21 14:01 + */ +@Data +public class SmsBillListReturnGoodsVo implements Vo { + + private String sid; + private String billNo;//工单编号 + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("制单日期") + private String createTime; + @ApiModelProperty("销售姓名") + private String salesName; // 销售姓名 + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("车架号") + private String vinNo; + + +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.java index 083083ca47..94c9a4e96d 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.java @@ -80,4 +80,6 @@ public interface SmsSalesBillMapper extends BaseMapper { IPage listPageSalesGoods(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); int selectBySid(String join); + + IPage listReturnGoods(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml index f70697776c..7ecdb0a4ea 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml @@ -131,4 +131,18 @@ WHERE `state` != '1' and find_in_set(sid, #{list}) + diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java index c09f6a6b97..4640a771ba 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java @@ -361,6 +361,7 @@ public class SmsSalesBillService extends MybatisBaseService listReturnGoods(PagerQuery pq) { + SmsBillListReturnGoodsQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getDeptSid())) { + qw.eq("s.deptSid", query.getDeptSid()); + } + if (StringUtils.isNotBlank(query.getSalesName())) { + qw.like("s.salesName", query.getSalesName()); + } + if (StringUtils.isNotBlank(query.getBillNo())) { + qw.like("s.billNo", query.getBillNo()); + } + if (StringUtils.isNotBlank(query.getCustomerName())) { + qw.like("s.customerName", query.getCustomerName()); + } + if (StringUtils.isNotBlank(query.getVehMark())) { + qw.like("s.vehMark", query.getVehMark()); + } + String startDate = query.getStartDate(); + String endDate = query.getEndDate(); + qw.apply(StringUtils.isNotEmpty(startDate), "date_format (s.createTime,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(endDate), "date_format (s.createTime,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')" + ); + qw.eq("s.state", "0"); + qw.orderByDesc("s.id"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listReturnGoods(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbilldetail/SmsSalesBillDetail.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbilldetail/SmsSalesBillDetail.java index 58b813cc99..fa7b95d815 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbilldetail/SmsSalesBillDetail.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbilldetail/SmsSalesBillDetail.java @@ -82,5 +82,6 @@ public class SmsSalesBillDetail extends BaseEntity { private BigDecimal amount; // 金额（销售价-优惠金额） @ApiModelProperty("已出库数量（仓储中具体出库数量）") private BigDecimal outboundCount; // 已出库数量（仓储中具体出库数量） - + //规格型号 + private String goodsSkuOwnSpec; } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SalesGoodsReturnVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SalesGoodsReturnVo.java index 7ae8ccfa0d..eb1427383a 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SalesGoodsReturnVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SalesGoodsReturnVo.java @@ -13,8 +13,6 @@ import java.math.BigDecimal; @Data public class SalesGoodsReturnVo { - @ApiModelProperty("商品库存sid") - private String inventorySid; // 商品库存sid @ApiModelProperty("商品ID") private String goodsID; // 商品ID @ApiModelProperty("商品基础信息Sid") @@ -29,37 +27,16 @@ public class SalesGoodsReturnVo { private String goodsSkuCode; // 商品编码（图号） @ApiModelProperty("计量单位") private String unit; // 计量单位 - @ApiModelProperty("仓库sid") - private String warehouseSid; // 仓库sid - @ApiModelProperty("仓库名称") - private String warehouse; // 仓库名称 - @ApiModelProperty("科目sid") - private String subjectSid; // 科目sid - @ApiModelProperty("科目（自费、保内等）") - private String subject; // 科目（自费、保内等） - @ApiModelProperty("销售前库存数量") + @ApiModelProperty("规格") + private String goodsSkuOwnSpec; // 规格 + @ApiModelProperty("总数量") private String currentCount; // 销售前库存数量 - @ApiModelProperty("销售价") - private String price; // 销售价 - @ApiModelProperty("数量") - private String count; // 数量 - @ApiModelProperty("折扣（0-10，0免费，10不打折）") - private String discount; // 折扣（0-10，0免费，10不打折） - @ApiModelProperty("优惠金额（=销售价*(折扣*0.1））") - private String discountAmount; // 优惠金额（=销售价*(折扣*0.1）） - @ApiModelProperty("金额（销售价-优惠金额）") - private String amount; // 金额（销售价-优惠金额） - @ApiModelProperty("已出库数量（仓储中具体出库数量）") - private String outboundCount; // 已出库数量（仓储中具体出库数量） - //----------退货信息----------- @ApiModelProperty("已退数量") private String returnedCount; // 已出库数量（仓储中具体出库数量） @ApiModelProperty("退货数量") private String backCount; // 退货数量 - @ApiModelProperty("税额") - private String maxAmount; // 税额 - @ApiModelProperty("含税价") - private String maxPrice; // 含税价 + @ApiModelProperty("退货价") + private String backPrice; // 退货价 @ApiModelProperty("退货金额") private String backAmount; // 退货金额 diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsGoodsDetailsVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsGoodsDetailsVo.java new file mode 100644 index 0000000000..aa46e96876 --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsGoodsDetailsVo.java @@ -0,0 +1,57 @@ +package com.yxt.sms.biz.smssalesreturn; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/4/18 9:12 + */ +@Data +public class SmsGoodsDetailsVo implements Vo { + private String sid; + private String goodsID; + //商品名称 + private String goodsSpuName; + //商品Sku名称 + private String goodsSkuTitle; + //商品编码（图号） + private String goodsSkuCode; + //规格型号 + private String goodsSkuOwnSpec; +// @ApiModelProperty("出库前的库存量") +// private String currentCount; + @ApiModelProperty("计量单位") + private String unit; +// @ApiModelProperty("仓库sid") +// private String warehouseSid; + @ApiModelProperty("仓库名称") + private String warehouseName; + //库位编号 + private String warehouseRackCode; +// +// @ApiModelProperty("需求数量（维修工单中）") +// private String needCount; + @ApiModelProperty("出/退库数量") + private String count; + @ApiModelProperty("销售价（元）") + private String price; + //折扣（0-10，0免费，10不打折） + private String discount; + //优惠金额（=销售价*(1-折扣*0.1）） + private String discountAmount; + //金额（销售价-优惠金额） + private String amount; +// @ApiModelProperty("科目") +// private String subject; +// @ApiModelProperty("领料人姓名") +// private String operName; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("厂家") + private String manufacturerName; + @ApiModelProperty("已退数量") + private String returnedCount; +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturn.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturn.java index 3693cd75a6..e4063a91fd 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturn.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturn.java @@ -26,12 +26,14 @@ package com.yxt.sms.biz.smssalesreturn; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.Date; /** * Project: sms(sms)
@@ -74,5 +76,27 @@ public class SmsSalesReturn extends BaseEntity { private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + @ApiModelProperty("申请部门sid") + private String deptSid; // 申请部门sid + @ApiModelProperty("申请部门") + private String dept; // 申请部门 + @ApiModelProperty("taskId") + private String taskId; // taskId + @ApiModelProperty("环节定义的sid") + private String nodeSid; // 环节定义的sid + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("办结时间") + private Date closeDate; // 办结时间 + @ApiModelProperty("应付金额") + private BigDecimal payableAmount; // 应付金额 + @ApiModelProperty("合计金额") + private BigDecimal totalAmount; // 合计金额 + } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturnNewDetailsVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturnNewDetailsVo.java new file mode 100644 index 0000000000..2b5e9e1b9f --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturnNewDetailsVo.java @@ -0,0 +1,63 @@ +package com.yxt.sms.biz.smssalesreturn; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/6/21 16:03 + */ +@Data +public class SmsSalesReturnNewDetailsVo implements Vo { + + private String type; //0维修工单 1销售单 + private String sid; + private String createTime; + private String deptSid; + private String deptName; + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + private String remarks; + + @ApiModelProperty("来源单编号") + private String sourceBillSid; // 来源单编号 + @ApiModelProperty("来源单编号") + private String sourceBillNo; // 来源单编号 + @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") + private String billType; + @ApiModelProperty("科目") + private String subject; + @ApiModelProperty("服务顾问姓名") + private String waitorName; + @ApiModelProperty("单据日期") + private String billDate; + @ApiModelProperty("结算日期") + private String settleDate; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("联系电话") + private String mobile; + @ApiModelProperty("客户单位") + private String customerOrg; + //-----车辆信息------ + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("应付金额") + private String payableAmount; // 应付金额 + @ApiModelProperty("合计金额") + private String totalAmount; // 合计金额 + + private List sitemVos = new ArrayList<>();// 服务项目 + private List goodsDetailsVos = new ArrayList<>(); //商品信息 + private List returnGoods = new ArrayList<>(); //退货商品列表 + +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturnNewDto.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturnNewDto.java new file mode 100644 index 0000000000..247fb31a64 --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturnNewDto.java @@ -0,0 +1,59 @@ +package com.yxt.sms.biz.smssalesreturn; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/6/21 16:03 + */ +@Data +public class SmsSalesReturnNewDto implements Dto { + + private String type; //0维修工单 1销售单 + private String sid; + private String createTime; + private String deptSid; + private String deptName; + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + private String remarks; + + @ApiModelProperty("来源单编号") + private String sourceBillSid; // 来源单编号 + @ApiModelProperty("来源单编号") + private String sourceBillNo; // 来源单编号 + @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") + private String billType; + @ApiModelProperty("科目") + private String subject; + @ApiModelProperty("服务顾问姓名") + private String waitorName; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("联系电话") + private String mobile; + @ApiModelProperty("客户单位") + private String customerOrg; + //-----车辆信息------ + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("应付金额") + private String payableAmount; // 应付金额 + @ApiModelProperty("合计金额") + private String totalAmount; // 合计金额 + + private List sitemVos = new ArrayList<>();// 服务项目 + private List goodsDetailsVos = new ArrayList<>(); //商品信息 + private List returnGoods = new ArrayList<>(); //退货商品列表 + +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturnService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturnService.java index 36a21da599..ba829414dd 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturnService.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturnService.java @@ -40,6 +40,7 @@ import com.yxt.sms.biz.smssalesreturndetail.SmsSalesReturnDetail; import com.yxt.sms.biz.smssalesreturndetail.SmsSalesReturnDetailService; import com.yxt.sms.biz.smssalesreturnsettle.SmsSalesReturnSettle; import com.yxt.sms.biz.smssalesreturnsettle.SmsSalesReturnSettleService; +import com.yxt.sms.feign.as.asbusrepairbill.*; import com.yxt.sms.feign.fms.fmspaysettle.FmsPaysettleDto; import com.yxt.sms.feign.fms.fmspaysettle.FmsPaysettleFeign; import com.yxt.sms.feign.wms.wmsinventory.WmsInventoryFeign; @@ -93,6 +94,8 @@ public class SmsSalesReturnService extends MybatisBaseService createQueryWrapper(SmsSalesReturnQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -145,7 +148,7 @@ public class SmsSalesReturnService extends MybatisBaseService list = baseMapper.listExcel(qw); return list; } + + public SmsSalesReturnNewDetailsVo returnGoodsBillInit(String sid, String type) { + SmsSalesReturnNewDetailsVo vo = new SmsSalesReturnNewDetailsVo(); + vo.setType(type); + vo.setSourceBillSid(sid); + if (type.equals("0")) { + //维修工单 + AsBusrepairBillDetailsVo data = asBusrepairBillFeign.fetchDetailsBySid(sid).getData(); + if (null != data) { + vo.setSourceBillNo(data.getBillNo()); + vo.setBillType(data.getBillType()); + vo.setBillDate(data.getCreateDate()); + if (StringUtils.isNotBlank(data.getSubject())) { + vo.setSubject(data.getSubject()); + } + if (StringUtils.isNotBlank(data.getWaitorName())) { + vo.setWaitorName(data.getWaitorName()); + } + if (StringUtils.isNotBlank(data.getCustomerName())) { + vo.setCustomerName(data.getCustomerName()); + } + if (StringUtils.isNotBlank(data.getMobile())) { + vo.setMobile(data.getMobile()); + } + if (StringUtils.isNotBlank(data.getCustomerOrg())) { + vo.setCustomerOrg(data.getCustomerOrg()); + } + if (StringUtils.isNotBlank(data.getVehMark())) { + vo.setVehMark(data.getVehMark()); + } + if (StringUtils.isNotBlank(data.getVinNo())) { + vo.setVinNo(data.getVinNo()); + } + SettleVo settleVo = data.getSettleVo(); + if (null != settleVo) { + vo.setSettleDate(settleVo.getSettleTime()); + } + List sitemVos = data.getSitemVos(); + List smsSitemVos = new ArrayList<>(); + if (!sitemVos.isEmpty()) { + for (SitemVo smsSitemVo : sitemVos) { + SmsSitemVo sitemVo = new SmsSitemVo(); + BeanUtil.copyProperties(smsSitemVo,sitemVo); + smsSitemVos.add(sitemVo); + } + vo.setSitemVos(smsSitemVos); + } + List goodsDetailsVos = data.getGoodsDetailsVos(); + List smsGoodsDetailsVos = new ArrayList<>(); + if (!goodsDetailsVos.isEmpty()) { + for (GoodsDetailsVo goodsDetailsVo : goodsDetailsVos) { + SmsGoodsDetailsVo smsGoodsDetailsVo = new SmsGoodsDetailsVo(); + BeanUtil.copyProperties(goodsDetailsVo,smsGoodsDetailsVo); + smsGoodsDetailsVos.add(smsGoodsDetailsVo); + } + vo.setGoodsDetailsVos(smsGoodsDetailsVos); + } + } + } else if (type.equals("1")) { + //销售单 + SmsSalesBillDetailsVo data = smsSalesBillService.fetchDetailsVoBySid(sid); + if (null != data) { + vo.setSourceBillNo(data.getBillNo()); + vo.setBillType("销售单"); + vo.setBillDate(data.getCreateTime()); + if (StringUtils.isNotBlank(data.getSubject())) { + vo.setSubject(data.getSubject()); + } + if (StringUtils.isNotBlank(data.getSalesName())) { + vo.setWaitorName(data.getSalesName()); + } + if (StringUtils.isNotBlank(data.getCustomerName())) { + vo.setCustomerName(data.getCustomerName()); + } + if (StringUtils.isNotBlank(data.getMobile())) { + vo.setMobile(data.getMobile()); + } + if (StringUtils.isNotBlank(data.getCustomerOrg())) { + vo.setCustomerOrg(data.getCustomerOrg()); + } + if (StringUtils.isNotBlank(data.getVehMark())) { + vo.setVehMark(data.getVehMark()); + } + if (StringUtils.isNotBlank(data.getVinNo())) { + vo.setVinNo(data.getVinNo()); + } + SettlementVo settleVo = data.getSettlementVo(); + if (null != settleVo) { + vo.setSettleDate(settleVo.getSettleTime()); + } + List goodsDetailsVos = data.getGoodsVos(); + List smsGoodsDetailsVos = new ArrayList<>(); + if (!goodsDetailsVos.isEmpty()) { + for (SalesGoodsVo goodsDetailsVo : goodsDetailsVos) { + SmsGoodsDetailsVo smsGoodsDetailsVo = new SmsGoodsDetailsVo(); + BeanUtil.copyProperties(goodsDetailsVo,smsGoodsDetailsVo); + smsGoodsDetailsVos.add(smsGoodsDetailsVo); + } + vo.setGoodsDetailsVos(smsGoodsDetailsVos); + } + } + + } + return vo; + } } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSitemVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSitemVo.java new file mode 100644 index 0000000000..9c79cc236d --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSitemVo.java @@ -0,0 +1,57 @@ +package com.yxt.sms.biz.smssalesreturn; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/4/18 9:02 + */ +@Data +public class SmsSitemVo { + @ApiModelProperty("项目sid") + private String serviceItemSid; + @ApiModelProperty("项目名称") + private String serviceItem; + @ApiModelProperty("工种sid（分类）") + private String serviceTypeSid; + @ApiModelProperty("工种（分类）") + private String serviceType; + @ApiModelProperty("科目sid") + private String subjectSid; + @ApiModelProperty("科目（自费、保内等）") + private String subject; + @ApiModelProperty("考核工时(考核价）") + private String examineHourPrice; + @ApiModelProperty("工时单价") + private String hourPrice; + @ApiModelProperty("工时数") + private String hours; + @ApiModelProperty("销售价(工时费)=工时单价*工时数") + private String price; + @ApiModelProperty("折扣（0-10，0免费，10不打折）") + private String discount; + @ApiModelProperty("优惠金额（=销售价*(折扣*0.1））") + private String discountAmount; + @ApiModelProperty("金额（销售价-优惠金额）") + private String amount; + @ApiModelProperty("备注") + private String remarks; + private String repairerName; + //-------------维修人员--------------- +// @ApiModelProperty("维修人员sid") +// private String repairerSid; +// @ApiModelProperty("维修人员姓名") +// private String repairerName; +// @ApiModelProperty("所在组sid") +// private String groupSid; +// @ApiModelProperty("所在班组名称") +// private String groupName; + private List staffList = new ArrayList<>(); //维修人员Sid + private List staffNameList = new ArrayList<>(); //维修人员姓名信息 + +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturndetail/SmsSalesReturnDetail.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturndetail/SmsSalesReturnDetail.java index 2be7fa639f..50b1d7decb 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturndetail/SmsSalesReturnDetail.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturndetail/SmsSalesReturnDetail.java @@ -54,8 +54,8 @@ public class SmsSalesReturnDetail extends BaseEntity { @ApiModelProperty("单据sid") private String billSid; // 单据sid - @ApiModelProperty("商品库存sid") - private String inventorySid; // 商品库存sid + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID @ApiModelProperty("商品基础信息Sid") private String goodSpuSid; // 商品基础信息Sid @ApiModelProperty("商品名称") @@ -67,7 +67,7 @@ public class SmsSalesReturnDetail extends BaseEntity { @ApiModelProperty("商品编码（图号）") private String goodsSkuCode; // 商品编码（图号） @ApiModelProperty("规格") - private String specification; // 规格 + private String goodsSkuOwnSpec; // 规格 @ApiModelProperty("退货前的库存数量") private BigDecimal currentCount; // 退货前的库存数量 @ApiModelProperty("计量单位") @@ -82,5 +82,7 @@ public class SmsSalesReturnDetail extends BaseEntity { private BigDecimal maxPrice; // 含税价 @ApiModelProperty("退货金额") private BigDecimal backAmount; // 退货金额 + @ApiModelProperty("退货价") + private BigDecimal backPrice; // 退货价 } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/AitemVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/AitemVo.java new file mode 100644 index 0000000000..5c67ea8ad3 --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/AitemVo.java @@ -0,0 +1,23 @@ +package com.yxt.sms.feign.as.asbusrepairbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/4/18 9:07 + */ +@Data +public class AitemVo { + + @ApiModelProperty("附加项目sid") + private String aitemsid; + @ApiModelProperty("附加项目名称") + private String aitemName; + @ApiModelProperty("销售价") + private String price; + @ApiModelProperty("备注") + private String remarks; + +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/AsBusrepairBillDetailsVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/AsBusrepairBillDetailsVo.java new file mode 100644 index 0000000000..c586483d9f --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/AsBusrepairBillDetailsVo.java @@ -0,0 +1,134 @@ +package com.yxt.sms.feign.as.asbusrepairbill; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/4/18 9:09 + */ +@Data +public class AsBusrepairBillDetailsVo implements Vo { + private String sid; + private String orgPath; + @ApiModelProperty("应收金额") + private String receivableAmount; + @ApiModelProperty("工时费") + private String hourAmount; + @ApiModelProperty("材料费") + private String goodsAmount; + @ApiModelProperty("外出费") + private String outAmount; + @ApiModelProperty("附加费") + private String addAmount; + @ApiModelProperty("税额") + private String taxAmount; + @ApiModelProperty("是否外出（1是，2否）") + private String isGoOut; + @ApiModelProperty("厂家补助") + private String subsidyAmount; + @ApiModelProperty("其他费用") + private String otherAmount; + @ApiModelProperty("班组sid") + private String groupSid; + private String createDate; + @ApiModelProperty("班组名称") + private String groupName; + @ApiModelProperty("制单人sid") + private String createBySid; + @ApiModelProperty("制单部门sid") + private String deptSid; // 制单部门sid + @ApiModelProperty("制单部门") + private String deptName; // 制单部门 + @ApiModelProperty("制单人姓名") + private String createByName; + @ApiModelProperty("操作人Sid") + private String operatorSid; + @ApiModelProperty("操作人") + private String operator; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") + private String billTypeKey; + @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") + private String billType; + @ApiModelProperty("进厂时间") + private String entryTime; + @ApiModelProperty("预计完工时间-工单") + private String estimatedFinishTime; + @ApiModelProperty("科目sid") + private String subjectSid; + @ApiModelProperty("科目") + private String subject; + @ApiModelProperty("服务顾问sid") + private String waitorSid; + @ApiModelProperty("服务顾问姓名") + private String waitorName; + @ApiModelProperty("主修人（可多选）销售单") + private String mainRepairers; + @ApiModelProperty("条形码-销售单") + private String barCode; + @ApiModelProperty("快捷备注-销售单") + private String shotRemarks; + @ApiModelProperty("备注") + private String printRemarks; + private String remarks; //备注 + @ApiModelProperty("整体优惠金额") + private String discountAmount; + @ApiModelProperty("整体优惠券") + private String coupon; + @ApiModelProperty("积分抵扣") + private String scoreDeduct; + @ApiModelProperty("当前环节编码(登记1、派工2、竣工3、结算4)") + private String nodeCode; + @ApiModelProperty("当前环节") + private String nodeName; + @ApiModelProperty("进入当前环节时间") + private String nodeTime; + @ApiModelProperty("出厂状态 (0未出厂，1已出厂)") + private String outDoorState; + @ApiModelProperty("出厂时间") + private String outDoorTime; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("联系电话") + private String mobile; + @ApiModelProperty("客户单位") + private String customerOrg; + @ApiModelProperty("会员卡sid") + private String memberCardSid; + @ApiModelProperty("会员卡号") + private String memberCarNumber; + //-----车辆信息------ + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车型") + private String vehModel; + @ApiModelProperty("行驶里程") + private String mileage; + @ApiModelProperty("油量(空、小于1/4、1/4、1/2、3/4、满)") + private String oil; + @ApiModelProperty("当前里程（本次里程）") + private String currentMileage; + private InvoiceVo invoiceVo = new InvoiceVo(); //发票信息 + private InsuranceVo insuranceVo = new InsuranceVo();//保险信息 + private OtherVo otherVo = new OtherVo();//送修人信息 + private List sitemVos = new ArrayList<>();// 服务项目 + private List aitemVos = new ArrayList<>();// 附加项目 + private List goodsDetailsVos = new ArrayList<>(); //商品信息 + private SettleVo settleVo = new SettleVo(); //结算信息 + private boolean showReSettleBtn; //是否显示反结算按钮，ture显示，false不显示 +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/AsBusrepairBillFeign.java b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/AsBusrepairBillFeign.java new file mode 100644 index 0000000000..00c2b8a729 --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/AsBusrepairBillFeign.java @@ -0,0 +1,27 @@ +package com.yxt.sms.feign.as.asbusrepairbill; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.sms.feign.wms.wmsinventory.*; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @description: 维修单 + * @author: fzz + * @date: 2024/3/7 + **/ +@FeignClient( + contextId = "yxt-as-AsBusrepairBill", + name = "yxt-as", + path = "v1/AsBusrepairBill" +) +public interface AsBusrepairBillFeign { + @ApiOperation("详情回显") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/GoodsDetailsVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/GoodsDetailsVo.java new file mode 100644 index 0000000000..544299e342 --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/GoodsDetailsVo.java @@ -0,0 +1,56 @@ +package com.yxt.sms.feign.as.asbusrepairbill; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/4/18 9:12 + */ +@Data +public class GoodsDetailsVo implements Vo { + private String sid; + private String goodsID; + //商品名称 + private String goodsSpuName; +// //商品Sku名称 +// private String goodsSkuTitle; + //商品编码（图号） + private String goodsSkuCode; + //规格型号 + private String goodsSkuOwnSpec; +// @ApiModelProperty("出库前的库存量") +// private String currentCount; + @ApiModelProperty("计量单位") + private String unit; +// @ApiModelProperty("仓库sid") +// private String warehouseSid; + @ApiModelProperty("仓库名称") + private String warehouseName; + //库位编号 + private String warehouseRackCode; +// +// @ApiModelProperty("需求数量（维修工单中）") +// private String needCount; + @ApiModelProperty("出/退库数量") + private String count; + @ApiModelProperty("销售价（元）") + private String price; + //折扣（0-10，0免费，10不打折） + private String discount; + //优惠金额（=销售价*(1-折扣*0.1）） + private String discountAmount; + //金额（销售价-优惠金额） + private String amount; +// @ApiModelProperty("科目") +// private String subject; +// @ApiModelProperty("领料人姓名") +// private String operName; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("厂家") + private String manufacturerName; + +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/InsuranceVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/InsuranceVo.java new file mode 100644 index 0000000000..18942f89ef --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/InsuranceVo.java @@ -0,0 +1,40 @@ +package com.yxt.sms.feign.as.asbusrepairbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/4/18 8:59 + */ +@Data +public class InsuranceVo { + + @ApiModelProperty("责任划分") + private String responsibility; + @ApiModelProperty("对方险种") + private String otherInsuranceType; + @ApiModelProperty("责任划分") + private String responsibilityKey; + @ApiModelProperty("对方险种") + private String otherInsuranceTypeKey; + @ApiModelProperty("保险公司1") + private String insuranceCompany1; + @ApiModelProperty("保险公司2") + private String insuranceCompany2; + @ApiModelProperty("保险人员") + private String insurer; + @ApiModelProperty("保险索赔单号") + private String claimBillNo; + @ApiModelProperty("勘察员") + private String investigator; + @ApiModelProperty("定损员") + private String lossAdjuster; + @ApiModelProperty("特殊标志（1有，0无）") + private String isSpecialSign; + @ApiModelProperty("出险类型") + private String accidentType; + @ApiModelProperty("出险类型") + private String accidentTypeKey; +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/InvoiceVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/InvoiceVo.java new file mode 100644 index 0000000000..abcbf5bf5e --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/InvoiceVo.java @@ -0,0 +1,29 @@ +package com.yxt.sms.feign.as.asbusrepairbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/4/18 8:57 + */ +@Data +public class InvoiceVo { + + @ApiModelProperty("是否需要开发票（是1，否0）") + private String isInvoicing; + @ApiModelProperty("发票类型") + private String invoiceType; + @ApiModelProperty("发票类型") + private String invoiceTypeKey; + @ApiModelProperty("开票名称") + private String invoiceTitle; + @ApiModelProperty("税号") + private String taxpayerNo; + @ApiModelProperty("发票号码") + private String invoiceCode; + @ApiModelProperty("税率") + private String taxRate; + +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/OtherVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/OtherVo.java new file mode 100644 index 0000000000..f2585d2a78 --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/OtherVo.java @@ -0,0 +1,20 @@ +package com.yxt.sms.feign.as.asbusrepairbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/4/18 9:01 + */ +@Data +public class OtherVo { + + @ApiModelProperty("厂家") + private String manufacturer; + @ApiModelProperty("送修人姓名") + private String senderName; + @ApiModelProperty("送修人电话") + private String senderMobile; +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/SettleVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/SettleVo.java new file mode 100644 index 0000000000..19d4484ead --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/SettleVo.java @@ -0,0 +1,39 @@ +package com.yxt.sms.feign.as.asbusrepairbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/4/28 13:43 + */ +@Data +public class SettleVo { + + @ApiModelProperty("付款人编号") + private String payerNo; // 付款人编号 + @ApiModelProperty("付款人名称") + private String payerName; // 付款人名称 + @ApiModelProperty("应收金额") + private String receivableAmount; // 应收金额 + @ApiModelProperty("订金抵扣") + private String depositdeductAmount; // 订金抵扣 + @ApiModelProperty("结算方式key") + private String settleKey; // 结算方式key + @ApiModelProperty("结算方式value") + private String settleValue; // 结算方式value + @ApiModelProperty("结算金额") + private String settleAmount; // 结算金额 + @ApiModelProperty("其他结算方式") + private String otherSettleKey; // 其他结算方式 + @ApiModelProperty("其他结算方式") + private String otherSettleValue; // 其他结算方式 + @ApiModelProperty("其他结算金额") + private String otherSettleAmount; // 其他结算金额 + @ApiModelProperty("欠款金额") + private String debts; // 欠款金额 + @ApiModelProperty("结算时间") + private String settleTime; // 结算时间 + +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/SitemVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/SitemVo.java new file mode 100644 index 0000000000..53ce33dd60 --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/as/asbusrepairbill/SitemVo.java @@ -0,0 +1,57 @@ +package com.yxt.sms.feign.as.asbusrepairbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/4/18 9:02 + */ +@Data +public class SitemVo { + @ApiModelProperty("项目sid") + private String serviceItemSid; + @ApiModelProperty("项目名称") + private String serviceItem; + @ApiModelProperty("工种sid（分类）") + private String serviceTypeSid; + @ApiModelProperty("工种（分类）") + private String serviceType; + @ApiModelProperty("科目sid") + private String subjectSid; + @ApiModelProperty("科目（自费、保内等）") + private String subject; + @ApiModelProperty("考核工时(考核价）") + private String examineHourPrice; + @ApiModelProperty("工时单价") + private String hourPrice; + @ApiModelProperty("工时数") + private String hours; + @ApiModelProperty("销售价(工时费)=工时单价*工时数") + private String price; + @ApiModelProperty("折扣（0-10，0免费，10不打折）") + private String discount; + @ApiModelProperty("优惠金额（=销售价*(折扣*0.1））") + private String discountAmount; + @ApiModelProperty("金额（销售价-优惠金额）") + private String amount; + @ApiModelProperty("备注") + private String remarks; + private String repairerName; + //-------------维修人员--------------- +// @ApiModelProperty("维修人员sid") +// private String repairerSid; +// @ApiModelProperty("维修人员姓名") +// private String repairerName; +// @ApiModelProperty("所在组sid") +// private String groupSid; +// @ApiModelProperty("所在班组名称") +// private String groupName; + private List staffList = new ArrayList<>(); //维修人员Sid + private List staffNameList = new ArrayList<>(); //维修人员姓名信息 + +}