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

问题修改

Browse Source
This commit is contained in:
wangpengfei
2024-09-27 08:44:14 +08:00
parent da550e743b
commit 884e65249f
6 changed files with 30 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java
View File

@@ -79,6 +79,10 @@ public class GoodsManufacturerService extends MybatisBaseService<GoodsManufactur
public ResultBean<String> saveOrUpdate(GoodsManufacturerDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = "";
GoodsManufacturer g=baseMapper.selectOne(new QueryWrapper<GoodsManufacturer>().eq("manufacturerCode",dto.getManufacturerCode()));
if(null!=g){
return rb.success().setMsg("编码重复");
}
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
GoodsManufacturer wmsManufacturer = fetchBySid(dto.getSid());
@@ -90,11 +94,6 @@ public class GoodsManufacturerService extends MybatisBaseService<GoodsManufactur
sid = wmsManufacturer.getSid();
BeanUtil.copyProperties(dto, wmsManufacturer, "id", "sid");
wmsManufacturer.setCreateTime(new DateTime());
// if (StringUtils.isNotBlank(dto.getPicUrl())) {
// String urlPrefix = fileUploadComponent.getUrlPrefix();
// String path = dto.getPicUrl().substring(urlPrefix.length());
// lpkGoods.setPicUrl(path);
// }
wmsManufacturer.setCreateBySid(dto.getUserSid());
baseMapper.insert(wmsManufacturer);
}

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

@@ -236,6 +236,7 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
if (StringUtils.isNotBlank(query.getGoodsName())) {
qw.like("s.title", query.getGoodsName());
}
qw.eq("a.isEnable","1");
IPage<GoodsSku> page = PagerUtil.queryToPage(pq);
IPage<GoodsSkuPurSelectList> pagging = baseMapper.purGoodsListPage(page, qw);
PagerVo<GoodsSkuPurSelectList> p = PagerUtil.pageToVo(pagging, null);

23
src/main/java/com/yxt/goods/biz/goodsskuextend/GoodsSkuExtendService.java
View File

@@ -100,35 +100,12 @@ public class GoodsSkuExtendService extends MybatisBaseService<GoodsSkuExtendMapp
GoodsSkuExtend wmsGoods = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsGoods);
wmsGoods.setModifyTime(new Date());
wmsGoods.setPicUrl("");
for (UrlsVo url : dto.getUrls()) {
String urlPrefix = fileUploadComponent.getUrlPrefix();
String path = url.getUrl().substring(urlPrefix.length());
if(StringUtils.isBlank(wmsGoods.getPicUrl())){
wmsGoods.setPicUrl(path);
}else{
wmsGoods.setPicUrl(wmsGoods.getPicUrl()+","+path);
}
}
baseMapper.updateById(wmsGoods);
} else {
GoodsSkuExtend wmsGoods = new GoodsSkuExtend();
sid = wmsGoods.getSid();
BeanUtil.copyProperties(dto, wmsGoods);
wmsGoods.setCreateTime(new DateTime());
if(dto.getUrls()!=null){
for (UrlsVo url : dto.getUrls()) {
String urlPrefix = fileUploadComponent.getUrlPrefix();
String path = url.getUrl().substring(urlPrefix.length());
if(StringUtils.isBlank(wmsGoods.getPicUrl())){
wmsGoods.setPicUrl(path);
}else{
wmsGoods.setPicUrl(wmsGoods.getPicUrl()+","+path);
}
}
}
baseMapper.insert(wmsGoods);
}
return rb.success().setMsg("成功");

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

