open_platform/ss-common-goods
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangpengfei
2024-08-22 09:04:09 +08:00
parent 9215741984 07b8567fab
commit 0836eca768
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/yxt/goods/biz/baseproduct/BaseProductMapper.java
View File

@@ -18,7 +18,6 @@ public interface BaseProductMapper extends BaseMapper<BaseProduct> {
IPage<BaseProductVo> selectPageVo(IPage<BaseProduct> page,@Param(Constants.WRAPPER) QueryWrapper<BaseProduct> qw); IPage<BaseProductVo> selectPageVo(IPage<BaseProduct> page,@Param(Constants.WRAPPER) QueryWrapper<BaseProduct> qw);
// List<BaseProductChildVo> selChildrenList(@Param("sid") String sid, @Param("cSid") String cSid);
List<BaseProductChildVo> selChildrenList(@Param("sid") String sid); List<BaseProductChildVo> selChildrenList(@Param("sid") String sid);
int checkByGoodsSidAndUseOrgSid(@Param("goodsSid") String goodsSid, @Param("useOrgSid") String useOrgSid); int checkByGoodsSidAndUseOrgSid(@Param("goodsSid") String goodsSid, @Param("useOrgSid") String useOrgSid);

5
src/main/java/com/yxt/goods/biz/baseproduct/BaseProductMapper.xml
View File

@@ -34,9 +34,6 @@
p.sid, p.sid,
mg.goodsName AS materialName, mg.goodsName AS materialName,
mg.goodsCode AS materialCode, mg.goodsCode AS materialCode,
-- g.goodsName AS productName,
-- g.goodsCode AS productCode,
-- p.rateType,
m.rate, m.rate,
m.sid AS cSid m.sid AS cSid
FROM FROM
@@ -45,8 +42,6 @@
LEFT JOIN goods_spu AS g ON p.goodsSid = g.sid LEFT JOIN goods_spu AS g ON p.goodsSid = g.sid
LEFT JOIN goods_spu AS mg ON m.materialSid = mg.sid LEFT JOIN goods_spu AS mg ON m.materialSid = mg.sid
WHERE p.sid = #{sid} WHERE p.sid = #{sid}
-- and m.sid != #{cSid}
</select> </select>
<select id="checkByGoodsSidAndUseOrgSid" resultType="java.lang.Integer"> <select id="checkByGoodsSidAndUseOrgSid" resultType="java.lang.Integer">
SELECT COUNT(*) FROM base_product WHERE goodsSid = #{goodsSid} and useOrgSid = #{useOrgSid} SELECT COUNT(*) FROM base_product WHERE goodsSid = #{goodsSid} and useOrgSid = #{useOrgSid}

7
src/main/java/com/yxt/goods/biz/baseproduct/BaseProductService.java
View File

@@ -70,14 +70,13 @@ public class BaseProductService extends MybatisBaseService<BaseProductMapper, Ba
if (!records.isEmpty()) { if (!records.isEmpty()) {
for (BaseProductVo record : records) { for (BaseProductVo record : records) {
String num = record.getNum(); String num = record.getNum();
record.setCSid(record.getSid());
int i = Integer.parseInt(num); int i = Integer.parseInt(num);
if (i > 1) { if (i > 1) {
record.setProductCode("");
record.setProductName("");
record.setRate(""); record.setRate("");
// String childSid = record.getCSid(); record.setMaterialCode("");
record.setMaterialName("");
String sid = record.getSid(); String sid = record.getSid();
// List<BaseProductChildVo> children = baseMapper.selChildrenList(sid, childSid);
List<BaseProductChildVo> children = baseMapper.selChildrenList(sid); List<BaseProductChildVo> children = baseMapper.selChildrenList(sid);
if (!children.isEmpty()) { if (!children.isEmpty()) {
record.setChildren(children); record.setChildren(children);