diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cGoodsController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cGoodsController.java index 9568ff8..027a9c3 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cGoodsController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cGoodsController.java @@ -52,7 +52,7 @@ public class Oms2cGoodsController extends BaseController /** * 查询货物信息列表 */ - @PreAuthorize("@ss.hasPermi('emis:emisGoods:list')") +// @PreAuthorize("@ss.hasPermi('emis:emisGoods:list')") @GetMapping("/list") public TableDataInfo list(EmisGoods emisGoods) { @@ -97,6 +97,43 @@ public class Oms2cGoodsController extends BaseController return getDataTable(list); } + /** + * 获取自己商品列表 + * @param emisGoods + * @return + */ + @JacksonFilter(include= { + "goodsCode", + "goodsName", + "goodsNameEn", + "goodsType", + "goodsModel", + "nationArea", + "ownerCode", + "brand", + "material", + "grossWeight", + "netWeight", + "taxNo", + "hsCode", + "unit", + "price", + "currency", + "ingredients", + "purpose", + "supplier", + "licNo", + "orderNum" + },value= EmisGoods.class,type= JacksonFilter.JscksonFilterType.RESPONSE) + @RequestMapping("/listMyGoodsSimple") + public TableDataInfo listMyGoodsSimple(EmisGoods emisGoods) + { + startPage(); + emisGoods.setOwnerCode(getLoginUser().getUser().getCustomerCode()); + List list = emisGoodsService.selectEmisGoodsList(emisGoods); + return getDataTable(list); + } + @JacksonFilter(include= { "goodsCode", "goodsName", diff --git a/emis-oms-biz/src/main/resources/mapper/EmisGoodsMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisGoodsMapper.xml index f1dcab0..9627cc2 100644 --- a/emis-oms-biz/src/main/resources/mapper/EmisGoodsMapper.xml +++ b/emis-oms-biz/src/main/resources/mapper/EmisGoodsMapper.xml @@ -74,13 +74,13 @@ and goods_code like concat('%', #{goodsCode}, '%') and goods_name like concat('%', #{goodsName}, '%') and goods_name_en like concat('%', #{goodsNameEn}, '%') - and goods_cat like concat('%', #{goodsCat}, '%') + and goods_cat=#{goodsCat} and goods_type like concat('%', #{goodsType}, '%') and goods_model like concat('%', #{goodsModel}, '%') and barcode like concat('%', #{barcode}, '%') and nation_area like concat('%', #{nationArea}, '%') and pic_url like concat('%', #{picUrl}, '%') - and owner_code like concat('%', #{ownerCode}, '%') + and owner_code=#{ownerCode} and is_real_goods = #{isRealGoods} and is_big_cat = #{isBigCat} and brand like concat('%', #{brand}, '%')