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

11.21

Browse Source
This commit is contained in:
wangpengfei
2024-11-21 10:12:44 +08:00
parent 71ac618a24
commit ed826a006c
7 changed files with 140 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml
View File

@@ -48,8 +48,11 @@
spu.shelfLife,
sku.own_spec as ownSpec
from goods_sku sku
left join goods_spu spu on spu.sid = sku.goodsSpuSid
left join goods_spu spu on spu.sid = sku.goodsSpuSid
LEFT JOIN goods_sku_extend ex ON ex.goodsSkuSid = sku.sid
left join goods_brand_info b on b.sid=spu.brandSid
left join goods_manufacturer c on c.sid = spu.manufacturerSid
left join goods_type d on d.sid =spu.goodsTypeSid
<where>
${ew.sqlSegment}
</where>
@@ -75,6 +78,9 @@
ON a.sid = s.goodsSpuSid
LEFT JOIN goods_sku_extend e
ON s.sid = e.goodsSkuSid
left join goods_brand_info b on b.sid=a.brandSid
left join goods_manufacturer c on c.sid = a.manufacturerSid
left join goods_type d on d.sid =a.goodsTypeSid
<where>
${ew.sqlSegment}
</where>

18
src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuPurSelectQuery.java
View File

@@ -12,9 +12,25 @@ import lombok.Data;
public class GoodsSkuPurSelectQuery implements Query {
//商品编码
private String goodsSkuCode;
private String goodsCode;
//商品名称
private String goodsName;
//条形码
private String barCode;
//规格编码
private String goodsSkuCode;
//规格型号
private String title;
//具体规格
private String ownSpec;
//品牌
private String brandName;
//厂家
private String manufacturerName;
//分类
private String typeName;
//厂家货号
private String manufacturerCode;
private String createOrgSid;
}

24
src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuSelectQuery.java
View File

@@ -11,7 +11,27 @@ import lombok.Data;
@Data
public class GoodsSkuSelectQuery implements Query {
private String goodsSkuCode;
private String goodsSpuName;
private String createOrgSid;
//商品编码
private String goodsCode;
//商品名称
private String goodsName;
//条形码
private String barCode;
//规格编码
private String goodsSkuCode;
//规格型号
private String title;
//具体规格
private String ownSpec;
//品牌
private String brandName;
//厂家
private String manufacturerName;
//分类
private String typeName;
//厂家货号
private String manufacturerCode;
}

59
src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java
View File

@@ -210,11 +210,37 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
QueryWrapper<GoodsSku> qw = new QueryWrapper<>();
if (query != null) {
//商品编码
if (StringUtils.isNotBlank(query.getGoodsCode())) {
qw.like("spu.goodsCode", query.getGoodsCode());
}
if (StringUtils.isNotBlank(query.getGoodsName())) {
qw.like("spu.goodsName", query.getGoodsName());
}
if (StringUtils.isNotBlank(query.getBarCode())) {
qw.like("spu.barCode", query.getBarCode());
}
if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
qw.like("sku.goodsSkuCode", query.getGoodsSkuCode());
}
if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
qw.like("spu.goodsName", query.getGoodsSpuName());
if (StringUtils.isNotBlank(query.getTitle())) {
qw.like("sku.title", query.getTitle());
}
if (StringUtils.isNotBlank(query.getOwnSpec())) {
qw.like("sku.ownSpec", query.getOwnSpec());
}
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("b.brandName", query.getBrandName());
}
if (StringUtils.isNotBlank(query.getManufacturerName())) {
qw.like("c.manufacturerName", query.getManufacturerName());
}
if (StringUtils.isNotBlank(query.getTypeName())) {
qw.like("d.goodsTypeName", query.getTypeName());
}
if (StringUtils.isNotBlank(query.getManufacturerCode())) {
qw.like("c.manufacturerCode", query.getManufacturerCode());
}
qw.eq("spu.createOrgSid",query.getCreateOrgSid());
}
@@ -230,11 +256,36 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
GoodsSkuPurSelectQuery query = pq.getParams();
QueryWrapper<GoodsSku> qw = new QueryWrapper<>();
qw.like("a.createOrgSid", query.getCreateOrgSid());
if (StringUtils.isNotBlank(query.getGoodsCode())) {
qw.like("a.goodsCode", query.getGoodsCode());
}
if (StringUtils.isNotBlank(query.getGoodsName())) {
qw.like("a.goodsName", query.getGoodsName());
}
if (StringUtils.isNotBlank(query.getBarCode())) {
qw.like("a.barCode", query.getBarCode());
}
if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
qw.like("s.goodsSkuCode", query.getGoodsSkuCode());
}
if (StringUtils.isNotBlank(query.getGoodsName())) {
qw.like("s.title", query.getGoodsName());
if (StringUtils.isNotBlank(query.getTitle())) {
qw.like("s.title", query.getTitle());
}
if (StringUtils.isNotBlank(query.getOwnSpec())) {
qw.like("s.ownSpec", query.getOwnSpec());
}
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("b.brandName", query.getBrandName());
}
if (StringUtils.isNotBlank(query.getManufacturerName())) {
qw.like("c.manufacturerName", query.getManufacturerName());
}
if (StringUtils.isNotBlank(query.getTypeName())) {
qw.like("d.goodsTypeName", query.getTypeName());
}
if (StringUtils.isNotBlank(query.getManufacturerCode())) {
qw.like("c.manufacturerCode", query.getManufacturerCode());
}
qw.eq("a.isEnable","1");
IPage<GoodsSku> page = PagerUtil.queryToPage(pq);

