选择商品增加组织权限
采购审核通过推送入库预约记录 查询所有员工接口调整
This commit is contained in:
@@ -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>
|
||||||
|
|||||||
@@ -19,4 +19,6 @@ public class GoodsSkuPurSelectQuery implements Query {
|
|||||||
private String barCode;
|
private String barCode;
|
||||||
//规格名称
|
//规格名称
|
||||||
private String goodsSkuOwnSpec;
|
private String goodsSkuOwnSpec;
|
||||||
|
|
||||||
|
private String orgPath;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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,6 +89,7 @@ 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();
|
||||||
@@ -106,6 +108,7 @@ 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();
|
||||||
@@ -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());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user