From 6e90bc8941daedc8d3edadb78b17ad770235cd57 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 26 Jul 2024 16:29:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aggregation/BaseGoodsSkuRest.java | 33 +++++++++++ .../aggregation/PurchaseFlowNodeRest.java | 12 ++-- .../basegoodssku/BaseGoodsSkuService.java | 24 ++++++++ .../biz/func/basegoodssku/BaseGoodsSkuVo.java | 38 ++++++++++++ .../BaseGoodsSkuExtendVo.java | 53 +++++++++++++++++ .../biz/func/basegoodsskuextend/UrlsVo.java | 12 ++++ .../purchasebill/GoodsSkuPurSelectList.java | 2 + .../purchasebill/PurchaseBillDetailsVo.java | 5 +- .../biz/func/purchasebill/PurchaseBillVo.java | 4 +- .../PurchaseBillDetailDetailsVo.java | 58 ++++++++++--------- .../PurchaseFlowNodeService.java | 7 ++- .../basegoodssku/BaseGoodsSkuDetailsVo.java | 50 ++++++++++++++++ .../goods/basegoodssku/BaseGoodsSkuFeign.java | 28 +++++++++ .../PurchaseFlowNodeFeign.java | 10 +--- 14 files changed, 288 insertions(+), 48 deletions(-) create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsSkuRest.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/UrlsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuDetailsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeign.java diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsSkuRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsSkuRest.java new file mode 100644 index 0000000..64d76e8 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/BaseGoodsSkuRest.java @@ -0,0 +1,33 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuService; +import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuVo; +import com.yxt.oms.utils.OrgPathQuery; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/4/12 11:20 + */ +@RestController() +@RequestMapping("/apiadmin/basegoodssku") +public class BaseGoodsSkuRest { + + + @Autowired + BaseGoodsSkuService baseGoodsSkuService; + + @ApiOperation("查询组织下所有商品") + @PostMapping("/listAllByOrg") + public ResultBean> listAllByOrg(@RequestBody OrgPathQuery query) { + return baseGoodsSkuService.listAllByOrg(query); + } +} diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseFlowNodeRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseFlowNodeRest.java index 3008d97..17296a9 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseFlowNodeRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseFlowNodeRest.java @@ -34,10 +34,9 @@ import com.yxt.oms.biz.func.purchaseflownode.PurchaseFlowNodeVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * Project: ss-purchase(采购单)
@@ -60,9 +59,8 @@ public class PurchaseFlowNodeRest { @Autowired private PurchaseFlowNodeService purchaseFlowNodeService; - @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - return purchaseFlowNodeService.listPageVo(pq); + public ResultBean> listPage(@RequestParam("sid") String sid){ + return purchaseFlowNodeService.listPageVo(sid); } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuService.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuService.java new file mode 100644 index 0000000..f2a7e67 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuService.java @@ -0,0 +1,24 @@ +package com.yxt.oms.biz.func.basegoodssku; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.oms.feign.goods.basegoodssku.BaseGoodsSkuFeign; +import com.yxt.oms.utils.OrgPathQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class BaseGoodsSkuService{ + + @Autowired + BaseGoodsSkuFeign baseGoodsSkuFeign; + + public ResultBean> listAllByOrg(OrgPathQuery query) { + return baseGoodsSkuFeign.listAllByOrg(query); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuVo.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuVo.java new file mode 100644 index 0000000..7fb2c59 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodssku/BaseGoodsSkuVo.java @@ -0,0 +1,38 @@ +package com.yxt.oms.biz.func.basegoodssku; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import com.yxt.oms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendVo; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class BaseGoodsSkuVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String goodsSkuCode;//商品Sku代码 + private String title;//商品标题 + private String goodsSpuSid;//商品基础信息Sid + private String externalCode;//外部编码 + private String indexes;//特有规格属性在spu表中special_spec字段对应每个参数值数组下标的组合，如0_0_0,1_0_0，相当于SKU这条记录的编码。 + @TableField(value = "own_spec") + private String ownSpec;//sku的特有规格参数键值对，json格式，反序列化时请使用linkedHashMap，保证有序 + private String goodsName; + private BaseGoodsSkuExtendVo baseGoodsSkuExtend; + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendVo.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendVo.java new file mode 100644 index 0000000..619b73a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendVo.java @@ -0,0 +1,53 @@ +package com.yxt.oms.biz.func.basegoodsskuextend; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class BaseGoodsSkuExtendVo implements Vo { + private String id; + private String sid; + private String lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + private String remarks; + private String isEnable; + private String state; + private String isDelete; + private String goodsSkuSid;//商品Skusid + private String finalPurchasePrice;//最后采购价 + private String safetyStockDays;//安全库存天数 + private String isOriginalFactory;//是否原厂 + private String isInventoryAlert;//是否库存警戒 + @TableField(value = "InventoryAlertUpperLimit") + private String inventoryAlertUpperLimit;//库存警戒上线 + @TableField(value = "InventoryAlertLowerLimit") + 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 sortNo;//排序 + private String picUrl;//商品的图片，多个图片以‘,’分割 +// private String [] Urls={};//图片数组 + private List urls;//图片数组 + private String title;//sku标题 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/UrlsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/UrlsVo.java new file mode 100644 index 0000000..2e54aa0 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/basegoodsskuextend/UrlsVo.java @@ -0,0 +1,12 @@ +package com.yxt.oms.biz.func.basegoodsskuextend; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/3/22 10:20 + */ +@Data +public class UrlsVo { + private String url; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java index 8c1bc5b..9d2faa5 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java @@ -36,4 +36,6 @@ public class GoodsSkuPurSelectList { private BigDecimal cost; //单价1 private BigDecimal cost1; + //货号 + private String itemNumber; } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java index 16bdd91..7a0e4e6 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java @@ -46,6 +46,9 @@ public class PurchaseBillDetailsVo implements Vo { private String sid; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("创建时间") + private Date createTime; @ApiModelProperty("备注") private String remarks; @ApiModelProperty("制单人sid") @@ -101,8 +104,6 @@ public class PurchaseBillDetailsVo implements Vo { private PurchaseBillExtendDetailsVo purchaseBillExtend; @ApiModelProperty("采购单商品明细") private List purchaseBillDetailList; - @ApiModelProperty("采购商品扩展") - private List purchaseBillBatchList; @ApiModelProperty("附件") private List purchaseAppendixList; } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillVo.java index 0771f75..5ce3a65 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillVo.java @@ -52,7 +52,7 @@ public class PurchaseBillVo implements Vo { @ApiModelProperty("仓库名称") private String wareHouseName; @ApiModelProperty("收货状态value") - private Integer receiveStateValue; + private String receiveStateValue; @ApiModelProperty("商品总额") private String amountTotal; @ApiModelProperty("采购运费") @@ -78,7 +78,7 @@ public class PurchaseBillVo implements Vo { @ApiModelProperty("已发货数量") private BigDecimal deliveryCount; @ApiModelProperty("发货状态value") - private Integer deliveryStateValue; + private String deliveryStateValue; @ApiModelProperty("备注") private String remarks; @ApiModelProperty("制单人姓名") diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java index b748f75..369f08c 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java @@ -60,53 +60,55 @@ public class PurchaseBillDetailDetailsVo implements Vo { private String goodsNum; // 货号 @ApiModelProperty("规格型号") private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("商品图片") + private String goodsImgUrl; @ApiModelProperty("计量单位") private String unit; // 计量单位 @ApiModelProperty("单价") private BigDecimal cost; // 单价 @ApiModelProperty("数量") private BigDecimal count; - @ApiModelProperty("数量1") + @ApiModelProperty("单价") + private BigDecimal cost1; // 单价 + @ApiModelProperty("数量") private BigDecimal count1; - @ApiModelProperty("已入库数量") - private BigDecimal inCount; - @ApiModelProperty("已发货数量") - private BigDecimal outCount; - @ApiModelProperty("已入库数量1") - private BigDecimal inCount1; - @ApiModelProperty("待入库数量") - private BigDecimal notInCount; - @ApiModelProperty("待入库数量1") - private BigDecimal notInCount1; + @ApiModelProperty("数量(pcs)") + private BigDecimal pcsCount; + @ApiModelProperty("吊牌价") + private BigDecimal tagPrice; @ApiModelProperty("折扣率") private BigDecimal discountRate; // 折扣率 @ApiModelProperty("折后单价") private BigDecimal discountPrice; // 折后单价 @ApiModelProperty("分摊金额") private BigDecimal shareAmount; // 分摊金额 - @ApiModelProperty("总价") - private BigDecimal costTotal; @ApiModelProperty("分配比例") - private BigDecimal shareRate; // 分配比例 + private BigDecimal shareRate; @ApiModelProperty("采购金额") - private BigDecimal amount; // 采购金额 - @ApiModelProperty("采购周期") - private Integer cycle; // 采购周期 - @ApiModelProperty("预期到货日期") - private String deliveryDate; - - @ApiModelProperty("总税额") - private BigDecimal taxAmount; - @ApiModelProperty("商品图片") - private String goodsImgUrl; - @ApiModelProperty("数量(pcs)") - private BigDecimal pcsCount; - @ApiModelProperty("吊牌价") - private BigDecimal tagPrice; + private BigDecimal amount; @ApiModelProperty("税率") private BigDecimal taxRate; @ApiModelProperty("未含税价") private BigDecimal unTaxPrice; @ApiModelProperty("未含税总价（未含税价*采购数量）") private BigDecimal unTaxTotalAmount; + @ApiModelProperty("采购周期") + private Integer cycle; + @ApiModelProperty("预期到货日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date deliveryDate; + @ApiModelProperty("总税额") + private BigDecimal taxAmount; + + /* + * 商品扩展字段 + * */ + @ApiModelProperty("批次号") + private String batchNumber; // 批次号 + @ApiModelProperty("生产日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date madeDate; // 生产日期 + @ApiModelProperty("过期日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date expireDate; // 过期日期 } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeService.java index 403e40a..17bc221 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeService.java @@ -28,6 +28,7 @@ package com.yxt.oms.biz.func.purchaseflownode; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.api.R; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -37,6 +38,8 @@ import com.yxt.oms.feign.purchase.purchaseflownode.PurchaseFlowNodeFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * Project: ss-purchase(采购单)
* File: PurchaseFlowNodeService.java
@@ -56,7 +59,7 @@ public class PurchaseFlowNodeService{ @Autowired private PurchaseFlowNodeFeign purchaseFlowNodeFeign; - public ResultBean> listPageVo(PagerQuery pq) { - return purchaseFlowNodeFeign.listPage(pq); + public ResultBean> listPageVo(String sid) { + return purchaseFlowNodeFeign.listPage(sid); } } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuDetailsVo.java b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuDetailsVo.java new file mode 100644 index 0000000..cec0809 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuDetailsVo.java @@ -0,0 +1,50 @@ +package com.yxt.oms.feign.goods.basegoodssku; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/20 + **/ +@Data +public class BaseGoodsSkuDetailsVo { + + @ApiModelProperty("商品代码") + private String goodsCode; + @ApiModelProperty("条形码") + private String barCode; + @ApiModelProperty("商品名称") + private String goodsName; + @ApiModelProperty("副标题") + private String subTitle; + @ApiModelProperty("拼音缩写") + private String goodsPY; + @ApiModelProperty("商品简称") + private String goodsShortName; + @ApiModelProperty("商品分类sid") + private String goodsTypeSid; + @ApiModelProperty("品牌sid") + private String brandSid; + @ApiModelProperty("厂家sid") + private String manufacturersid; + @ApiModelProperty("商品单位sid") + private String goodsUnitSid; + @ApiModelProperty("商品spuSid") + private String goodsSpuSid; + @ApiModelProperty("商品单位名称") + private String goodsUnitName; + + @ApiModelProperty("商品Sku代码") + private String goodsSkuCode; + @ApiModelProperty("商品标题") + private String title; + + @ApiModelProperty("是否一品一码（goodID），0否，1是") + @JsonProperty("isGoodsID") + private int isGoodsID; + @ApiModelProperty("商品类别名称") + private String goodsTypeName; +} diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeign.java b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeign.java new file mode 100644 index 0000000..408b31b --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodssku/BaseGoodsSkuFeign.java @@ -0,0 +1,28 @@ +package com.yxt.oms.feign.goods.basegoodssku; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.oms.biz.func.basegoodssku.BaseGoodsSkuVo; +import com.yxt.oms.utils.OrgPathQuery; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/20 + **/ +@FeignClient( + contextId = "yss-common-goods-GoodsSku", + name = "ss-common-goods", + path = "/apiadmin/base/basegoodssku") +public interface BaseGoodsSkuFeign { + + @ApiOperation("查询组织下所有商品") + @PostMapping("/listAllByOrg") + public ResultBean> listAllByOrg(@RequestBody OrgPathQuery query); + +} diff --git a/oms/src/main/java/com/yxt/oms/feign/purchase/purchaseflownode/PurchaseFlowNodeFeign.java b/oms/src/main/java/com/yxt/oms/feign/purchase/purchaseflownode/PurchaseFlowNodeFeign.java index 0c271df..f5b27d7 100644 --- a/oms/src/main/java/com/yxt/oms/feign/purchase/purchaseflownode/PurchaseFlowNodeFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/purchase/purchaseflownode/PurchaseFlowNodeFeign.java @@ -1,22 +1,18 @@ package com.yxt.oms.feign.purchase.purchaseflownode; -import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import com.yxt.oms.biz.func.purchasebill.*; -import com.yxt.oms.biz.func.purchaseflownode.PurchaseFlowNodeQuery; import com.yxt.oms.biz.func.purchaseflownode.PurchaseFlowNodeVo; -import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import java.util.List; + @FeignClient( contextId = "ss-common-purchase-PurchaseFlowNode", name = "ss-common-purchase", path = "/apiadmin/purchaseflownode") public interface PurchaseFlowNodeFeign { - @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq); + public ResultBean> listPage(@RequestParam("sid") String sid); } \ No newline at end of file