2
src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml
View File

@@ -27,7 +27,7 @@
</select>
<select id="initialization" resultType="com.yxt.goods.biz.goodsspu.GoodsSpuVo">
select
select DISTINCT
s.*,a.goodsTypeName as typeName,b.brandName as brandName,c.manufacturerName as manufacturerName
from goods_spu s
left join goods_type a on a.sid=s.goodsTypeSid

17
src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java
View File

@@ -10,12 +10,25 @@ import lombok.Data;
*/
@Data
public class GoodsSpuQuery implements Query {
private String name;
//商品编码
private String goodsCode;
//商品名称
private String goodsName;
//条形码
private String barCode;
//规格编码
private String goodsSkuCode;
//规格型号
private String title;
//具体规格
private String ownSpec;
//品牌
private String brandName;
private String TypeName;
//厂家
private String manufacturerName;
//厂家货号
private String manufacturerCode;
private String userOrgSid;
private String createOrgSid;//创建组织sid
private String orgLevelKey;//权限等级

35
src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
View File

@@ -106,23 +106,33 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
PagerVo<GoodsManufacturerVo> p = new PagerVo<>();
return rb.success().setData(p);
}
if (StringUtils.isNotBlank(query.getName())) {
qw.like("s.goodsName", query.getName());
}
if (StringUtils.isNotBlank(query.getGoodsCode())) {
qw.like("s.goodsCode", query.getGoodsCode());
}
if (StringUtils.isNotBlank(query.getGoodsName())) {
qw.like("s.goodsName", query.getGoodsName());
}
if (StringUtils.isNotBlank(query.getBarCode())) {
qw.like("s.barCode", query.getBarCode());
}
// if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
// qw.like("s.goodsSkuCode", query.getGoodsSkuCode());
// }
// if (StringUtils.isNotBlank(query.getTitle())) {
// qw.like("s.title", query.getTitle());
// }
// if (StringUtils.isNotBlank(query.getOwnSpec())) {
// qw.like("s.ownSpec", query.getOwnSpec());
// }
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.eq("s.brandSid", query.getBrandName());
}
if (StringUtils.isNotBlank(query.getTypeName())) {
qw.eq("s.typeSid", query.getTypeName());
qw.like("b.brandName", query.getBrandName());
}
if (StringUtils.isNotBlank(query.getManufacturerName())) {
qw.eq("s.manufacturerSid", query.getManufacturerName());
qw.like("c.manufacturerName", query.getManufacturerName());
}
if (StringUtils.isNotBlank(query.getManufacturerCode())) {
qw.like("c.manufacturerCode", query.getManufacturerCode());
}
qw.ne("s.isDelete","1");
IPage<GoodsSpu> page = PagerUtil.queryToPage(pq);
@@ -263,9 +273,10 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
if(null==vo){
spus.add(wmsGoods);
dtos1.add(dto);
}
for (GoodsSkuDto baseGoodsSkus : dto.getBaseGoodsSkus()) {
baseGoodsSkus.setGoodsSpuSid(vo.getSid());
}else{
for (GoodsSkuDto baseGoodsSkus : dto.getBaseGoodsSkus()) {
baseGoodsSkus.setGoodsSpuSid(vo.getSid());
}
}
}
this.saveBatch(spus);
@@ -326,7 +337,7 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
}
return rb.success().setMsg("成功");
}
public ResultBean importExcel(MultipartFile file) throws IOException {
public ResultBean importExcel(MultipartFile file) throws IOException {
ResultBean rb=new ResultBean().fail();
//檢查excel
ExcelUtil.checkFile(file);