客户采购单,对账单下载接口调整

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/BillCodeSeq.java

@@ -58,7 +58,11 @@ public enum  BillCodeSeq {
 
     CUSTOMERFEDBACK ("客户反馈", "CUSTOMERFEDBACK"),
 
-    BOM("BOM资料", "Bom");
+    SALEDOWN ("客户订单", "SALEDOWN"),
+
+    BOM("BOM资料", "Bom"),
+
+    APCHECK("对账单", "APCHECK");
 
 
 

applications/money/money-dto/src/main/java/com/usoftchina/saas/money/dto/ApcheckFormDTO.java

@@ -12,23 +12,23 @@ import java.util.List;
  **/
 public class ApcheckFormDTO implements Serializable {
 
-    private Apcheck main;
+    private ApcheckDTO main;
 
-    private List<ApcheckDetail> items;
+    private List<ApcheckDetailDTO> items;
 
-    public Apcheck getMain() {
+    public ApcheckDTO getMain() {
         return main;
     }
 
-    public void setMain(Apcheck main) {
+    public void setMain(ApcheckDTO main) {
         this.main = main;
     }
 
-    public List<ApcheckDetail> getItems() {
+    public List<ApcheckDetailDTO> getItems() {
         return items;
     }
 
-    public void setItems(List<ApcheckDetail> items) {
+    public void setItems(List<ApcheckDetailDTO> items) {
         this.items = items;
     }
 }

applications/money/money-dto/src/main/java/com/usoftchina/saas/money/po/Apcheck.java

@@ -22,9 +22,9 @@ public class Apcheck extends CommonBaseEntity{
 
     private Date ac_todate;
 
-    private String ac_venduu;
+    private Long ac_venduu;
 
-    private Integer ac_vendid;
+    private Long ac_vendid;
 
     private String ac_vendcode;
 
@@ -108,19 +108,19 @@ public class Apcheck extends CommonBaseEntity{
         this.ac_todate = ac_todate;
     }
 
-    public String getAc_venduu() {
+    public Long getAc_venduu() {
         return ac_venduu;
     }
 
-    public void setAc_venduu(String ac_venduu) {
-        this.ac_venduu = ac_venduu == null ? null : ac_venduu.trim();
+    public void setAc_venduu(Long ac_venduu) {
+        this.ac_venduu = ac_venduu;
     }
 
-    public Integer getAc_vendid() {
+    public Long getAc_vendid() {
         return ac_vendid;
     }
 
-    public void setAc_vendid(Integer ac_vendid) {
+    public void setAc_vendid(Long ac_vendid) {
         this.ac_vendid = ac_vendid;
     }
 

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/SaleDownDTO.java

@@ -2,99 +2,37 @@ package com.usoftchina.saas.sale.dto;
 
 import com.usoftchina.saas.base.dto.CommonBaseDTO;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * @author: guq
  * @create: 2019-01-11 15:28
  **/
-public class SaleDownDTO extends CommonBaseDTO {
+public class SaleDownDTO implements Serializable{
 
-    private String sa_code;
+    private Long sa_customeruu;//客户UU
 
-    private String sa_customeruu;
+    private String sa_toplace;//收货地址
 
-    private Integer sa_custid;
+    private String sa_currency;//币别
 
-    private String sa_custcode;
+    private Double sa_rate;//汇率
 
-    private String sa_custname;
+    private Long sa_selleruu;//业务员UU
 
-    private Date sa_date;
+    private String sa_custcontact; //客户联系人
 
-    private String sa_toplace;
+    private Long sa_custcontactuu;//客户联系人UU
 
-    private String sa_currency;
+    private String sa_custmobile;//客户手机
 
-    private Double sa_rate;
+    private String sa_pocode;//PO号
 
-    private Integer sa_selleruu;
+    private Integer b2b_pu_id;//B2BID
 
-    private Integer sa_sellerid;
+    private String sa_remark;//备注
 
-    private String sa_seller;
-
-    private String sa_sellercode;
-
-    private String sa_custcontact;
-
-    private Integer sa_custcontactuu;
-
-    private String sa_custmobile;
-
-    private String sa_pocode;
-
-    private Integer b2b_pu_id;
-
-    private String sa_remark;
-
-    public String getSa_code() {
-        return sa_code;
-    }
-
-    public void setSa_code(String sa_code) {
-        this.sa_code = sa_code;
-    }
-
-    public String getSa_customeruu() {
-        return sa_customeruu;
-    }
-
-    public void setSa_customeruu(String sa_customeruu) {
-        this.sa_customeruu = sa_customeruu;
-    }
-
-    public Integer getSa_custid() {
-        return sa_custid;
-    }
-
-    public void setSa_custid(Integer sa_custid) {
-        this.sa_custid = sa_custid;
-    }
-
-    public String getSa_custcode() {
-        return sa_custcode;
-    }
-
-    public void setSa_custcode(String sa_custcode) {
-        this.sa_custcode = sa_custcode;
-    }
-
-    public String getSa_custname() {
-        return sa_custname;
-    }
-
-    public void setSa_custname(String sa_custname) {
-        this.sa_custname = sa_custname;
-    }
-
-    public Date getSa_date() {
-        return sa_date;
-    }
-
-    public void setSa_date(Date sa_date) {
-        this.sa_date = sa_date;
-    }
 
     public String getSa_toplace() {
         return sa_toplace;
@@ -120,36 +58,28 @@ public class SaleDownDTO extends CommonBaseDTO {
         this.sa_rate = sa_rate;
     }
 
-    public Integer getSa_selleruu() {
-        return sa_selleruu;
-    }
-
-    public void setSa_selleruu(Integer sa_selleruu) {
-        this.sa_selleruu = sa_selleruu;
-    }
-
-    public Integer getSa_sellerid() {
-        return sa_sellerid;
+    public Long getSa_customeruu() {
+        return sa_customeruu;
     }
 
-    public void setSa_sellerid(Integer sa_sellerid) {
-        this.sa_sellerid = sa_sellerid;
+    public void setSa_customeruu(Long sa_customeruu) {
+        this.sa_customeruu = sa_customeruu;
     }
 
-    public String getSa_seller() {
-        return sa_seller;
+    public Long getSa_selleruu() {
+        return sa_selleruu;
     }
 
-    public void setSa_seller(String sa_seller) {
-        this.sa_seller = sa_seller;
+    public void setSa_selleruu(Long sa_selleruu) {
+        this.sa_selleruu = sa_selleruu;
     }
 
-    public String getSa_sellercode() {
-        return sa_sellercode;
+    public Long getSa_custcontactuu() {
+        return sa_custcontactuu;
     }
 
-    public void setSa_sellercode(String sa_sellercode) {
-        this.sa_sellercode = sa_sellercode;
+    public void setSa_custcontactuu(Long sa_custcontactuu) {
+        this.sa_custcontactuu = sa_custcontactuu;
     }
 
     public String getSa_custcontact() {
@@ -160,13 +90,7 @@ public class SaleDownDTO extends CommonBaseDTO {
         this.sa_custcontact = sa_custcontact;
     }
 
-    public Integer getSa_custcontactuu() {
-        return sa_custcontactuu;
-    }
 
-    public void setSa_custcontactuu(Integer sa_custcontactuu) {
-        this.sa_custcontactuu = sa_custcontactuu;
-    }
 
     public String getSa_custmobile() {
         return sa_custmobile;

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/SaleDownDetailDTO.java

@@ -2,61 +2,42 @@ package com.usoftchina.saas.sale.dto;
 
 import com.usoftchina.saas.base.dto.CommonBaseDTO;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * @author: guq
  * @create: 2019-01-11 15:39
  **/
-public class SaleDownDetailDTO extends CommonBaseDTO{
+public class SaleDownDetailDTO implements Serializable{
 
-    private String sd_code;
+    private Integer sd_detno;//序号
 
-    private Integer sd_detno;
+    private Integer b2b_pd_id;//B2BID
 
-    private Integer b2b_pd_id;
+    private String sd_custorispeccode;//客户物料型号
 
-    private Integer sd_prodid;
+    private String sd_custprodcode;//客户料号
 
-    private String sd_prodcode;
+    private String sd_custproddetail;//客户产品名称
 
-    private String sd_prodspec;
+    private String sd_custprodspec;//客户产品规格
 
-    private String sd_orispeccode;
+    private Double sd_qty;//数量
 
-    private String sd_custorispeccode;
+    private Double sd_price;//单价(含税)
 
-    private String sd_custprodcode;
+    private Double sd_total;//总额(含税)
 
-    private String sd_custproddetail;
+    private Double sd_taxrate;//税率(%)
 
-    private String sd_custprodspec;
+    private Double sd_costprice;//不含税单价
 
-    private String sd_produnit;
+    private Double sd_taxtotal;//不含税金额
 
-    private Double sd_qty;
+    private Date sd_delivery;//交货日期
 
-    private Double sd_price;
-
-    private Double sd_total;
-
-    private Double sd_taxrate;
-
-    private Double sd_costprice;
-
-    private Double sd_taxtotal;
-
-    private Date sd_delivery;
-
-    private String sd_remark;
-
-    public String getSd_code() {
-        return sd_code;
-    }
-
-    public void setSd_code(String sd_code) {
-        this.sd_code = sd_code;
-    }
+    private String sd_remark;//备注
 
     public Integer getSd_detno() {
         return sd_detno;
@@ -74,38 +55,6 @@ public class SaleDownDetailDTO extends CommonBaseDTO{
         this.b2b_pd_id = b2b_pd_id;
     }
 
-    public Integer getSd_prodid() {
-        return sd_prodid;
-    }
-
-    public void setSd_prodid(Integer sd_prodid) {
-        this.sd_prodid = sd_prodid;
-    }
-
-    public String getSd_prodcode() {
-        return sd_prodcode;
-    }
-
-    public void setSd_prodcode(String sd_prodcode) {
-        this.sd_prodcode = sd_prodcode;
-    }
-
-    public String getSd_prodspec() {
-        return sd_prodspec;
-    }
-
-    public void setSd_prodspec(String sd_prodspec) {
-        this.sd_prodspec = sd_prodspec;
-    }
-
-    public String getSd_orispeccode() {
-        return sd_orispeccode;
-    }
-
-    public void setSd_orispeccode(String sd_orispeccode) {
-        this.sd_orispeccode = sd_orispeccode;
-    }
-
     public String getSd_custorispeccode() {
         return sd_custorispeccode;
     }
@@ -138,14 +87,6 @@ public class SaleDownDetailDTO extends CommonBaseDTO{
         this.sd_custprodspec = sd_custprodspec;
     }
 
-    public String getSd_produnit() {
-        return sd_produnit;
-    }
-
-    public void setSd_produnit(String sd_produnit) {
-        this.sd_produnit = sd_produnit;
-    }
-
     public Double getSd_qty() {
         return sd_qty;
     }

applications/transfers/transfers-auth/src/main/java/com/usoftchina/saas/transfers/auth/interceptor/OpenApiAuthInterceptor.java

@@ -71,7 +71,7 @@ public class OpenApiAuthInterceptor extends HandlerInterceptorAdapter{
                     localSign = companyResult.getData().getAccessKey() == null ? HmacUtils.encode(urlMessage) :
                                 HmacUtils.encode(urlMessage, companyResult.getData().getAccessKey());
 
-                    if (servletPath.indexOf("openapi") > -1) {
+                    if (servletPath.indexOf("b2b") > -1) {
                         check = sign.equals(localSign);
                     }
 

applications/transfers/transfers-server/pom.xml

@@ -89,6 +89,10 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>money-dto</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>commons-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.transfers;
 
+import com.usoftchina.saas.auth.client.EnableAuthClient;
 import com.usoftchina.saas.transfers.auth.EnableOpenApiAuthClient;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
@@ -12,6 +13,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @EnableFeignClients("com.usoftchina.saas")
 @MapperScan("com.usoftchina.saas.transfers.mapper")
 @EnableOpenApiAuthClient
+@EnableAuthClient
 public class TransfersApplication {
     public static void main(String[] args) {
         SpringApplication.run(TransfersApplication.class, args);

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/controller/ApCheckController.java

@@ -1,10 +1,10 @@
 package com.usoftchina.saas.transfers.controller;
 
+import com.usoftchina.saas.auth.client.annotation.IgnoreAuth;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.money.dto.ApcheckFormDTO;
-import com.usoftchina.saas.sale.dto.SaleDownFormDTO;
 import com.usoftchina.saas.transfers.service.ApCheckService;
 import com.usoftchina.saas.utils.JsonUtils;
 import com.usoftchina.saas.utils.StringUtils;
@@ -21,6 +21,7 @@ import java.util.List;
  * @author: guq
  * @create: 2019-01-12 15:03
  **/
+@IgnoreAuth
 @RestController
 @RequestMapping("/b2b/apcheck")
 public class ApCheckController {

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/controller/SaleDownController.java

@@ -1,10 +1,12 @@
 package com.usoftchina.saas.transfers.controller;
 
+import com.usoftchina.saas.auth.client.annotation.IgnoreAuth;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.sale.dto.SaleDownDTO;
 import com.usoftchina.saas.sale.dto.SaleDownFormDTO;
+import com.usoftchina.saas.transfers.auth.annotation.IgnoreOpenApiAuth;
 import com.usoftchina.saas.transfers.service.SaleDownService;
 import com.usoftchina.saas.utils.JsonUtils;
 import com.usoftchina.saas.utils.StringUtils;
@@ -18,8 +20,10 @@ import java.util.List;
  * @author: guq
  * @create: 2019-01-11 16:42
  **/
+@IgnoreAuth
 @RestController
 @RequestMapping("/b2b/saledown")
+@IgnoreOpenApiAuth
 public class SaleDownController {
 
     @Autowired

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/mapper/ApcheckMapper.java

@@ -1,7 +1,9 @@
 package com.usoftchina.saas.transfers.mapper;
 
+import com.usoftchina.saas.document.entities.Vendor;
 import com.usoftchina.saas.money.po.Apcheck;
 import com.usoftchina.saas.money.po.ApcheckDetail;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -12,6 +14,7 @@ public interface ApcheckMapper {
 
     Apcheck selectByPrimaryKey(Integer ac_id);
 
-
     void batchInsert(List<ApcheckDetail> details);
+
+    Vendor getVendorByuu(@Param("uu") Long uu, @Param("companyid") Long companyid);
 }

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/mapper/SaledownMapper.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.transfers.mapper;
 
+import com.usoftchina.saas.document.entities.Customer;
 import com.usoftchina.saas.document.entities.Product;
 import com.usoftchina.saas.transfers.po.SaleDown;
 import com.usoftchina.saas.transfers.po.SaleDownDetail;
@@ -24,5 +25,7 @@ public interface SaledownMapper {
 
     void batchUpdateClose(@Param("data") String data, @Param("companyid") Long companyid);
 
-    void batchUpdateResClose(String data, Long companyId);
+    void batchUpdateResClose(@Param("data") String data, @Param("companyid") Long companyid);
+
+    Customer getCustomer(@Param("uu") Long uu, @Param("companyid") Long companyid);
 }

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/po/SaleDown.java

@@ -12,9 +12,9 @@ public class SaleDown extends CommonBaseEntity{
 
     private String sa_code;
 
-    private String sa_customeruu;
+    private Long sa_customeruu;
 
-    private Integer sa_custid;
+    private Long sa_custid;
 
     private String sa_custcode;
 
@@ -28,9 +28,9 @@ public class SaleDown extends CommonBaseEntity{
 
     private Double sa_rate;
 
-    private Integer sa_selleruu;
+    private Long sa_selleruu;
 
-    private Integer sa_sellerid;
+    private Long sa_sellerid;
 
     private String sa_seller;
 
@@ -38,7 +38,7 @@ public class SaleDown extends CommonBaseEntity{
 
     private String sa_custcontact;
 
-    private Integer sa_custcontactuu;
+    private Long sa_custcontactuu;
 
     private String sa_custmobile;
 
@@ -48,6 +48,14 @@ public class SaleDown extends CommonBaseEntity{
 
     private String sa_printstatus;
 
+    public Long getSa_sellerid() {
+        return sa_sellerid;
+    }
+
+    public void setSa_sellerid(Long sa_sellerid) {
+        this.sa_sellerid = sa_sellerid;
+    }
+
     private String sa_printstatuscode;
 
     private String sa_attach;
@@ -78,7 +86,13 @@ public class SaleDown extends CommonBaseEntity{
         this.sa_turnstatuscode = sa_turnstatuscode;
     }
 
+    public Long getSa_custid() {
+        return sa_custid;
+    }
 
+    public void setSa_custid(Long sa_custid) {
+        this.sa_custid = sa_custid;
+    }
 
     public String getSa_code() {
         return sa_code;
@@ -88,21 +102,6 @@ public class SaleDown extends CommonBaseEntity{
         this.sa_code = sa_code == null ? null : sa_code.trim();
     }
 
-    public String getSa_customeruu() {
-        return sa_customeruu;
-    }
-
-    public void setSa_customeruu(String sa_customeruu) {
-        this.sa_customeruu = sa_customeruu == null ? null : sa_customeruu.trim();
-    }
-
-    public Integer getSa_custid() {
-        return sa_custid;
-    }
-
-    public void setSa_custid(Integer sa_custid) {
-        this.sa_custid = sa_custid;
-    }
 
     public String getSa_custcode() {
         return sa_custcode;
@@ -152,21 +151,6 @@ public class SaleDown extends CommonBaseEntity{
         this.sa_rate = sa_rate;
     }
 
-    public Integer getSa_selleruu() {
-        return sa_selleruu;
-    }
-
-    public void setSa_selleruu(Integer sa_selleruu) {
-        this.sa_selleruu = sa_selleruu;
-    }
-
-    public Integer getSa_sellerid() {
-        return sa_sellerid;
-    }
-
-    public void setSa_sellerid(Integer sa_sellerid) {
-        this.sa_sellerid = sa_sellerid;
-    }
 
     public String getSa_seller() {
         return sa_seller;
@@ -192,11 +176,27 @@ public class SaleDown extends CommonBaseEntity{
         this.sa_custcontact = sa_custcontact == null ? null : sa_custcontact.trim();
     }
 
-    public Integer getSa_custcontactuu() {
+    public Long getSa_customeruu() {
+        return sa_customeruu;
+    }
+
+    public void setSa_customeruu(Long sa_customeruu) {
+        this.sa_customeruu = sa_customeruu;
+    }
+
+    public Long getSa_selleruu() {
+        return sa_selleruu;
+    }
+
+    public void setSa_selleruu(Long sa_selleruu) {
+        this.sa_selleruu = sa_selleruu;
+    }
+
+    public Long getSa_custcontactuu() {
         return sa_custcontactuu;
     }
 
-    public void setSa_custcontactuu(Integer sa_custcontactuu) {
+    public void setSa_custcontactuu(Long sa_custcontactuu) {
         this.sa_custcontactuu = sa_custcontactuu;
     }
 

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/service/impl/ApCheckServiceImpl.java

@@ -1,5 +1,8 @@
 package com.usoftchina.saas.transfers.service.impl;
 
+import com.usoftchina.saas.commons.api.MaxnumberService;
+import com.usoftchina.saas.commons.po.BillCodeSeq;
+import com.usoftchina.saas.document.entities.Vendor;
 import com.usoftchina.saas.money.dto.ApcheckFormDTO;
 import com.usoftchina.saas.money.po.Apcheck;
 import com.usoftchina.saas.money.po.ApcheckDetail;
@@ -11,7 +14,6 @@ import com.usoftchina.saas.utils.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -25,6 +27,9 @@ public class ApCheckServiceImpl implements ApCheckService{
     @Autowired
     private ApcheckMapper apcheckMapper;
 
+    @Autowired
+    private MaxnumberService maxnumberService;
+
     @Override
     public String save(List<ApcheckFormDTO> forms) {
         if (CollectionUtils.isEmpty(forms) || forms.size() == 0) {
@@ -34,12 +39,23 @@ public class ApCheckServiceImpl implements ApCheckService{
         Long companyId = TransfersContextHodler.getB2bCompanyId();
         String custspeccode = null;
         for (ApcheckFormDTO form : forms) {
-            Apcheck main = form.getMain();
-            List<ApcheckDetail> details = form.getItems();
+            Apcheck main = BeanMapper.map(form.getMain(), Apcheck.class);
+            List<ApcheckDetail> details = BeanMapper.mapList(form.getItems(), ApcheckDetail.class);
 
+            //供应商获取
+            Vendor vendor = apcheckMapper.getVendorByuu(main.getAc_venduu(), companyId);
+            if ( null == vendor) {
+                continue;
+            }
             //补充必要数据
+            main.setAc_vendcode(vendor.getVe_code());
+            main.setAc_vendid(vendor.getId());
+            main.setAc_vendname(vendor.getVe_name());
             main.setCompanyId(companyId);
             main.setCreateTime(new Date());
+            //获取编号
+            String code = maxnumberService.getMaxnumber(BillCodeSeq.APCHECK.getCaller(), false).getData();
+            main.setAc_code(code);
             apcheckMapper.insertSelective(main);
 
             //根据型号匹配物料
@@ -55,6 +71,6 @@ public class ApCheckServiceImpl implements ApCheckService{
             ids.append(main.getAc_b2bid());
             ids.append(",");
         }
-        return ids.substring(0, ids.length() - 1);
+        return ids.length() > 0 ? ids.substring(0, ids.length() - 1) : "";
     }
 }

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/service/impl/SaleDownServiceImpl.java

@@ -1,7 +1,17 @@
 package com.usoftchina.saas.transfers.service.impl;
 
+import com.usoftchina.saas.account.api.AccountApi;
+import com.usoftchina.saas.account.dto.AccountDTO;
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.commons.api.MaxnumberService;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.exception.BizExceptionCode;
+import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Status;
+import com.usoftchina.saas.context.BaseContextHolder;
+import com.usoftchina.saas.document.entities.Customer;
 import com.usoftchina.saas.document.entities.Product;
+import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.sale.dto.SaleDownFormDTO;
 import com.usoftchina.saas.transfers.auth.context.TransfersContextHodler;
 import com.usoftchina.saas.transfers.mapper.SaledownMapper;
@@ -28,6 +38,12 @@ public class SaleDownServiceImpl implements SaleDownService{
     @Autowired
     private SaledownMapper saledownMapper;
 
+    @Autowired
+    private AccountApi accountApi;
+
+    @Autowired
+    private MaxnumberService maxnumberService;
+
     @Override
     public String saveData(List<SaleDownFormDTO> forms) {
         if (CollectionUtils.isEmpty(forms) || forms.size() == 0) {
@@ -40,12 +56,28 @@ public class SaleDownServiceImpl implements SaleDownService{
             SaleDown main = BeanMapper.map(form.getMain(), SaleDown.class);
             List<SaleDownDetail> details = BeanMapper.mapList(form.getItems(), SaleDownDetail.class);
             List<SaleDownDetail> insertDetail = new ArrayList<>();
-
+            //添加业务员
+            Result<AccountDTO> emp = accountApi.getAccountByUu(main.getSa_selleruu());
+            if (!emp.isSuccess()) {
+                continue;
+            }
+            //取客户
+            Customer customer = saledownMapper.getCustomer(main.getSa_customeruu(), companyId);
+            if (null != customer) {
+                main.setSa_custname(customer.getCu_name());
+                main.setSa_custcode(customer.getCu_code());
+                main.setSa_custid(customer.getId());
+            }
+            //取编号
+            String code = maxnumberService.getMaxnumber(BillCodeSeq.SALEDOWN.getCaller(), false).getData();
             //补充必要数据
+            main.setSa_code(code);
             main.setCreateTime(new Date());
             main.setCompanyId(companyId);
             main.setSa_status(Status.AUDITED.getDisplay());
             main.setSa_statuscode(Status.AUDITED.name());
+            main.setSa_seller(emp.getData().getRealname());
+            main.setSa_sellerid(emp.getData().getId());
             saledownMapper.insertSelective(main);
 
             //根据型号匹配物料
@@ -72,7 +104,7 @@ public class SaleDownServiceImpl implements SaleDownService{
             ids.append(main.getB2b_pu_id());
             ids.append(",");
         }
-        return ids.substring(0, ids.length() - 1);
+        return ids.length() > 0 ? ids.substring(0, ids.length() - 1) : "";
     }
 
     @Override
@@ -86,4 +118,11 @@ public class SaleDownServiceImpl implements SaleDownService{
         Long companyId = TransfersContextHodler.getB2bCompanyId();
         saledownMapper.batchUpdateResClose(data, companyId);
     }
+
+   /* public String getMaxnumber(BillCodeSeq bill) {
+        String code = maxnumberService.getMaxnumber(bill.getCaller(), false).getData();
+        DocBaseDTO base = new DocBaseDTO(0l, code, bill.getName());
+        return pushMaxnubmer(base);
+    }*/
+
 }

applications/transfers/transfers-server/src/main/resources/application.yml

@@ -86,4 +86,10 @@ rabbit:
     queue: saas_trade_dev_queue
     dlqueue: saas_trade_dev_dlqueue
     routingkey: saas_trade_dev_dl.*
-    expired: 30000
+    expired: 30000
+b2b:
+  baseUrl:
+    inquiry: https://test-inquiry.uuzcc.cn
+    Component: https://test-mall.uuzcc.cn
+    product: http://test-product.uuzcc.cn
+    uu: https://test-b2b.uuzcc.cn

applications/transfers/transfers-server/src/main/resources/mapper/ApcheckMapper.xml

@@ -285,4 +285,41 @@
       )
     </foreach>
   </insert>
+
+  <resultMap id="vendorMap" type="com.usoftchina.saas.document.entities.Vendor">
+    <result column="ve_code" property="ve_code" jdbcType="VARCHAR" />
+    <result column="ve_shortname" property="ve_shortname" jdbcType="VARCHAR"/>
+    <result column="ve_uu" property="ve_uu" jdbcType="VARCHAR" />
+    <result column="ve_name" property="ve_name" jdbcType="VARCHAR" />
+    <result column="ve_type" property="ve_type" jdbcType="VARCHAR" />
+    <result column="ve_begindate" property="ve_begindate" jdbcType="TIMESTAMP" />
+    <result column="ve_beginapamount" property="ve_beginapamount" jdbcType="DOUBLE" />
+    <result column="ve_beginprepayamount" property="ve_beginprepayamount" jdbcType="DOUBLE" />
+    <result column="ve_promisedays" property="ve_promisedays" jdbcType="INTEGER" />
+    <result column="ve_taxrate" property="ve_taxrate" jdbcType="DOUBLE" />
+    <result column="ve_nsrzh" property="ve_nsrzh" jdbcType="VARCHAR" />
+    <result column="ve_bankaccount" property="ve_bankaccount" jdbcType="VARCHAR" />
+    <result column="ve_bankcode" property="ve_bankcode" jdbcType="VARCHAR" />
+    <result column="ve_status" property="ve_status" jdbcType="VARCHAR" />
+    <result column="ve_statuscode" property="ve_statuscode" jdbcType="VARCHAR" />
+    <result column="companyId" property="companyId" jdbcType="INTEGER" />
+    <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
+    <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="ve_text1" property="ve_text1" jdbcType="VARCHAR" />
+    <result column="ve_text2" property="ve_text2" jdbcType="VARCHAR" />
+    <result column="ve_text3" property="ve_text3" jdbcType="VARCHAR" />
+    <result column="ve_text4" property="ve_text4" jdbcType="VARCHAR" />
+    <result column="ve_text5" property="ve_text5" jdbcType="VARCHAR" />
+    <result column="ve_payamount" property="ve_payamount" jdbcType="DOUBLE" />
+    <result column="ve_leftamount" property="ve_leftamount" jdbcType="DOUBLE" />
+    <result column="ve_beginym" property="ve_beginym" jdbcType="INTEGER" />
+    <result column="ve_preamount" property="ve_preamount" jdbcType="DOUBLE" />
+    <result column="ve_remark" property="ve_remark" jdbcType="VARCHAR" />
+    <result column="ve_address" property="ve_address" jdbcType="VARCHAR" />
+    <result column="ve_currency" property="ve_currency" jdbcType="VARCHAR" />
+  </resultMap>
+
+  <select id="getVendorByuu" resultMap="vendorMap">
+    select * from vendor where ve_uu=#{uu} and companyid=#{companyid}
+  </select>
 </mapper>

applications/transfers/transfers-server/src/main/resources/mapper/SaledownMapper.xml

@@ -426,4 +426,40 @@
      b2b_pd_id in #{data} and companyid =#{companyid}
   </update>
 
+  <select id="getCustomer" resultMap="customerMap">
+    select * from customer where cu_uu=#{uu} and companyid=#{companyid}
+  </select>
+
+  <resultMap id="customerMap" type="com.usoftchina.saas.document.entities.Customer">
+    <id column="cu_id" jdbcType="INTEGER" property="id" />
+    <result column="cu_code" jdbcType="VARCHAR" property="cu_code" />
+    <result column="cu_shortname" jdbcType="VARCHAR" property="cu_shortname" />
+    <result column="cu_name" jdbcType="VARCHAR" property="cu_name" />
+    <result column="cu_uu" jdbcType="VARCHAR" property="cu_uu" />
+    <result column="cu_type" jdbcType="VARCHAR" property="cu_type" />
+    <result column="cu_begindate" jdbcType="TIMESTAMP" property="cu_begindate" />
+    <result column="cu_beginaramount" jdbcType="DOUBLE" property="cu_beginaramount" />
+    <result column="cu_beginprerecamount" jdbcType="DOUBLE" property="cu_beginprerecamount" />
+    <result column="cu_promisedays" jdbcType="DOUBLE" property="cu_promisedays" />
+    <result column="cu_taxrate" jdbcType="DOUBLE" property="cu_taxrate" />
+    <result column="cu_sellerid" jdbcType="INTEGER" property="cu_sellerid" />
+    <result column="cu_sellercode" jdbcType="VARCHAR" property="cu_sellercode" />
+    <result column="cu_sellername" jdbcType="VARCHAR" property="cu_sellername" />
+    <result column="cu_credit" jdbcType="DOUBLE" property="cu_credit" />
+    <result column="cu_status" jdbcType="VARCHAR" property="cu_status" />
+    <result column="cu_statuscode" jdbcType="VARCHAR" property="cu_statuscode" />
+    <result column="companyid" jdbcType="INTEGER" property="companyId" />
+    <result column="updaterid" jdbcType="INTEGER" property="updaterId" />
+    <result column="updatetime" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="cu_text1" jdbcType="VARCHAR" property="cu_text1" />
+    <result column="cu_text2" jdbcType="VARCHAR" property="cu_text2" />
+    <result column="cu_text3" jdbcType="VARCHAR" property="cu_text3" />
+    <result column="cu_text4" jdbcType="VARCHAR" property="cu_text4" />
+    <result column="cu_text5" jdbcType="VARCHAR" property="cu_text5" />
+    <result column="cu_leftamount" jdbcType="DOUBLE" property="cu_leftamount" />
+    <result column="cu_recamount" jdbcType="DOUBLE" property="cu_recamount" />
+    <result column="cu_preamount" jdbcType="DOUBLE" property="cu_preamount" />
+    <result column="cu_remark" jdbcType="VARCHAR" property="cu_remark" />
+    <result column="cu_currency" jdbcType="VARCHAR" property="cu_currency" />
+  </resultMap>
 </mapper>

base-servers/auth/auth-client/src/main/java/com/usoftchina/saas/auth/client/interceptor/AuthRestInterceptor.java

@@ -5,6 +5,7 @@ import com.usoftchina.saas.auth.client.configuration.AuthConfig;
 import com.usoftchina.saas.auth.common.jwt.JwtHelper;
 import com.usoftchina.saas.auth.common.jwt.JwtInfo;
 import com.usoftchina.saas.context.BaseContextHolder;
+import com.usoftchina.saas.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +45,7 @@ public class AuthRestInterceptor extends HandlerInterceptorAdapter {
                 //取最后一个元素
                 token = headers.nextElement();
             }
-            if (null != token) {
+            if (!StringUtils.isEmpty(token)) {
                 JwtInfo infoFromToken = JwtHelper.getInfoFromToken(token, authConfig.getPublicKey());
                 BaseContextHolder.setAppId(infoFromToken.getAppId());
                 BaseContextHolder.setUserId(infoFromToken.getUserId());

base-servers/gateway-server/src/main/resources/application.yml

@@ -212,6 +212,7 @@ auth:
     - /api/account/role/list/**
     - /api/account/account/share/join
     - /api/oper_auth/authorize
+    - /api/open/**
   cookie:
     name: uid
     secret-key: 0taQcW073Z7G628g5H