添加询价单

purchase-service/purchase-service-api/src/main/java/com/ssy/lingxi/purchase/api/dto/request/purchase/PurchaseInquiryProductRequest.java

@@ -87,7 +87,6 @@ public class PurchaseInquiryProductRequest {
     /**
      *货号
      */
-    @NotEmpty(message = "货号不能为空")
     private String itemNo;
 
     /**

purchase-service/purchase-service-api/src/main/java/com/ssy/lingxi/purchase/api/enums/purchase/PurchaseInquiryMaterielModeEnum.java

+package com.ssy.lingxi.purchase.api.enums.purchase;
+/**
+ *  采购询价-物料添加模式
+ * @author ds
+ * @date 2021/7/5
+ * @version 2.0.0
+ */
+public enum PurchaseInquiryMaterielModeEnum {
+
+
+    SELECT_GOODS(1, "选择货品生成"),
+    IMPORT_EXCEL(2, "导入货品生成"),
+    PLATFORM_ATTRIBUTE(3, "通过平台属性生成"),
+    ;
+
+
+    private Integer type;
+    private String name;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    PurchaseInquiryMaterielModeEnum(){
+
+    }
+    PurchaseInquiryMaterielModeEnum(Integer type, String name) {
+        this.type = type;
+        this.name = name;
+    }
+}

purchase-service/settings.gradle

@@ -5,6 +5,9 @@ project(':common').projectDir = "../common" as File
 include 'component-service:redis'
 project(':component-service:redis').projectDir = "../component-service/redis" as File
 
+include 'component-service:rabbitMQ'
+project(':component-service:rabbitMQ').projectDir = "../component-service/rabbitMQ" as File
+
 include 'purchase-service:purchase-service-api'
 project(':purchase-service:purchase-service-api').projectDir = "$rootDir/purchase-service-api" as File
 
@@ -27,23 +30,23 @@ project(':settle-accounts-service:settle-accounts-service-api').projectDir = "..
 
 
 include 'product-service:product-service-api'
-project(':product-service:product-service-api').projectDir = "../product-service:product-service-api" as File
+project(':product-service:product-service-api').projectDir = "../product-service/product-service-api" as File
 
 
 include 'report-service:report-service-api'
-project(':report-service:report-service-api').projectDir = "../report-service:report-service-api" as File
+project(':report-service:report-service-api').projectDir = "../report-service/report-service-api" as File
 
 include 'message-service:message-service-api'
-project(':message-service:message-service-api').projectDir = "../message-service:message-service-api" as File
+project(':message-service:message-service-api').projectDir = "../message-service/message-service-api" as File
 
 include 'file-service:file-api'
-project(':file-service:file-api').projectDir = "../file-service:file-api" as File
+project(':file-service:file-api').projectDir = "../file-service/file-api" as File
 
 
 include 'contract-service:contract-service-api'
-project(':contract-service:contract-service-api').projectDir = "../contract-service:contract-service-api" as File
+project(':contract-service:contract-service-api').projectDir = "../contract-service/contract-service-api" as File
 
 
 include 'message-service:message-service-api'
-project(':message-service:message-service-api').projectDir = "../message-service:message-service-api" as File
+project(':message-service:message-service-api').projectDir = "../message-service/message-service-api" as File
 

purchase-service/src/main/java/com/ssy/lingxi/purchase/serviceimpl/PurchaseInquiryServiceImpl.java

@@ -7,6 +7,7 @@ import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import com.ssy.lingxi.common.constant.CommonConstant;
 import com.ssy.lingxi.common.constant.ShopTypeEnum;
+import com.ssy.lingxi.common.exception.BusinessException;
 import com.ssy.lingxi.common.model.dto.UserLoginCacheDTO;
 import com.ssy.lingxi.common.request.ImportBatchListRequest;
 import com.ssy.lingxi.common.response.PageData;
@@ -19,7 +20,6 @@ import com.ssy.lingxi.feign.UploadControllerFeign;
 import com.ssy.lingxi.member.merchant.api.feign.inner.MemberInnerControllerFeign;
 import com.ssy.lingxi.member.merchant.api.feign.inner.MemberLevelRightCreditControllerFeign;
 import com.ssy.lingxi.member.merchant.api.model.vo.inner.request.MemberFeignBatchByIdVO;
-import com.ssy.lingxi.member.merchant.api.model.vo.inner.request.MemberFeignVO;
 import com.ssy.lingxi.member.merchant.api.model.vo.inner.response.MemberFeignBatchByIdQueryVO;
 import com.ssy.lingxi.member.merchant.api.model.vo.inner.response.MemberFeignLrcVO;
 import com.ssy.lingxi.message.api.constant.MessageTemplateCode;
@@ -35,11 +35,7 @@ import com.ssy.lingxi.purchase.api.dto.response.BiddingExternalWorkStateEnumResp
 import com.ssy.lingxi.purchase.api.dto.response.CountryAreaResponse;
 import com.ssy.lingxi.purchase.api.dto.response.bidding.PurchaseMakeListRequest;
 import com.ssy.lingxi.purchase.api.dto.response.purchase.*;
-import com.ssy.lingxi.purchase.api.enums.bidding.BiddingExternalWorkStateEnum;
-import com.ssy.lingxi.purchase.api.enums.purchase.ButtonEnum;
-import com.ssy.lingxi.purchase.api.enums.purchase.PurchaseInquiryListEnum;
-import com.ssy.lingxi.purchase.api.enums.purchase.PurchaseInquiryListExternalWorkStateEnum;
-import com.ssy.lingxi.purchase.api.enums.purchase.PurchaseInquiryListInteriorWorkStateEnum;
+import com.ssy.lingxi.purchase.api.enums.purchase.*;
 import com.ssy.lingxi.purchase.config.rabbitmq.OrderRbbitMqRequest;
 import com.ssy.lingxi.purchase.config.rabbitmq.provider.RabbitMQProvider;
 import com.ssy.lingxi.purchase.entity.CountryArea;
@@ -57,8 +53,6 @@ import com.ssy.lingxi.search.api.feign.commodity.IOrderFeign;
 import com.ssy.lingxi.search.api.model.request.commodity.AttributeRequest;
 import com.ssy.lingxi.search.api.model.request.commodity.OrderRequest;
 import com.ssy.lingxi.workflow.api.model.contant.ProcessEnum;
-import com.ssy.lingxi.workflow.api.model.vo.ProcessStartVO;
-import com.ssy.lingxi.workflow.api.model.vo.TaskResultVO;
 import com.ssy.lingxi.workflow.api.model.vo.request.TaskStartVO;
 import com.ssy.lingxi.workflow.api.model.vo.response.SimpleTaskCompleteVO;
 import lombok.extern.slf4j.Slf4j;
@@ -262,6 +256,14 @@ public class PurchaseInquiryServiceImpl extends BasePurchaseInquiry implements P
         if (request.getOfferEndTime() > request.getDeliveryTime()) {
             return Wrapper.fail(ResponseCode.OFFER_END_NOT_LOE_CURRENT_TIME);
         }
+        //选择货品生成
+        if(PurchaseInquiryMaterielModeEnum.SELECT_GOODS.getType().equals(request.getMaterielMode())){
+            request.getMateriels().forEach(o ->{
+                if(!StringUtils.hasLength(o.getItemNo())){
+                    throw new BusinessException(ResponseCode.BUSINESS_ERROR, "货号不能为空");
+                }
+            });
+        }
         PurchaseInquiry purchaseInquiry = initPurchaseInquiry(request, sysUser);
         purchaseInquiryRepository.saveAndFlush(purchaseInquiry);
         if (!CollectionUtils.isEmpty(purchaseInquiry.getAreas())) {