发起询价时,若物料未上传则先执行上传

applications/document/document-dto/src/main/java/com.usoftchina.saas.document.dto/ProductDTO.java

@@ -41,4 +41,5 @@ public class ProductDTO implements Serializable {
 
     private Double po_avprice;
     private String pr_remark;
+    private String b2bStatus;
 }

applications/document/document-server/src/main/resources/mapper/ProductMapper.xml

@@ -56,6 +56,7 @@
         <result column="pr_status" property="pr_status" jdbcType="VARCHAR"/>
         <result column="pr_statuscode" property="pr_statuscode" jdbcType="VARCHAR"/>
         <result column="pr_remark" property="pr_remark" jdbcType="VARCHAR"/>
+        <result column="b2bStatus" property="b2bStatus" jdbcType="VARCHAR"/>
     </resultMap>
 
 

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -56,6 +56,7 @@ import com.usoftchina.saas.transfers.dto.MessageInfo;
 import com.usoftchina.saas.utils.BeanMapper;
 import com.usoftchina.saas.utils.CollectionUtils;
 import com.usoftchina.saas.utils.JsonUtils;
+import com.usoftchina.saas.utils.ObjectUtils;
 import feign.Response;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -957,6 +958,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         enterprise.setEnName(companyRspDTO.getName());
         enterprise.setEnTel(companyRspDTO.getTel());
         enterprise.setUu(companyRspDTO.getUu());
+        StringBuilder ids = new StringBuilder();
         for (InquiryAddDTO inquiryAddDTO : inquiryAddDTOList){
             PurcInquiry purcInquiry = new PurcInquiry();
             //询价主表信息
@@ -987,6 +989,10 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
             product.setSpec(inquiryAddDTO.getProdSpec());
             product.setLeadtime(new BigDecimal(inquiryAddDTO.getLeadTime()).doubleValue());
             product.setCode(inquiryAddDTO.getProdCode());
+            ProductDTO productDTO = productApi.getByProdCode(inquiryAddDTO.getProdCode()).getData();
+            if (!ObjectUtils.isEmpty(productDTO) && !"已上传".equals(productDTO.getB2bStatus())) {
+                ids.append(productDTO.getId() + ",");
+            }
             product.setUnit(inquiryAddDTO.getProdUnit());
             purcInquiryItem.setProduct(product);
 
@@ -996,6 +1002,9 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
             purcInquiry.setInquiryItems(purcInquiryItemSet);
             purcInquiryList.add(purcInquiry);
         }
+        String prodIds = ids.substring(0, ids.length() - 1);
+        productApi.updateStatus(prodIds, "待上传");
+        productApi.uploadToB2B();
         //开启线程调用商城ap,保存询价
         int length = purcInquiryList.size();
         CountDownLatch latch = new CountDownLatch(length);