aike/emis-oms2c-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-11-28 11:03:26 +08:00
parent 6756a1f181
commit 8eca1f0f33
2 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cGoodsController.java
View File

@ -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<EmisGoods> list = emisGoodsService.selectEmisGoodsList(emisGoods);
return getDataTable(list);
}
@JacksonFilter(include= {
"goodsCode",
"goodsName",

4
emis-oms-biz/src/main/resources/mapper/EmisGoodsMapper.xml
View File

@ -74,13 +74,13 @@
<if test="goodsCode != null and goodsCode != ''"> and goods_code like concat('%', #{goodsCode}, '%')</if>
<if test="goodsName != null and goodsName != ''"> and goods_name like concat('%', #{goodsName}, '%')</if>
<if test="goodsNameEn != null and goodsNameEn != ''"> and goods_name_en like concat('%', #{goodsNameEn}, '%')</if>
<if test="goodsCat != null and goodsCat != ''"> and goods_cat like concat('%', #{goodsCat}, '%')</if>
<if test="goodsCat != null and goodsCat != ''"> and goods_cat=#{goodsCat}</if>
<if test="goodsType != null and goodsType != ''"> and goods_type like concat('%', #{goodsType}, '%')</if>
<if test="goodsModel != null and goodsModel != ''"> and goods_model like concat('%', #{goodsModel}, '%')</if>
<if test="barcode != null and barcode != ''"> and barcode like concat('%', #{barcode}, '%')</if>
<if test="nationArea != null and nationArea != ''"> and nation_area like concat('%', #{nationArea}, '%')</if>
<if test="picUrl != null and picUrl != ''"> and pic_url like concat('%', #{picUrl}, '%')</if>
<if test="ownerCode != null and ownerCode != ''"> and owner_code like concat('%', #{ownerCode}, '%')</if>
<if test="ownerCode != null and ownerCode != ''"> and owner_code=#{ownerCode}</if>
<if test="isRealGoods != null "> and is_real_goods = #{isRealGoods}</if>
<if test="isBigCat != null "> and is_big_cat = #{isBigCat}</if>
<if test="brand != null and brand != ''"> and brand like concat('%', #{brand}, '%')</if>