选择商品查询当前单位下商品完成
选择商品返回有效期和税率,保存采购单保存有效期到采购商品明细中
This commit is contained in:
@@ -70,8 +70,6 @@
|
|||||||
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>
|
||||||
|
|||||||
@@ -15,10 +15,6 @@ public class GoodsSkuPurSelectQuery implements Query {
|
|||||||
private String goodsSkuCode;
|
private String goodsSkuCode;
|
||||||
//商品名称
|
//商品名称
|
||||||
private String goodsName;
|
private String goodsName;
|
||||||
//商品条码
|
|
||||||
private String barCode;
|
|
||||||
//规格名称
|
|
||||||
private String goodsSkuOwnSpec;
|
|
||||||
|
|
||||||
private String orgPath;
|
private String createOrgSid;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -210,19 +210,13 @@ 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());
|
qw.like("a.createOrgSid", query.getCreateOrgSid());
|
||||||
if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
|
if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
|
||||||
qw.eq("s.goodsSkuCode", query.getGoodsSkuCode());
|
qw.eq("s.goodsSkuCode", query.getGoodsSkuCode());
|
||||||
}
|
}
|
||||||
if (StringUtils.isNotBlank(query.getGoodsName())) {
|
if (StringUtils.isNotBlank(query.getGoodsName())) {
|
||||||
qw.like("s.title", query.getGoodsName());
|
qw.like("s.title", query.getGoodsName());
|
||||||
}
|
}
|
||||||
if (StringUtils.isNotBlank(query.getBarCode())) {
|
|
||||||
qw.like("a.barCode", query.getBarCode());
|
|
||||||
}
|
|
||||||
if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())) {
|
|
||||||
qw.like("s.own_spec", query.getGoodsSkuOwnSpec());
|
|
||||||
}
|
|
||||||
IPage<GoodsSku> page = PagerUtil.queryToPage(pq);
|
IPage<GoodsSku> page = PagerUtil.queryToPage(pq);
|
||||||
IPage<GoodsSkuPurSelectList> pagging = baseMapper.purGoodsListPage(page, qw);
|
IPage<GoodsSkuPurSelectList> pagging = baseMapper.purGoodsListPage(page, qw);
|
||||||
PagerVo<GoodsSkuPurSelectList> p = PagerUtil.pageToVo(pagging, null);
|
PagerVo<GoodsSkuPurSelectList> p = PagerUtil.pageToVo(pagging, null);
|
||||||
|
|||||||
Reference in New Issue
Block a user