商品下拉列表接口优化

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/UpdateOrderParam.java

@@ -29,7 +29,7 @@ public class UpdateOrderParam {
      * 操作类型0保存、1提交
      */
     @NotNull(message = "操作类型不能为空")
-    @Range(min = 1, max = 2, message = "非法订单类型")
+    @Range(min = 0, max = 1, message = "非法操作类型")
     private Integer operateType;
 
     /**

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/GoodsDropListReq.java

@@ -3,6 +3,7 @@ package com.sckw.product.model.vo.req;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.hibernate.validator.constraints.Range;
 
 /**
  * @desc: 商品下拉列表请求参数
@@ -13,8 +14,21 @@ import lombok.ToString;
 @Setter
 @ToString
 public class GoodsDropListReq {
+
+    /**
+     * 订单类型（1采购订单2销售订单）
+     */
+    @Range(min = 1, max = 2, message = "非法订单类型")
+    private Integer orderType;
+
     /**
      * 商品名称
      */
     private String name;
+
+    /**
+     * 供应单位
+     */
+    private Long supplyEntId;
+
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -725,6 +725,12 @@ public class KwpGoodsService {
      */
     public List<GoodsDropList> dropList(GoodsDropListReq params) {
         LambdaQueryWrapper<KwpGoods> wrapper = new LambdaQueryWrapper<>();
+        if (Objects.equals(params.getOrderType(), 2)) {
+            if (Objects.isNull(params.getSupplyEntId())) {
+                throw new BusinessException("供应单位不能为空！");
+            }
+            wrapper.eq(KwpGoods::getSupplyEntId, params.getSupplyEntId());
+        }
         wrapper.like(StringUtils.isNotBlank(params.getName()), KwpGoods::getName, params.getName())
                 .eq(KwpGoods::getStatus, GoodsStatusEnum.PUT_ON_SHELVES.getCode())
                 .eq(KwpGoods::getDelFlag, Global.NO).orderByDesc(KwpGoods::getAddedTime);