From f6862bdff85b91876f24a819abede5c86479ba1f Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 14 Aug 2024 11:43:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/goods/biz/baseproduct/BaseProductDetailsVo.java | 1 + src/main/java/com/yxt/goods/biz/baseproduct/BaseProductDto.java | 1 + .../java/com/yxt/goods/biz/baseproduct/BaseProductService.java | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductDetailsVo.java b/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductDetailsVo.java index 29b68ba..c58f155 100644 --- a/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductDetailsVo.java +++ b/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductDetailsVo.java @@ -22,6 +22,7 @@ public class BaseProductDetailsVo implements Vo { @ApiModelProperty("对应商品sid") private String goodsSid; // 产品对应商品sid private String productName; // 产品名称 + private String productCode; // 产品编码 @ApiModelProperty("0产出率/1配比（初加工/深加工）") private String rateType; // 0产出率/1配比（初加工/深加工） private List list = new ArrayList<>(); //原料列表 diff --git a/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductDto.java b/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductDto.java index 05fc16d..d708478 100644 --- a/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductDto.java +++ b/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductDto.java @@ -22,6 +22,7 @@ public class BaseProductDto implements Dto { @ApiModelProperty("对应商品sid") private String goodsSid; // 产品对应商品sid private String productName; // 产品名称 + private String productCode; // 产品编码 @ApiModelProperty("0产出率/1配比（初加工/深加工）") private String rateType; // 0产出率/1配比（初加工/深加工） private List list = new ArrayList<>(); //原料列表 diff --git a/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductService.java b/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductService.java index 2622605..48311bd 100644 --- a/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductService.java +++ b/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductService.java @@ -126,6 +126,7 @@ public class BaseProductService extends MybatisBaseService list = new ArrayList<>(); //原料列表 List ms = baseProductMaterialService.selByProductSid(sid); From 0aa7926a0f7a1a074672118b4c9ef11f8c4bdd1c Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 16 Aug 2024 11:56:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=8E=B7=E5=8F=96=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java | 4 ++-- .../java/com/yxt/goods/biz/goodsspu/ProductGoodsQuery.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java index ac827d2..96a0967 100644 --- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java +++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java @@ -536,8 +536,8 @@ public class GoodsSpuService extends MybatisBaseService Date: Fri, 16 Aug 2024 16:32:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/baseproduct/BaseProductMapper.java | 3 ++- .../biz/baseproduct/BaseProductMapper.xml | 6 ++++-- .../biz/baseproduct/BaseProductService.java | 19 ++++++++++++++----- .../goods/biz/baseproduct/BaseProductVo.java | 1 + 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductMapper.java b/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductMapper.java index 39f579d..7bf920e 100644 --- a/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductMapper.java +++ b/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductMapper.java @@ -18,7 +18,8 @@ public interface BaseProductMapper extends BaseMapper { IPage selectPageVo(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); - List selChildrenList(@Param("sid") String sid, @Param("cSid") String cSid); +// List selChildrenList(@Param("sid") String sid, @Param("cSid") String cSid); + List selChildrenList(@Param("sid") String sid); int checkByGoodsSidAndUseOrgSid(@Param("goodsSid") String goodsSid, @Param("useOrgSid") String useOrgSid); diff --git a/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductMapper.xml b/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductMapper.xml index dc925fd..cb7ed35 100644 --- a/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductMapper.xml +++ b/src/main/java/com/yxt/goods/biz/baseproduct/BaseProductMapper.xml @@ -13,7 +13,8 @@ g.goodsCode AS productCode, p.rateType, m.rate, - m.sid AS cSid + m.sid AS cSid, + (SELECT COUNT(*) FROM base_product_material as pm WHERE pm.productSid = p.sid) as num FROM base_product AS p LEFT JOIN base_product_material AS m ON p.sid = m.productSid @@ -43,7 +44,8 @@ LEFT JOIN base_product_material AS m ON p.sid = m.productSid LEFT JOIN goods_spu AS g ON p.goodsSid = g.sid LEFT JOIN goods_spu AS mg ON m.materialSid = mg.sid - WHERE p.sid = #{sid} and m.sid != #{cSid} + WHERE p.sid = #{sid} +-- and m.sid != #{cSid}