From 2b2acc2c0006232414a33e56ca460a9ce5235281 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 20 Jun 2024 14:24:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=A3=E5=B7=A5=E6=8E=A8=E9=80=81=E5=BE=85?= =?UTF-8?q?=E6=97=A7=E4=BB=B6=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBusrepairBillService.java | 47 ++++++++++- .../com/yxt/anrui/as/feign/sms/SmsGoods.java | 81 +++++++++++++++++++ .../yxt/anrui/as/feign/sms/SmsGoodsFeign.java | 27 +++++++ .../wmsoldinventory/WmsOldInventoryFeign.java | 26 ++++++ .../wmsoldinventory/WmsOldInventoryPush.java | 48 +++++++++++ .../com/yxt/sms/apiadmin/SmsGoodsRest.java | 29 +++++++ .../com/yxt/sms/biz/smsgoods/SmsGoods.java | 81 +++++++++++++++++++ .../yxt/sms/biz/smsgoods/SmsGoodsMapper.java | 45 +++++++++++ .../yxt/sms/biz/smsgoods/SmsGoodsMapper.xml | 7 ++ .../yxt/sms/biz/smsgoods/SmsGoodsService.java | 46 +++++++++++ .../sms/biz/smssalesbill/SalesGoodsVo.java | 65 +++++++-------- .../sms/biz/smssalesbill/SalesInvoiceVo.java | 2 + .../sms/biz/smssalesbill/SettlementVo.java | 22 +++-- .../sms/biz/smssalesbill/SmsAttachitemVo.java | 22 +++++ .../sms/biz/smssalesbill/SmsSalesBill.java | 5 +- .../smssalesbill/SmsSalesBillDetailsVo.java | 15 +++- .../SmsSalesBillInvoice.java | 1 + 17 files changed, 514 insertions(+), 55 deletions(-) create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/feign/sms/SmsGoods.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/feign/sms/SmsGoodsFeign.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsoldinventory/WmsOldInventoryFeign.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsoldinventory/WmsOldInventoryPush.java create mode 100644 yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsGoodsRest.java create mode 100644 yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoods.java create mode 100644 yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsMapper.java create mode 100644 yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsMapper.xml create mode 100644 yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java create mode 100644 yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsAttachitemVo.java 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 4b139751fd..90cec8a2f3 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 @@ -43,6 +43,10 @@ import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; import com.yxt.anrui.as.feign.portal.sysuser.SysUserVo; +import com.yxt.anrui.as.feign.sms.SmsGoods; +import com.yxt.anrui.as.feign.sms.SmsGoodsFeign; +import com.yxt.anrui.as.feign.wms.wmsoldinventory.WmsOldInventoryFeign; +import com.yxt.anrui.as.feign.wms.wmsoldinventory.WmsOldInventoryPush; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -101,6 +105,10 @@ public class AsBusrepairBillService extends MybatisBaseService goodsDetails = asBusrepairInventorybillDetailService.getGoodsDetailsByBillSid(sid); + if (!goodsDetails.isEmpty()) { + for (AsBusrepairInventorybillDetail goodsDetail : goodsDetails) { + WmsOldInventoryPush push = new WmsOldInventoryPush(); + BeanUtil.copyProperties(goodsDetail, push, "id", "sid"); + push.setCreateBySid(asBusrepairBill.getCreateBySid()); + push.setBillNo(asBusrepairBill.getBillNo()); + if (StringUtils.isNotBlank(asBusrepairBill.getCustomerName())) { + push.setCustomerName(asBusrepairBill.getCustomerName()); + } + push.setVehMark(vehMark); + push.setVinNo(vinNo); + SmsGoods smsGoods = smsGoodsFeign.fetchEntityByGoodsID(goodsDetail.getGoodsID()).getData(); + if (null != smsGoods) { + if (StringUtils.isNotBlank(smsGoods.getSupplierName())) { + push.setManufacturerName(smsGoods.getSupplierName()); + } + } + wmsOldInventoryFeign.pushOldStayInvent(push); + } + } + } } asBusrepairBill.setNodeCode(nodeCode); asBusrepairBill.setNodeName(nodeName); @@ -909,7 +952,7 @@ public class AsBusrepairBillService extends MybatisBaseService bwBillPageList(PagerQuery pagerQuery) { @@ -934,7 +977,7 @@ public class AsBusrepairBillService extends MybatisBaseService= date_format('" + query.getEntryTimeStart() + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(query.getEntryTimeEnd()), "date_format (a.entryTime,'%Y-%m-%d') <= date_format('" + query.getEntryTimeEnd() + "','%Y-%m-%d')" ); - qw.eq("a.useOrgSid",useOrgSid); + qw.eq("a.useOrgSid", useOrgSid); qw.eq("a.subject", "保外"); qw.gt("a.nodeCode", 5); IPage page = PagerUtil.queryToPage(pagerQuery); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/sms/SmsGoods.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/sms/SmsGoods.java new file mode 100644 index 0000000000..e8246dce8a --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/sms/SmsGoods.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.as.feign.sms; + +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; + +/** + * Project: yxt-sms(价格策略)
+ * File: SmsPricestrategy.java
+ * Class: com.yxt.sms.api.smspricestrategy.SmsPricestrategy
+ * Description: 价格策略.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-28 14:32:24
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "商品售价列表", description = "商品售价列表") +@TableName("sms_goods") +public class SmsGoods extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @ApiModelProperty("商品类别sid") + private String goodsTypeSid; // 商品类别sid + @ApiModelProperty("商品类别名称") + private String goodsTypeName; // 商品类别名称 + @ApiModelProperty("商品基础信息Sid") + private String goodsSpuSid; // 商品基础信息Sid + @ApiModelProperty("商品名称") + private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品SkuSid") + private String goodsSkuSid; // 商品SkuSid + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; // 商品Sku名称 + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; // 商品编码（图号） + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("计量单位") + private String unit; // 计量单位 + @ApiModelProperty("组织全路径") + private BigDecimal price; // 销售单价 +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/sms/SmsGoodsFeign.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/sms/SmsGoodsFeign.java new file mode 100644 index 0000000000..559bcd0095 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/sms/SmsGoodsFeign.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.as.feign.sms; + +import com.yxt.anrui.as.feign.base.basemanufacturer.BaseManufacturerFeignFallback; +import com.yxt.anrui.as.feign.fms.FmsReceivesettle; +import com.yxt.anrui.as.feign.fms.FmsReceivesettleDto; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +/** + * @author Fan + * @description + * @date 2024/4/28 13:40 + */ +@FeignClient( + contextId = "yxt-sms-SmsGoods", + name = "yxt-sms", + path = "apiadmin/v1/smsGoods", + fallback = BaseManufacturerFeignFallback.class +) +public interface SmsGoodsFeign { + + @ApiOperation("根据goodsID获取一条记录") + @GetMapping("/fetchEntityByGoodsID") + public ResultBean fetchEntityByGoodsID(@RequestParam("goodsID") String goodsID); +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsoldinventory/WmsOldInventoryFeign.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsoldinventory/WmsOldInventoryFeign.java new file mode 100644 index 0000000000..64820c0743 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsoldinventory/WmsOldInventoryFeign.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.as.feign.wms.wmsoldinventory; + +import com.yxt.anrui.as.feign.wms.wmsinventorybill.WmsInventoryBillDto; +import com.yxt.anrui.as.feign.wms.wmsinventorybill.WmsInventoryBillFeignFallback; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * @description: 旧件 + * @author: dimengzhe + * @date: 2024/3/7 + **/ +@FeignClient( + contextId = "yxt-wms-WmsOldInventory", + name = "yxt-wms", + path = "/apiadmin/WmsOldInventory", + fallback = WmsInventoryBillFeignFallback.class) +public interface WmsOldInventoryFeign { + + @ApiOperation("竣工推送待入库旧件") + @PostMapping("/pushOldStayInvent") + ResultBean pushOldStayInvent(@RequestBody WmsOldInventoryPush push); +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsoldinventory/WmsOldInventoryPush.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsoldinventory/WmsOldInventoryPush.java new file mode 100644 index 0000000000..9758144888 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsoldinventory/WmsOldInventoryPush.java @@ -0,0 +1,48 @@ +package com.yxt.anrui.as.feign.wms.wmsoldinventory; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/28 + **/ +@Data +public class WmsOldInventoryPush { + + private String sid; + private String remarks; + private String createBySid; + //商品ID + private String goodsID; + //商品Sku名称 + private String goodsSkuTitle; + //商品编码（图号） + private String goodsSkuCode; + //厂家 + private String manufacturerName; + //规格型号 + private String goodsSkuOwnSpec; + //计量单位 + private String unit; + //数量 + private String count; + //已入库数量 + private String inCount; + //维修工单编号 + private String billNo; + //客户名称 + private String customerName; + // 车牌号 + private String vehMark; + //车架号 + private String vinNo; + //旧件回收说明 + private String shortss; + //旧件照片 + private List photoList = new ArrayList<>(); + +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsGoodsRest.java b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsGoodsRest.java new file mode 100644 index 0000000000..424d9e58d9 --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsGoodsRest.java @@ -0,0 +1,29 @@ +package com.yxt.sms.apiadmin; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.sms.biz.smsgoods.SmsGoods; +import com.yxt.sms.biz.smsgoods.SmsGoodsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +/** + * @author Fan + * @description + * @date 2024/6/20 14:06 + */ +@Api(tags = "商品售价列表") +@RestController +@RequestMapping("/apiadmin/v1/smsGoods") +public class SmsGoodsRest { + private SmsGoodsService smsGoodsService; + + @ApiOperation("根据goodsID获取一条记录") + @GetMapping("/fetchEntityByGoodsID") + public ResultBean fetchEntityByGoodsID(@RequestParam("goodsID") String goodsID) { + ResultBean rb = ResultBean.fireFail(); + SmsGoods goods = smsGoodsService.fetchEntityByGoodsID(goodsID); + return rb.success().setData(goods); + } + +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoods.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoods.java new file mode 100644 index 0000000000..79013526d1 --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoods.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sms.biz.smsgoods; + +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; + +/** + * Project: yxt-sms(价格策略)
+ * File: SmsPricestrategy.java
+ * Class: com.yxt.sms.api.smspricestrategy.SmsPricestrategy
+ * Description: 价格策略.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-28 14:32:24
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "商品售价列表", description = "商品售价列表") +@TableName("sms_goods") +public class SmsGoods extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @ApiModelProperty("商品类别sid") + private String goodsTypeSid; // 商品类别sid + @ApiModelProperty("商品类别名称") + private String goodsTypeName; // 商品类别名称 + @ApiModelProperty("商品基础信息Sid") + private String goodsSpuSid; // 商品基础信息Sid + @ApiModelProperty("商品名称") + private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品SkuSid") + private String goodsSkuSid; // 商品SkuSid + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; // 商品Sku名称 + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; // 商品编码（图号） + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("计量单位") + private String unit; // 计量单位 + @ApiModelProperty("组织全路径") + private BigDecimal price; // 销售单价 +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsMapper.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsMapper.java new file mode 100644 index 0000000000..1ecd48915f --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsMapper.java @@ -0,0 +1,45 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sms.biz.smsgoods; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.sms.biz.smspricestrategy.SmsPricestrategyVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + + +@Mapper +public interface SmsGoodsMapper extends BaseMapper { + + @Select("select * from sms_goods where goodsID =#{goodsID}") + SmsGoods fetchEntityByGoodsID(@Param("goodsID") String goodsID); +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsMapper.xml b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsMapper.xml new file mode 100644 index 0000000000..c284240357 --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsMapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java new file mode 100644 index 0000000000..995ba8b218 --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java @@ -0,0 +1,46 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.sms.biz.smsgoods; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.sms.biz.smspricestrategy.*; +import org.springframework.stereotype.Service; + + +@Service +public class SmsGoodsService extends MybatisBaseService { + + + public SmsGoods fetchEntityByGoodsID(String goodsID) { + return baseMapper.fetchEntityByGoodsID(goodsID); + } +} 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 8ed0cfc2fa..4589c6e0e8 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 @@ -13,43 +13,36 @@ import java.math.BigDecimal; @Data public class SalesGoodsVo { - @ApiModelProperty("商品库存sid") - private String inventorySid; // 商品库存sid - @ApiModelProperty("商品ID") - private String goodsID; // 商品ID - @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; // 商品基础信息Sid - @ApiModelProperty("商品名称") - private String goodsSpuName; // 商品名称 - @ApiModelProperty("商品Skusid") - private String goodsSkuSid; // 商品Skusid - @ApiModelProperty("商品Sku名称") - private String goodsSkuTitle; // 商品Sku名称 - @ApiModelProperty("商品编码（图号）") - private String goodsSkuCode; // 商品编码（图号） + private String sid; + //商品名称 + private String goodsSpuName; + //商品编码（图号） + private String goodsSkuCode; + //规格型号 + private String goodsSkuOwnSpec; @ApiModelProperty("计量单位") - private String unit; // 计量单位 - @ApiModelProperty("仓库sid") - private String warehouseSid; // 仓库sid + private String unit; @ApiModelProperty("仓库名称") - private String warehouse; // 仓库名称 - @ApiModelProperty("科目sid") - private String subjectSid; // 科目sid - @ApiModelProperty("科目（自费、保内等）") - private String subject; // 科目（自费、保内等） - @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; // 已出库数量（仓储中具体出库数量） + private String warehouseName; + //库位编号 + private String warehouseRackCode; + @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 remarks; + + @ApiModelProperty("库存数量") + private String currentCount; + @ApiModelProperty("厂家") + private String supplierName; + } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvoiceVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvoiceVo.java index 6ae691a69a..c2e61eab16 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvoiceVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvoiceVo.java @@ -17,6 +17,7 @@ public class SalesInvoiceVo { private String isInvoicing; // 是否需要开发票（是1，否0） @ApiModelProperty("发票类型") private String invoiceType; // 发票类型 + private String invoiceTypeKey; // 发票类型Key @ApiModelProperty("开票名称") private String invoiceTitle; // 开票名称 @ApiModelProperty("税号") @@ -26,4 +27,5 @@ public class SalesInvoiceVo { @ApiModelProperty("税率") private String taxRate; // 税率 + } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SettlementVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SettlementVo.java index 72874bd0ea..71f14bb04a 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SettlementVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SettlementVo.java @@ -14,14 +14,12 @@ import java.util.Date; */ @Data public class SettlementVo { - @ApiModelProperty("结算人姓名") - private String createByName; // 结算人姓名 - @ApiModelProperty("来源单sid（销售单sid）") - private String sourceBillSid; // 来源单sid（销售单sid） - @ApiModelProperty("来源单编号") - private String sourceBillNo; // 来源单编号 - @ApiModelProperty("应收金额（总计金额-优惠-优惠券-积分抵扣）") - private String receivableAmount; // 应收金额（总计金额-优惠-优惠券-积分抵扣） + @ApiModelProperty("付款人编号") + private String payerNo; // 付款人编号 + @ApiModelProperty("付款人名称") + private String payerName; // 付款人名称 + @ApiModelProperty("应收金额") + private String receivableAmount; // 应收金额 @ApiModelProperty("订金抵扣") private String depositdeductAmount; // 订金抵扣 @ApiModelProperty("结算方式key") @@ -32,14 +30,12 @@ public class SettlementVo { private String settleAmount; // 结算金额 @ApiModelProperty("其他结算方式") private String otherSettleKey; // 其他结算方式 + @ApiModelProperty("其他结算方式") + private String otherSettleValue; // 其他结算方式 @ApiModelProperty("其他结算金额") - private String otherSettleValue; // 其他结算金额 + private String otherSettleAmount; // 其他结算金额 @ApiModelProperty("欠款金额") private String debts; // 欠款金额 @ApiModelProperty("结算时间") private String settleTime; // 结算时间 - @ApiModelProperty("付款人编号") - private String payerNo; // 付款人编号 - @ApiModelProperty("付款人名称") - private String payerName; // 付款人名称 } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsAttachitemVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsAttachitemVo.java new file mode 100644 index 0000000000..5ab3f2fcab --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsAttachitemVo.java @@ -0,0 +1,22 @@ +package com.yxt.sms.biz.smssalesbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/6/20 11:09 + */ +@Data +public class SmsAttachitemVo { + @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/biz/smssalesbill/SmsSalesBill.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBill.java index 6ed24589da..eaca4e2e03 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBill.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBill.java @@ -82,8 +82,6 @@ public class SmsSalesBill extends BaseEntity { private String customerName; // 客户名称 @ApiModelProperty("联系电话") private String mobile; // 联系电话 - @ApiModelProperty("车辆牌照") - private String vehMark; // 车辆牌照 @ApiModelProperty("客户单位") private String customerOrg; // 客户单位 @ApiModelProperty("会员卡sid") @@ -94,5 +92,6 @@ public class SmsSalesBill extends BaseEntity { private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - + @ApiModelProperty("应收金额") + private BigDecimal receivableAmount; } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillDetailsVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillDetailsVo.java index d571b3bd99..45dd1bfb7d 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillDetailsVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillDetailsVo.java @@ -96,4 +96,17 @@ public class SmsSalesBillDetailsVo implements Vo { @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid -} \ No newline at end of file + + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("备注") + private String remarks; // 车架号 + @ApiModelProperty("客户单位") + private String customerOrg; // 客户单位 + @ApiModelProperty("应收金额") + private String receivableAmount; + private List aitemVos = new ArrayList<>();// 附加项目 + + + +} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbillinvoice/SmsSalesBillInvoice.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbillinvoice/SmsSalesBillInvoice.java index 39d56695c3..8235a021e8 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbillinvoice/SmsSalesBillInvoice.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbillinvoice/SmsSalesBillInvoice.java @@ -58,6 +58,7 @@ public class SmsSalesBillInvoice extends BaseEntity { private Integer isInvoicing; // 是否需要开发票（是1，否0） @ApiModelProperty("发票类型") private String invoiceType; // 发票类型 + private String invoiceTypeKey; // 发票类型Key @ApiModelProperty("开票名称") private String invoiceTitle; // 开票名称 @ApiModelProperty("税号")