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

选择商品增加组织权限

Browse Source 
采购审核通过推送入库预约记录
查询所有员工接口调整
This commit is contained in:
God
2024-07-29 15:14:57 +08:00
parent ed9a9cdbd4
commit 931ec31b27
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,6 +70,8 @@
ON a.sid = s.goodsSpuSid ON a.sid = s.goodsSpuSid
LEFT JOIN goods_sku_extend e LEFT JOIN goods_sku_extend e
ON s.sid = e.goodsSkuSid ON s.sid = e.goodsSkuSid
LEFT JOIN ss_user.sys_organization o
ON a.useOrgSid = o.sid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>

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

@@ -19,4 +19,6 @@ public class GoodsSkuPurSelectQuery implements Query {
private String barCode; private String barCode;
//规格名称 //规格名称
private String goodsSkuOwnSpec; private String goodsSkuOwnSpec;
private String orgPath;
} }

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

@@ -60,6 +60,7 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
PagerVo<GoodsSkuVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<GoodsSkuVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p); return rb.success().setData(p);
} }
public ResultBean<List<GoodsSkuVo>> listAllByOrg(OrgPathQuery query) { public ResultBean<List<GoodsSkuVo>> listAllByOrg(OrgPathQuery query) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
List<GoodsSkuVo> pagging = baseMapper.listAllByOrg(query.getOrgPath()); List<GoodsSkuVo> pagging = baseMapper.listAllByOrg(query.getOrgPath());
@@ -88,11 +89,12 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
} }
return rb.success().setMsg("成功"); return rb.success().setMsg("成功");
} }
@Transactional @Transactional
public ResultBean<String> skuBatchSave(List<GoodsSpuDto> dtos) { public ResultBean<String> skuBatchSave(List<GoodsSpuDto> dtos) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
List<GoodsSku> skus = new ArrayList<>(); List<GoodsSku> skus = new ArrayList<>();
List<GoodsSkuDto> dtos1=new ArrayList<>(); List<GoodsSkuDto> dtos1 = new ArrayList<>();
for (GoodsSpuDto dto : dtos) { for (GoodsSpuDto dto : dtos) {
for (GoodsSkuDto baseGoodsSkus : dto.getBaseGoodsSkus()) { for (GoodsSkuDto baseGoodsSkus : dto.getBaseGoodsSkus()) {
GoodsSku sku = new GoodsSku(); GoodsSku sku = new GoodsSku();
@@ -106,13 +108,14 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
goodsSkuExtendService.skuEBatchSave(dtos1); goodsSkuExtendService.skuEBatchSave(dtos1);
return rb.success().setMsg("成功"); return rb.success().setMsg("成功");
} }
@Transactional @Transactional
public ResultBean<String> saveOrUpdate(List<GoodsSkuDto> dtos) { public ResultBean<String> saveOrUpdate(List<GoodsSkuDto> dtos) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
for (GoodsSkuDto dto : dtos) { for (GoodsSkuDto dto : dtos) {
GoodsSku sku=baseMapper.selectOne(new QueryWrapper<GoodsSku>().eq("sid",dto.getSid())); GoodsSku sku = baseMapper.selectOne(new QueryWrapper<GoodsSku>().eq("sid", dto.getSid()));
String sid = ""; String sid = "";
if (null!=sku) { if (null != sku) {
sid = dto.getSid(); sid = dto.getSid();
GoodsSku wmsGoods = fetchBySid(dto.getSid()); GoodsSku wmsGoods = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsGoods); BeanUtil.copyProperties(dto, wmsGoods);
@@ -136,8 +139,8 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
public ResultBean<GoodsSkuVo> initialization(String sid) { public ResultBean<GoodsSkuVo> initialization(String sid) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
GoodsSkuVo vo = baseMapper.getSkuBySid(sid); GoodsSkuVo vo = baseMapper.getSkuBySid(sid);
GoodsSkuExtendVo vo1= goodsSkuExtendService.getExtendBySkuSid(vo.getSid()).getData(); GoodsSkuExtendVo vo1 = goodsSkuExtendService.getExtendBySkuSid(vo.getSid()).getData();
if(vo1==null){ if (vo1 == null) {
vo.setBaseGoodsSkuExtend(new GoodsSkuExtendVo()); vo.setBaseGoodsSkuExtend(new GoodsSkuExtendVo());
} }
vo.setBaseGoodsSkuExtend(vo1); vo.setBaseGoodsSkuExtend(vo1);
@@ -207,6 +210,7 @@ public class GoodsSkuService extends MybatisBaseService<GoodsSkuMapper, GoodsSku
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
GoodsSkuPurSelectQuery query = pq.getParams(); GoodsSkuPurSelectQuery query = pq.getParams();
QueryWrapper<GoodsSku> qw = new QueryWrapper<>(); QueryWrapper<GoodsSku> qw = new QueryWrapper<>();
qw.like("o.orgSidPath", query.getOrgPath());
if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
qw.eq("s.goodsSkuCode", query.getGoodsSkuCode()); qw.eq("s.goodsSkuCode", query.getGoodsSkuCode());
} }