From 972659d661bf8bc615704fed47ac395b509f6d54 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 20 Jun 2024 17:55:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=94=AE=E5=90=8E=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=BC=80=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/sms/biz/smsgoods/SmsGoods.java | 4 ++ .../sms/biz/smssalesbill/SalesGoodsVo.java | 3 ++ .../biz/smssalesbill/SmsSalesBillMapper.java | 3 ++ .../biz/smssalesbill/SmsSalesBillMapper.xml | 21 +++++++++ .../biz/smssalesbill/SmsSalesBillService.java | 43 +++++++++++------- .../SmsWmsInventorySalesQuery.java | 2 +- .../smssalesbill/SmsWmsInventorySalesVo.java | 44 ++++++++++++++----- .../FmsReceivesettleFeign.java | 2 +- 8 files changed, 92 insertions(+), 30 deletions(-) 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 index 79013526d1..70b60ee42e 100644 --- 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 @@ -78,4 +78,8 @@ public class SmsGoods extends BaseEntity { private String unit; // 计量单位 @ApiModelProperty("组织全路径") private BigDecimal price; // 销售单价 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid } 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 54c562ff7e..5b088c3614 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 @@ -14,6 +14,9 @@ import java.math.BigDecimal; public class SalesGoodsVo { private String sid; + //商品sid + private String goodSpuSid; + private String goodsSkuSid; //商品名称 private String goodsSpuName; //商品编码（图号） 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 aa5acc4ff3..3864546ae1 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 @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.sms.biz.smsgoods.SmsGoods; import com.yxt.sms.biz.smssalesbill.report.SmsSalesBillGoodsDetailsReportVo; import com.yxt.sms.biz.smssalesbill.report.SmsSalesGoodsTotalsVo; import com.yxt.sms.biz.smssalesbill.report.SmsSalesTrendVo; @@ -75,4 +76,6 @@ public interface SmsSalesBillMapper extends BaseMapper { IPage goodsTrendReport(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); int selectNum(String bill); + + IPage listPageSalesGoods(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 7f2f9c7ad7..654ae32fe8 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 @@ -97,4 +97,25 @@ from sms_sales_bill where billNo LIKE concat(#{bill}, '%') + 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 63b508e6b0..5f2c208316 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 @@ -241,6 +241,9 @@ public class SmsSalesBillService extends MybatisBaseService> listPageSales(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - PagerVo pagerVo = new PagerVo<>(); - PagerQuery pagerQuery = new PagerQuery<>(); - BeanUtil.copyProperties(pq, pagerQuery); - PagerVo voPagerVo = wmsInventoryFeign.listPageSales(pagerQuery).getData(); - if (null != voPagerVo) { - BeanUtil.copyProperties(voPagerVo, pagerVo); + SmsWmsInventorySalesQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getGoodsName())) { + qw.like("s.goodsSpuName", query.getGoodsName()); + } + if (StringUtils.isNotBlank(query.getUseOrgSid())) { + qw.like("s.useOrgSid", query.getUseOrgSid()); } - return rb.success().setData(pagerVo); + qw.apply("s.currentCount > 0"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPageSalesGoods(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); } public ResultBean settlement(SmsSalesBillDto dto) { @@ -395,15 +406,15 @@ public class SmsSalesBillService extends MybatisBaseService billDetailList = smsSalesBillDetailService.fetchByMainSid(sid); - if (!billDetailList.isEmpty()) { - for (SmsSalesBillDetail salesBillDetail : billDetailList) { - WmsUpdateCountQuery countQuery = new WmsUpdateCountQuery(); -// countQuery.setSid(salesBillDetail.getInventorySid()); - countQuery.setCount(salesBillDetail.getCount()); - countQuery.setAddOrReduce(1); - wmsInventoryFeign.updateInventoryCount(countQuery); - } - } +// if (!billDetailList.isEmpty()) { +// for (SmsSalesBillDetail salesBillDetail : billDetailList) { +// WmsUpdateCountQuery countQuery = new WmsUpdateCountQuery(); +//// countQuery.setSid(salesBillDetail.getInventorySid()); +// countQuery.setCount(salesBillDetail.getCount()); +// countQuery.setAddOrReduce(1); +// wmsInventoryFeign.updateInventoryCount(countQuery); +// } +// } } return rb.success(); } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsWmsInventorySalesQuery.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsWmsInventorySalesQuery.java index b76d007156..6679c8fc9d 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsWmsInventorySalesQuery.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsWmsInventorySalesQuery.java @@ -11,6 +11,6 @@ import lombok.Data; @Data public class SmsWmsInventorySalesQuery implements Query { - private String queryName; //名称 + private String goodsName; //名称 private String useOrgSid; } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsWmsInventorySalesVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsWmsInventorySalesVo.java index 762a0dc879..e618a5626f 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsWmsInventorySalesVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsWmsInventorySalesVo.java @@ -1,6 +1,7 @@ package com.yxt.sms.biz.smssalesbill; import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -11,18 +12,37 @@ import lombok.Data; @Data public class SmsWmsInventorySalesVo implements Vo { - private String inventorySid; - private String goodsID; - private String goodSpuSid;//商品基础信息sid - private String goodsSpuName;//商品名称 - private String goodsSkuSid;//商品Skusid - private String goodsSkuTitle;//商品Sku名称 - private String goodsSkuCode;//商品编码（图号） - private String unit;//计量单位 - private String currentCount;//库存数量 - private String warehouseSid;//仓库sid - private String warehouse;//仓库名称 - private String price;//销售价 + + //商品sid + private String goodSpuSid; + private String goodsSkuSid; + //商品名称 + private String goodsSpuName; + //商品编码（图号） + private String goodsSkuCode; + //规格型号 + private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("厂家") + private String supplierName; + @ApiModelProperty("库存数量") + private String currentCount; + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @ApiModelProperty("销售价（元）") + private String price; + @ApiModelProperty("出/退库数量") + private String count; + //折扣（0-10，0免费，10不打折） + private String discount; + //优惠金额（=销售价*(1-折扣*0.1）） + private String discountAmount; + //金额（销售价-优惠金额） + private String amount; + @ApiModelProperty("备注") + private String remarks; + } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/feign/fms/fmsreceivesettle/FmsReceivesettleFeign.java b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/fms/fmsreceivesettle/FmsReceivesettleFeign.java index 5116a479a2..5fdd87f725 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/feign/fms/fmsreceivesettle/FmsReceivesettleFeign.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/fms/fmsreceivesettle/FmsReceivesettleFeign.java @@ -27,6 +27,6 @@ public interface FmsReceivesettleFeign { public ResultBean save(@RequestBody FmsReceivesettleDto dto); @ApiOperation("根据来源SID获取一条记录") - @GetMapping("/fetchBySourceSid/{sid}") + @GetMapping("/fetchBySourceSid/{sourceBillSid}") public ResultBean fetchBySourceSid(@PathVariable("sourceBillSid") String sourceBillSid); }