@@ -143,26 +143,37 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
if (!spun.getSid().equals(dto.getSid())) {
return rb.setMsg("商品编码重复");
}
for (GoodsSkuDto baseGoodsSkus : dto.getBaseGoodsSkus()) {
GoodsSku sku=goodsSkuService.getOne(new QueryWrapper<GoodsSku>().eq("goodsSkuCode",baseGoodsSkus.getGoodsSkuCode()));
if(!baseGoodsSkus.getSid().equals(sku.getSid())){
return rb.setMsg("商品sku编码重复");
}
}
sid = dto.getSid();
GoodsSpu wmsGoods = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsGoods);
wmsGoods.setModifyTime(new Date());
// wmsGoods.setGoodsPY(PinYinUtils.getPinYinName(wmsGoods.getGoodsName()));
wmsGoods.setGoodsPY(PinYinUtils.sx(wmsGoods.getGoodsName()));;
;
baseMapper.updateById(wmsGoods);
//spu详情
dto.getBaseGoodsSpuDetail().setGoodSpuSid(wmsGoods.getSid());
baseGoodsSpuDetailService.saveOrUpdate(dto.getBaseGoodsSpuDetail());
//商品sku
dto.getBaseGoodsSkus().forEach(s -> {
s.setGoodsSpuSid(wmsGoods.getSid());
});
goodsSkuService.saveOrUpdate(dto.getBaseGoodsSkus());
baseGoodsSpuDetailService.saveOrUpdate(dto.getBaseGoodsSpuDetail());
baseMapper.updateById(wmsGoods);
} else {
GoodsSpu spu = baseMapper.selectOne(new QueryWrapper<GoodsSpu>().eq("goodsCode", dto.getGoodsCode()));
if (spu != null) {
return rb.setMsg("商品编码重复");
return rb.setMsg("商品spu编码重复");
}
for (GoodsSkuDto baseGoodsSkus : dto.getBaseGoodsSkus()) {
GoodsSku sku=goodsSkuService.getOne(new QueryWrapper<GoodsSku>().eq("goodsSkuCode",baseGoodsSkus.getGoodsSkuCode()));
if(null!=sku){
return rb.setMsg("商品sku编码重复");
}
}
GoodsSpu wmsGoods = new GoodsSpu();
sid = wmsGoods.getSid();
@@ -170,15 +181,16 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
wmsGoods.setCreateTime(new DateTime());
wmsGoods.setGoodsPY(PinYinUtils.sx(wmsGoods.getGoodsName()));;
wmsGoods.setCreateBySid(dto.getUserSid());
baseMapper.insert(wmsGoods);
//spu详情
dto.getBaseGoodsSpuDetail().setGoodSpuSid(wmsGoods.getSid());
baseGoodsSpuDetailService.saveOrUpdate(dto.getBaseGoodsSpuDetail());
//商品sku
dto.getBaseGoodsSkus().forEach(s -> {
s.setGoodsSpuSid(wmsGoods.getSid());
});
goodsSkuService.saveOrUpdate(dto.getBaseGoodsSkus());
baseGoodsSpuDetailService.saveOrUpdate(dto.getBaseGoodsSpuDetail());
baseMapper.insert(wmsGoods);
}
return rb.success().setMsg("成功");
}
@@ -212,7 +224,6 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
GoodsSkuExtendVo vo2 = goodsSkuExtendService.getExtendBySkuSid(goodsSkuVo.getSid()).getData();
if (StringUtils.isNotBlank(vo2.getPicUrl())) {
for (String url : vo2.getPicUrl().split(",")) {
url = fileUploadComponent.getUrlPrefix() + url;
UrlsVo vo3 = new UrlsVo();
vo3.setUrl(url);
ur.add(vo3);

2
src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeQuery.java
View File

@@ -12,7 +12,7 @@ import lombok.Data;
public class GoodsTypeQuery implements Query {
private String name;//名字
private String code;//编码
private String IsGoodID;//是否一品一码（goodID），0否，1是
private String goodID;//是否一品一码（goodID），0否，1是
private String outStockRule;//出库规则（先进先出0、先进后出1、保质期优先2）
private String userOrgSid;
private String createOrgSid;//创建组织sid

8
src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java
View File

@@ -63,8 +63,8 @@ public class GoodsTypeService extends MybatisBaseService<GoodsTypeMapper, GoodsT
if(StringUtils.isNotBlank(query.getCode())){
qw.like("a.goodsTypeCode",query.getCode());
}
if(StringUtils.isNotBlank(query.getIsGoodID())){
qw.eq("a.isGoodsID",query.getIsGoodID());
if(StringUtils.isNotBlank(query.getGoodID())){
qw.eq("a.isGoodsID",query.getGoodID());
}
if(StringUtils.isNotBlank(query.getOutStockRule())){
qw.eq("a.outStockRule",query.getOutStockRule());
@@ -114,6 +114,10 @@ public class GoodsTypeService extends MybatisBaseService<GoodsTypeMapper, GoodsT
if(StringUtils.isBlank(dto.getSortNo())){
dto.setSortNo("0");
}
GoodsType type=baseMapper.selectOne(new QueryWrapper<GoodsType>().eq("goodsTypeCode",dto.getGoodsTypeCode()));
if(type!=null){
return rb.success().setMsg("编码重复");
}
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
GoodsType wmsGoodsType = fetchBySid(dto.getSid());