取供应商UU修改

applications/document/document-api/src/main/java/com/usoftchina/saas/document/api/VendorApi.java

@@ -3,9 +3,11 @@ package com.usoftchina.saas.document.api;
 import com.usoftchina.saas.auth.client.interceptor.ServiceFeignInterceptor;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.document.dto.VendorDTO;
+import com.usoftchina.saas.document.dto.VendorListDTO;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -14,10 +16,10 @@ import java.util.List;
 public interface VendorApi {
 
     /**
-     * 查询Vendors
-     * @param condition
+     * 通过供应商ID查找  供应商主从表数据
+     * @param id
      * @return
      */
-    /*@GetMapping("/api/document/vendor/getVendorsByCondition")
-    public List<VendorDTO> getVendorsByCondition(@RequestParam(value = "page") PageRequest page, @RequestParam(value = "condition") String condition);*/
+    @GetMapping("/read/{id}")
+    Result<VendorListDTO> getDataById(@PathVariable("id") Long id);
 }

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/task/SendPurchaseTask.java

@@ -4,6 +4,8 @@ import com.usoftchina.saas.account.api.AccountApi;
 import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.account.dto.AccountDTO;
 import com.usoftchina.saas.account.dto.CompanyDTO;
+import com.usoftchina.saas.document.api.VendorApi;
+import com.usoftchina.saas.document.dto.VendorListDTO;
 import com.usoftchina.saas.inquiry.po.purchase.Purchase;
 import com.usoftchina.saas.inquiry.po.purchase.PurchaseDetail;
 import com.usoftchina.saas.purchase.api.PurchaseApi;
@@ -16,6 +18,7 @@ import com.usoftchina.saas.transfers.utils.SendUtil;
 import com.usoftchina.saas.utils.BeanMapper;
 import com.usoftchina.saas.utils.JsonUtils;
 import com.usoftchina.saas.utils.ObjectUtils;
+import com.usoftchina.saas.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +39,8 @@ public class SendPurchaseTask extends Executable {
     @Autowired
     private PurchaseApi purchaseApi;
     @Autowired
+    private VendorApi vendorApi;
+    @Autowired
     private B2BConfig b2bConfig;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SendProductTask.class);
@@ -73,8 +78,13 @@ public class SendPurchaseTask extends Executable {
         b2bPurchase.setEm_mobile(accountDTO.getMobile());
         b2bPurchase.setEm_name(accountDTO.getRealname());
         b2bPurchase.setEm_uu(accountDTO.getUu());
-
-        b2bPurchase.setVe_uu(ObjectUtils.getLongValue(purchaseDTO.getPu_venduu()));
+        VendorListDTO vendorListDTO = vendorApi.getDataById(new BigDecimal(purchaseDTO.getPu_vendid()).longValue()).getData();
+        if (!ObjectUtils.isEmpty(vendorListDTO)){
+            String uu = vendorListDTO.getMain().getVe_uu();
+            if (!StringUtils.isEmpty(uu)){
+                b2bPurchase.setVe_uu(Long.parseLong(uu));
+            }
+        }
         b2bPurchase.setPu_rate(new BigDecimal(purchaseDTO.getPu_rate()).floatValue());
         b2bPurchase.setPu_remark(purchaseDTO.getPu_remark());
         b2bPurchase.setPu_auditman(purchaseDTO.getPu_auditman());