diff --git a/src/main/java/com/yxt/goods/apiadmin/GoodsSkuRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsSkuRest.java index 5a4c495..1a1c4fb 100644 --- a/src/main/java/com/yxt/goods/apiadmin/GoodsSkuRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/GoodsSkuRest.java @@ -86,4 +86,14 @@ public class GoodsSkuRest { public ResultBean> purGoodsListPage(@RequestBody PagerQuery pq) { return goodsSkuService.purGoodsListPage(pq); } + @ApiOperation("采购单选择商品") + @PostMapping("/getGoodsList") + public ResultBean> getGoodsList(@RequestBody GoodsSkuSelectQuery query) { + return goodsSkuService.getGoodsList(query); + } + @ApiOperation("采购单选择商品") + @GetMapping("/getGoodsBySkuSid") + public ResultBean getGoodsBySkuSid(@RequestParam String skuSid) { + return goodsSkuService.getGoodsBySkuSid(skuSid); + } } diff --git a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuDetailVo.java b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuDetailVo.java new file mode 100644 index 0000000..fc2a1e8 --- /dev/null +++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuDetailVo.java @@ -0,0 +1,85 @@ +package com.yxt.goods.biz.goodssku; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author wangpengfei + * @date 2024/12/10 13:46 + */ +@Data +public class GoodsSkuDetailVo { + private String sid; + private String spuSid; + private String goodsCode;//商品代码 + private String barCode;//条形码 + private String goodsName;//商品名称 + private String subTitle;//副标题 + private String goodsPY;//拼音缩写 + private String goodsShortName;//商品简称 + private String goodsTypeSid;//商品分类sid + private String goodsTypeName;//商品分类sid + private String brandSid;//品牌sid + private String brandName;//品牌sid + private String manufacturerSid;//厂家sid + private String manufacturerName;//厂家sid + private String goodsUnitSid;//商品单位sid + private String goodsUnitName;//商品单位名称 + private String taxRate;//税率 + private String shelfLife;//保质期天 + private String nationalStandardCode;//国标码 + private String sortNo;//排序 + private String externalCode;//外部编码 + private String factoryCode;//厂家货号 + private String isListed;//是否上架 + private String useOrgSid;//使用组织sid（部门sid） + private String createOrgSid;//创建组织sid（单位sid） + private String goodsLevelKey;//商品等级Key + private String goodsLevelValue;//商品等级value（数据字典，如A、B、C） + private String goodsClassKey;//商品类型key + private String goodsClassValue;//商品类型value（数据字典，如正常商品、赠品、耗材等） + //---------sku detail + private String spuDetailSid; + private String goodsExplain; + private String goodsDescription; + private String generic_spec; + private String special_spec; + + private String skuSid; + private String goodsSkuCode; + private String title;//商品标题 + private String skuExternalCode;//外部编码 + private String indexes;//特有规格属性在spu表中special_spec字段对应每个参数值数组下标的组合，如0_0_0,1_0_0，相当于SKU这条记录的编码 + private String own_spec;//sku的特有规格参数键值对，json格式，反序列化时请使用linkedHashMap，保证有序 + private String skuBarCode;//条形码 + private String aidBarCode;//辅助条码 + + private String finalPurchasePrice;//最后采购价 + private String safetyStockDays;//安全库存天数 + private String isOriginalFactory;//是否原厂 1 是 2否 + private String isInventoryAlert;//是否库存警戒 1是 2否 + private String InventoryAlertUpperLimit;//库存警戒上线 + private String InventoryAlertLowerLimit;//库存警戒下线 + private String costPrice;//成本价 + private String tagPrice;//吊牌价 + private String salesPrice;//销售单价 + private String standardPurchasePrice;//标准进价 + private String agencyPrice;//代理价 + private String discount;//折扣 + private String minimumSalesPrice;//最低零售价 + private String isLockingSalesPrice;//是否锁定销售价 + private String isIntegralExchange;//是否可以积分兑换 + private String integralAmount;//积分数量 + private String picUrl;//商品的图片，多个图片以‘,’分割 + private String weight;//重量 + private String volume;//体积（长*宽*高） + private String vLength;//长 + private String vWidth;//宽 + private String vHeight;//高 + private String sPackageSpecs;//包装规格（如1*30包，1*300ml） + private double sQuantityOfPackage;//包装内数量 + private String sPackUnit;//包装单价 + private BigDecimal sPackPrice;//包装单价 + +} diff --git a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.java b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.java index 5fcb2f1..f7de22a 100644 --- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.java +++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.java @@ -25,4 +25,6 @@ public interface GoodsSkuMapper extends BaseMapper { IPage getSelectList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); IPage purGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + List getGoodsList(@Param(Constants.WRAPPER) QueryWrapper qw); + GoodsSkuDetailVo getGoodsBySkuSid(@Param("skuSid") String skuSid); } diff --git a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml index a473ec8..e37fdc2 100644 --- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml @@ -135,4 +135,32 @@ ${ew.sqlSegment} + + \ No newline at end of file diff --git a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuSelectQuery.java b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuSelectQuery.java index 43be8f1..c8fd83e 100644 --- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuSelectQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuSelectQuery.java @@ -28,10 +28,13 @@ public class GoodsSkuSelectQuery implements Query { private String ownSpec; //品牌 private String brandName; + private String brandSid; //厂家 private String manufacturerName; + private String manufacturerSid; //分类 private String typeName; + private String typeSid; //厂家货号 private String manufacturerCode; } diff --git a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java index d325669..637173a 100644 --- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java +++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuService.java @@ -334,4 +334,64 @@ public class GoodsSkuService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } + public ResultBean> getGoodsList(GoodsSkuSelectQuery query) { + ResultBean rb = ResultBean.fireFail(); +// GoodsSkuPurSelectQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.like("a.createOrgSid", query.getCreateOrgSid()); + if (StringUtils.isNotBlank(query.getGoodsCode())) { + qw.like("a.goodsCode", query.getGoodsCode()); + } + if (StringUtils.isNotBlank(query.getGoodsName())) { + qw.like("a.goodsName", query.getGoodsName()); + } + if (StringUtils.isNotBlank(query.getBarCode())) { + qw.like("a.barCode", query.getBarCode()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { + qw.like("s.goodsSkuCode", query.getGoodsSkuCode()); + } + if (StringUtils.isNotBlank(query.getTitle())) { + qw.like("s.title", query.getTitle()); + } + if (StringUtils.isNotBlank(query.getOwnSpec())) { + qw.like("s.ownSpec", query.getOwnSpec()); + } + if (StringUtils.isNotBlank(query.getBrandName())) { + qw.like("b.brandName", query.getBrandName()); + } + if (StringUtils.isNotBlank(query.getBrandSid())) { + qw.eq("b.sid", query.getBrandSid()); + } + if (StringUtils.isNotBlank(query.getManufacturerName())) { + qw.like("c.manufacturerName", query.getManufacturerName()); + } + if (StringUtils.isNotBlank(query.getManufacturerSid())) { + qw.like("c.sid", query.getManufacturerSid()); + } + if (StringUtils.isNotBlank(query.getTypeName())) { + qw.like("d.goodsTypeName", query.getTypeName()); + } + if (StringUtils.isNotBlank(query.getTypeSid())) { + qw.like("d.sid", query.getTypeSid()); + } + if (StringUtils.isNotBlank(query.getManufacturerCode())) { + qw.like("a.factoryCode", query.getManufacturerCode()); + } + qw.eq("a.isEnable","1"); + + List pagging = baseMapper.getGoodsList(qw); + return rb.success().setData(pagging); + } + public ResultBean getGoodsBySkuSid(String skuSid) { + ResultBean rb = ResultBean.fireFail(); +// GoodsSkuPurSelectQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + + qw.eq("a.isEnable","1"); + + List pagging = baseMapper.getGoodsList(qw); + return rb.success().setData(pagging); + } + }