From 9e7ddb5e8e4acbfa26c892c14805930a9823b735 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Fri, 7 Mar 2025 11:17:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E4=B8=8A=E6=9E=B6=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java | 6 ++++++ .../base/biz/base/basegoodsspu/BaseGoodsSpuMapper.java | 2 ++ .../base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml | 3 +++ .../base/biz/base/basegoodsspu/BaseGoodsSpuService.java | 6 ++++++ .../SmsPricestrategyBillDetailMapper.xml | 2 ++ .../biz/inventory/wmsshelfbill/WmsShelfBillService.java | 9 ++++++++- .../wms/feign/base/basegoodspu/BaseGoodsSpuFeign.java | 8 +++++--- 7 files changed, 32 insertions(+), 4 deletions(-) diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java index a774d47bbd..78e8af1e65 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java @@ -99,6 +99,12 @@ public class BaseGoodsSpuRest { return baseGoodsSpuService.selIsGoodsID(sid); } + @ApiOperation("根据商品类型sid查询商品类型名称") + @GetMapping("/selGoodsTypeBySid") + public ResultBean selGoodsTypeBySid(@RequestParam("sid") String sid){ + return baseGoodsSpuService.selGoodsTypeBySid(sid); + } + @ApiOperation("根据图号和部门查询商品信息是否存在") @GetMapping("/selByCodeAndDept") ResultBean selByCodeAndDept(@RequestParam("code") String code,@RequestParam("deptSid") String deptSid){ diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.java index 2d2e8a1384..8d9164857b 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.java @@ -30,4 +30,6 @@ public interface BaseGoodsSpuMapper extends BaseMapper { int selByCodeAndDept(@Param("code") String code,@Param("deptSid") String deptSid); List selPurchaseAssetInfo(@Param("useOrgSid") String useOrgSid,@Param("name") String name); + + String selGoodsTypeBySid(@Param("sid") String sid); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml index 37474ed1b5..812f811723 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml @@ -109,4 +109,7 @@ WHERE and goodsCode like concat('%',#{name},'%') + diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java index fa88df44f4..2332242bcf 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java @@ -633,4 +633,10 @@ public class BaseGoodsSpuService extends MybatisBaseService selGoodsTypeBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + String typeName = baseMapper.selGoodsTypeBySid(sid); + return rb.success().setData(typeName); + } } diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.xml b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.xml index d1e84539e6..e255549395 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.xml +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.xml @@ -14,5 +14,7 @@ WHERE sd.goodsTypeSid = #{goodsTypeSid} AND sb.deptSid = #{deptSid} AND sb.nodeState = '已办结' + ORDER BY sb.createTime DESC + LIMIT 1 \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java index bc4b08edb2..28d74967ef 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java @@ -853,13 +853,15 @@ public class WmsShelfBillService extends MybatisBaseService data = smsPricesTrategyBillGoodsTypeDetailFeign.selByMainSid(tjmxSid).getData(); for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : data) { - cost = receiptBillDetail.getCost(); if (cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) { BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate(); price = cost.add(cost.multiply(markupRate).divide(new BigDecimal("100"))); @@ -873,8 +875,13 @@ public class WmsShelfBillService extends MybatisBaseService selByCodeAndDept(@RequestParam("code") String code,@RequestParam("deptSid") String deptSid); + + @ApiOperation("根据商品类型sid查询商品类型名称") + @GetMapping("/selGoodsTypeBySid") + public ResultBean selGoodsTypeBySid(@RequestParam("sid") String sid); + }