Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/MaxnumberService.java

@@ -31,4 +31,16 @@ public interface MaxnumberService {
      */
     @PostMapping("/number/getMaxnumber")
     public Result<String> getMaxnumber(@RequestParam("caller") String caller, @RequestParam("update") boolean update);
+
+    /**
+     * @Description 获取单号
+     * @Param: [caller, update]
+     * @return: com.usoftchina.saas.base.Result
+     * @Author: guq
+     * @Date: 2018/10/22
+     */
+    @PostMapping("/number/getMaxnumberByCompanyid")
+    public Result<String> getMaxnumberByCompanyid(@RequestParam("caller") String caller, @RequestParam("update") boolean update,
+                                       @RequestParam("companyid") Long companyid);
+
 }

applications/commons/commons-api/src/main/java/com/usoftchina/saas/commons/api/MaxnumberServiceFallback.java

@@ -18,4 +18,9 @@ public class MaxnumberServiceFallback implements MaxnumberService {
     public Result<String> getMaxnumber(String caller, boolean update) {
         return Result.error("网络异常,请稍后重试!");
     }
+
+    @Override
+    public Result<String> getMaxnumberByCompanyid(String caller, boolean update, Long companyid) {
+        return Result.error("网络异常,请稍后重试!");
+    }
 }

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/controller/MaxnumberController.java

@@ -25,7 +25,12 @@ public class MaxnumberController {
 
     @PostMapping("/getMaxnumber")
     public Result<String> getMaxnumber(String caller, boolean update) {
-        return Result.success(maxnumberService.getMaxnumner(caller, update));
+        return Result.success(maxnumberService.getMaxnumner(caller, update, null));
+    }
+
+    @PostMapping("/getMaxnumberByCompanyid")
+    public Result<String> getMaxnumberByCompanyid(String caller, boolean update, Long companyid) {
+        return Result.success(maxnumberService.getMaxnumner(caller, update, companyid));
     }
 
     @PostMapping("/pushMaxnubmer")

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/MaxnumberService.java

@@ -14,7 +14,7 @@ import com.usoftchina.saas.page.PageRequest;
  * @create: 2018-10-18 18:01
  **/
 public interface MaxnumberService extends CommonBaseService<MaxnumbersMapper, Maxnumbers> {
-    String getMaxnumner(String caller, boolean update);
+    String getMaxnumner(String caller, boolean update, Long companyid);
 
     Result pushMaxnubmer(Integer count, String code, String caller);
 

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/impl/MaxnumberServiceImpl.java

@@ -51,7 +51,7 @@ public class MaxnumberServiceImpl extends CommonBaseServiceImpl<MaxnumbersMapper
     * @Date: 2018/10/18
     */
     @Override
-    public String getMaxnumner(String caller, boolean update) {
+    public String getMaxnumner(String caller, boolean update, Long companyId) {
         if (null == caller) {
             throw new BizException(BizExceptionCode.BIZ_NULLCALLER);
         }
@@ -65,17 +65,17 @@ public class MaxnumberServiceImpl extends CommonBaseServiceImpl<MaxnumbersMapper
         Integer length = 0;
         //流水最大数
         Integer maxno = 1;
-        Long companyId = BaseContextHolder.getCompanyId();
+        companyId = companyId == null ? BaseContextHolder.getCompanyId() : companyId;
         Long userId = BaseContextHolder.getUserId();
         //查询编号规则
-        Maxnumbers maxnumbers = findMaxnumbers(caller);
+        Maxnumbers maxnumbers = findMaxnumbers(caller, companyId);
         if (maxnumbers == null) {
             throw new BizException(BizExceptionCode.NULL_CODERULE);
         }
        rulecode = getRulecode(maxnumbers);
        length = maxnumbers.getMn_number();
         //查询从表是否存在该规则数据
-        Maxnumbersdetail detail = getMaxDetail(caller, rulecode);
+        Maxnumbersdetail detail = getMaxDetail(caller, rulecode, companyId);
         if (null == detail) {
             //不存在则插入
             detail = new Maxnumbersdetail();
@@ -93,7 +93,7 @@ public class MaxnumberServiceImpl extends CommonBaseServiceImpl<MaxnumbersMapper
         maxcode = rulecode + createSerialNum(length, maxno);
         //如果以更新方式取编号
         if (update) {
-            maxnumbersdetailMapper.updateMaxno(detail.getId(), maxno, BaseContextHolder.getCompanyId());
+            maxnumbersdetailMapper.updateMaxno(detail.getId(), maxno, companyId);
         }
         return maxcode;
     }
@@ -118,7 +118,7 @@ public class MaxnumberServiceImpl extends CommonBaseServiceImpl<MaxnumbersMapper
         //流水位数
         Integer length = 0;
         //查询编号规则
-        Maxnumbers maxnumbers = findMaxnumbers(caller);
+        Maxnumbers maxnumbers = findMaxnumbers(caller, companyId);
         if (null == maxnumbers) {
             throw new BizException(BizExceptionCode.NULL_CODERULE);
         }
@@ -132,11 +132,11 @@ public class MaxnumberServiceImpl extends CommonBaseServiceImpl<MaxnumbersMapper
         }
         //与规则匹配的编号
         if (count > 0) {
-            return Result.success(getMaxnumner(caller, true));
+            return Result.success(getMaxnumner(caller, true, null));
         }
 
         //查询从表是否存在该规则数据
-        Maxnumbersdetail detail = getMaxDetail(caller, rulecode);
+        Maxnumbersdetail detail = getMaxDetail(caller, rulecode, companyId);
         if (null != detail) {
             //存在则更新表中最大流水号
             length = maxnumbers.getMn_number();
@@ -241,8 +241,8 @@ public class MaxnumberServiceImpl extends CommonBaseServiceImpl<MaxnumbersMapper
     * @Author: guq
     * @Date: 2018/10/19
     */
-    private Maxnumbers findMaxnumbers(String caller) {
-       Long companyId = BaseContextHolder.getCompanyId();
+    private Maxnumbers findMaxnumbers(String caller, Long companyId) {
+       //Long companyId = BaseContextHolder.getCompanyId();
         return maxnumbersMapper.selectByCaller(caller, companyId);
     }
     /**
@@ -253,10 +253,10 @@ public class MaxnumberServiceImpl extends CommonBaseServiceImpl<MaxnumbersMapper
     * @Author: guq
     * @Date: 2018/10/18
     */
-    private Maxnumbersdetail getMaxDetail(String caller, String rulecode) {
+    private Maxnumbersdetail getMaxDetail(String caller, String rulecode, Long companyid) {
         MaxnumbersdetailExample detailexample = new MaxnumbersdetailExample();
         MaxnumbersdetailExample.Criteria detailcta = detailexample.createCriteria();
-        detailcta.andCompanyIdEqualTo(BaseContextHolder.getCompanyId());
+        detailcta.andCompanyIdEqualTo(companyid);
         detailcta.andMd_callerEqualTo(caller);
         detailcta.andMd_leadcodeEqualTo(rulecode);
         List<Maxnumbersdetail> details = maxnumbersdetailMapper.selectByExample(detailexample);

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

@@ -0,0 +1,171 @@
+package com.usoftchina.saas.money.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author: guq
+ * @create: 2019-01-14 11:54
+ **/
+public class ApcheckDTO implements Serializable {
+
+    private Long ac_b2bid;//平台来源Id
+
+    private Date ac_date;//对账日期
+
+    private Date ac_apdate;//应付日期
+
+    private Date ac_fromdate;//对账起始日期
+
+    private Date ac_todate;//对账截至日期
+
+    private Long ac_venduu;//供应商uu
+
+    private String ac_currency;//币别
+
+    private Double ac_rate;//汇率
+
+    private Double ac_checkamount;//对账金额
+
+    private String ac_remark;//备注
+
+    private Double ac_thisamount;//本期应付金额
+
+    private Double ac_thisuncheck;//本期未对账
+
+    private Double ac_thispay;//本期已付
+
+    private Double ac_thissend;//本期发货
+
+    private Double ac_thischeck;//本期已对账
+
+    private Double ac_payamont;//应付总额
+
+    public Long getAc_b2bid() {
+        return ac_b2bid;
+    }
+
+    public void setAc_b2bid(Long ac_b2bid) {
+        this.ac_b2bid = ac_b2bid;
+    }
+
+    public Date getAc_date() {
+        return ac_date;
+    }
+
+    public void setAc_date(Date ac_date) {
+        this.ac_date = ac_date;
+    }
+
+    public Date getAc_apdate() {
+        return ac_apdate;
+    }
+
+    public void setAc_apdate(Date ac_apdate) {
+        this.ac_apdate = ac_apdate;
+    }
+
+    public Date getAc_fromdate() {
+        return ac_fromdate;
+    }
+
+    public void setAc_fromdate(Date ac_fromdate) {
+        this.ac_fromdate = ac_fromdate;
+    }
+
+    public Date getAc_todate() {
+        return ac_todate;
+    }
+
+    public void setAc_todate(Date ac_todate) {
+        this.ac_todate = ac_todate;
+    }
+
+    public Long getAc_venduu() {
+        return ac_venduu;
+    }
+
+    public void setAc_venduu(Long ac_venduu) {
+        this.ac_venduu = ac_venduu;
+    }
+
+    public String getAc_currency() {
+        return ac_currency;
+    }
+
+    public void setAc_currency(String ac_currency) {
+        this.ac_currency = ac_currency;
+    }
+
+    public Double getAc_rate() {
+        return ac_rate;
+    }
+
+    public void setAc_rate(Double ac_rate) {
+        this.ac_rate = ac_rate;
+    }
+
+    public Double getAc_checkamount() {
+        return ac_checkamount;
+    }
+
+    public void setAc_checkamount(Double ac_checkamount) {
+        this.ac_checkamount = ac_checkamount;
+    }
+
+    public String getAc_remark() {
+        return ac_remark;
+    }
+
+    public void setAc_remark(String ac_remark) {
+        this.ac_remark = ac_remark;
+    }
+
+    public Double getAc_thisamount() {
+        return ac_thisamount;
+    }
+
+    public void setAc_thisamount(Double ac_thisamount) {
+        this.ac_thisamount = ac_thisamount;
+    }
+
+    public Double getAc_thisuncheck() {
+        return ac_thisuncheck;
+    }
+
+    public void setAc_thisuncheck(Double ac_thisuncheck) {
+        this.ac_thisuncheck = ac_thisuncheck;
+    }
+
+    public Double getAc_thispay() {
+        return ac_thispay;
+    }
+
+    public void setAc_thispay(Double ac_thispay) {
+        this.ac_thispay = ac_thispay;
+    }
+
+    public Double getAc_thissend() {
+        return ac_thissend;
+    }
+
+    public void setAc_thissend(Double ac_thissend) {
+        this.ac_thissend = ac_thissend;
+    }
+
+    public Double getAc_thischeck() {
+        return ac_thischeck;
+    }
+
+    public void setAc_thischeck(Double ac_thischeck) {
+        this.ac_thischeck = ac_thischeck;
+    }
+
+    public Double getAc_payamont() {
+        return ac_payamont;
+    }
+
+    public void setAc_payamont(Double ac_payamont) {
+        this.ac_payamont = ac_payamont;
+    }
+}

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

@@ -0,0 +1,90 @@
+package com.usoftchina.saas.money.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author: guq
+ * @create: 2019-01-14 12:39
+ **/
+public class ApcheckDetailDTO implements Serializable{
+
+    private Integer ad_detno;//序号
+
+    private String ad_inoutno;//出入库单号
+
+    private Integer ad_pdno;//出入库序号
+
+    private String ad_prodcode;//物料编号
+
+    private String ad_pucode;//采购单号
+
+    private Double ad_price;//单价
+
+    private Double ad_taxrate;//税率%
+
+    private Double ad_b2bqty;//供应商对账数
+
+    public Integer getAd_detno() {
+        return ad_detno;
+    }
+
+    public void setAd_detno(Integer ad_detno) {
+        this.ad_detno = ad_detno;
+    }
+
+    public String getAd_inoutno() {
+        return ad_inoutno;
+    }
+
+    public void setAd_inoutno(String ad_inoutno) {
+        this.ad_inoutno = ad_inoutno;
+    }
+
+    public Integer getAd_pdno() {
+        return ad_pdno;
+    }
+
+    public void setAd_pdno(Integer ad_pdno) {
+        this.ad_pdno = ad_pdno;
+    }
+
+    public String getAd_prodcode() {
+        return ad_prodcode;
+    }
+
+    public void setAd_prodcode(String ad_prodcode) {
+        this.ad_prodcode = ad_prodcode;
+    }
+
+    public String getAd_pucode() {
+        return ad_pucode;
+    }
+
+    public void setAd_pucode(String ad_pucode) {
+        this.ad_pucode = ad_pucode;
+    }
+
+    public Double getAd_price() {
+        return ad_price;
+    }
+
+    public void setAd_price(Double ad_price) {
+        this.ad_price = ad_price;
+    }
+
+    public Double getAd_taxrate() {
+        return ad_taxrate;
+    }
+
+    public void setAd_taxrate(Double ad_taxrate) {
+        this.ad_taxrate = ad_taxrate;
+    }
+
+    public Double getAd_b2bqty() {
+        return ad_b2bqty;
+    }
+
+    public void setAd_b2bqty(Double ad_b2bqty) {
+        this.ad_b2bqty = ad_b2bqty;
+    }
+}

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

@@ -10,7 +10,7 @@ import java.util.Date;
  **/
 public class Apcheck extends CommonBaseEntity{
 
-    private Integer ac_b2bid;
+    private Long ac_b2bid;
 
     private String ac_code;
 
@@ -60,11 +60,11 @@ public class Apcheck extends CommonBaseEntity{
 
     private Long companyId;
 
-    public Integer getAc_b2bid() {
+    public Long getAc_b2bid() {
         return ac_b2bid;
     }
 
-    public void setAc_b2bid(Integer ac_b2bid) {
+    public void setAc_b2bid(Long ac_b2bid) {
         this.ac_b2bid = ac_b2bid;
     }
 

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

@@ -29,7 +29,7 @@ public class SaleDownDTO implements Serializable{
 
     private String sa_pocode;//PO号
 
-    private Integer b2b_pu_id;//B2BID
+    private Long b2b_pu_id;//B2BID
 
     private String sa_remark;//备注
 
@@ -108,14 +108,6 @@ public class SaleDownDTO implements Serializable{
         this.sa_pocode = sa_pocode;
     }
 
-    public Integer getB2b_pu_id() {
-        return b2b_pu_id;
-    }
-
-    public void setB2b_pu_id(Integer b2b_pu_id) {
-        this.b2b_pu_id = b2b_pu_id;
-    }
-
     public String getSa_remark() {
         return sa_remark;
     }
@@ -123,4 +115,12 @@ public class SaleDownDTO implements Serializable{
     public void setSa_remark(String sa_remark) {
         this.sa_remark = sa_remark;
     }
+
+    public Long getB2b_pu_id() {
+        return b2b_pu_id;
+    }
+
+    public void setB2b_pu_id(Long b2b_pu_id) {
+        this.b2b_pu_id = b2b_pu_id;
+    }
 }

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

@@ -13,7 +13,7 @@ public class SaleDownDetailDTO implements Serializable{
 
     private Integer sd_detno;//序号
 
-    private Integer b2b_pd_id;//B2BID
+    private Long b2b_pd_id;//B2BID
 
     private String sd_custorispeccode;//客户物料型号
 
@@ -47,11 +47,11 @@ public class SaleDownDetailDTO implements Serializable{
         this.sd_detno = sd_detno;
     }
 
-    public Integer getB2b_pd_id() {
+    public Long getB2b_pd_id() {
         return b2b_pd_id;
     }
 
-    public void setB2b_pd_id(Integer b2b_pd_id) {
+    public void setB2b_pd_id(Long b2b_pd_id) {
         this.b2b_pd_id = b2b_pd_id;
     }
 

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

@@ -53,7 +53,7 @@ public class OpenApiAuthInterceptor extends HandlerInterceptorAdapter{
             String sign = request.getParameter(openApiConfig.getSignatureParam());
             String companyuu = request.getParameter(openApiConfig.getCompanyuu());
             if (!StringUtils.isEmpty(sign) && !StringUtils.isEmpty(companyuu)) {
-                String urlMessage = request.getRequestURL() + "?"
+                String urlMessage = request.getRequestURI() + "?"
                         + request.getQueryString().substring(0, request.getQueryString().indexOf(openApiConfig.getSignatureParam()) - 1);
 
                 logger.info("urlMessage:{}", urlMessage);
@@ -72,6 +72,7 @@ public class OpenApiAuthInterceptor extends HandlerInterceptorAdapter{
                                 HmacUtils.encode(urlMessage, companyResult.getData().getAccessKey());
 
                     if (servletPath.indexOf("b2b") > -1) {
+                        logger.info("自己生产的sign:{}-----传入的sign:{}", localSign, sign);
                         check = sign.equals(localSign);
                     }
 

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

@@ -5,6 +5,7 @@ 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.transfers.auth.annotation.IgnoreOpenApiAuth;
 import com.usoftchina.saas.transfers.service.ApCheckService;
 import com.usoftchina.saas.utils.JsonUtils;
 import com.usoftchina.saas.utils.StringUtils;
@@ -14,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.List;
 
 /**
@@ -31,12 +34,13 @@ public class ApCheckController {
     private ApCheckService apcheckService;
 
     @PostMapping("/save")
-    public Result saveApcheck(@RequestParam("data") String data) {
+    public Result saveApcheck(@RequestParam("data") String data) throws UnsupportedEncodingException {
         if (StringUtils.isEmpty(data)) {
             throw new BizException(BizExceptionCode.NULL_DATA);
         }
+        data = URLDecoder.decode(data, "UTF-8");
         List<ApcheckFormDTO> forms = JsonUtils.fromJsonArray(data, ApcheckFormDTO.class);
-        apcheckService.save(forms);
-        return Result.success();
+        String ids = apcheckService.save(forms);
+        return Result.success(ids);
     }
 }

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

@@ -13,6 +13,9 @@ import com.usoftchina.saas.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.List;
 
 /**
@@ -23,7 +26,6 @@ import java.util.List;
 @IgnoreAuth
 @RestController
 @RequestMapping("/b2b/saledown")
-@IgnoreOpenApiAuth
 public class SaleDownController {
 
     @Autowired
@@ -34,10 +36,11 @@ public class SaleDownController {
      * @return
      */
     @PostMapping("/save")
-    public Result<String> saveSaleDown(@RequestParam("data") String data) {
+    public Result<String> saveSaleDown(@RequestParam("data") String data) throws UnsupportedEncodingException {
         if (StringUtils.isEmpty(data)) {
             throw new BizException(BizExceptionCode.NULL_DATA);
         }
+        data = URLDecoder.decode(data, "UTF-8");
         List<SaleDownFormDTO> forms = JsonUtils.fromJsonArray(data, SaleDownFormDTO.class);
         String idStr = saleDownService.saveData(forms);
         return Result.success(idStr);
@@ -48,10 +51,11 @@ public class SaleDownController {
      * @return
      */
     @PostMapping("/close")
-    public Result<String> closeSaleDown(@RequestParam("data") String data) {
+    public Result<String> closeSaleDown(@RequestParam("data") String data) throws UnsupportedEncodingException {
         if (StringUtils.isEmpty(data)) {
             throw new BizException(BizExceptionCode.NULL_DATA);
         }
+        data = URLDecoder.decode(data, "UTF-8");
          saleDownService.closeSaleDown(data);
         return Result.success();
     }
@@ -61,10 +65,11 @@ public class SaleDownController {
      * @return
      */
     @PostMapping("/resClose")
-    public Result<String> resCloseSaleDown(@RequestParam("data") String data) {
+    public Result<String> resCloseSaleDown(@RequestParam("data") String data) throws UnsupportedEncodingException {
         if (StringUtils.isEmpty(data)) {
             throw new BizException(BizExceptionCode.NULL_DATA);
         }
+        data = URLDecoder.decode(data, "UTF-8");
         saleDownService.resCloseSaleDown(data);
         return Result.success();
     }

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

@@ -44,7 +44,7 @@ public class SaleDown extends CommonBaseEntity{
 
     private String sa_pocode;
 
-    private Integer b2b_pu_id;
+    private Long b2b_pu_id;
 
     private String sa_printstatus;
 
@@ -111,6 +111,10 @@ public class SaleDown extends CommonBaseEntity{
         this.sa_custcode = sa_custcode == null ? null : sa_custcode.trim();
     }
 
+    public void setB2b_pu_id(Long b2b_pu_id) {
+        this.b2b_pu_id = b2b_pu_id;
+    }
+
     public String getSa_custname() {
         return sa_custname;
     }
@@ -188,6 +192,10 @@ public class SaleDown extends CommonBaseEntity{
         return sa_selleruu;
     }
 
+    public Long getB2b_pu_id() {
+        return b2b_pu_id;
+    }
+
     public void setSa_selleruu(Long sa_selleruu) {
         this.sa_selleruu = sa_selleruu;
     }
@@ -216,14 +224,6 @@ public class SaleDown extends CommonBaseEntity{
         this.sa_pocode = sa_pocode == null ? null : sa_pocode.trim();
     }
 
-    public Integer getB2b_pu_id() {
-        return b2b_pu_id;
-    }
-
-    public void setB2b_pu_id(Integer b2b_pu_id) {
-        this.b2b_pu_id = b2b_pu_id;
-    }
-
     public String getSa_printstatus() {
         return sa_printstatus;
     }

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

@@ -16,7 +16,7 @@ public class SaleDownDetail extends CommonBaseEntity{
 
     private Integer sd_detno;
 
-    private Integer b2b_pd_id;
+    private Long b2b_pd_id;
 
     private Long sd_prodid;
 
@@ -76,14 +76,6 @@ public class SaleDownDetail extends CommonBaseEntity{
         this.sd_detno = sd_detno;
     }
 
-    public Integer getB2b_pd_id() {
-        return b2b_pd_id;
-    }
-
-    public void setB2b_pd_id(Integer b2b_pd_id) {
-        this.b2b_pd_id = b2b_pd_id;
-    }
-
     public Long getSd_prodid() {
         return sd_prodid;
     }
@@ -100,6 +92,14 @@ public class SaleDownDetail extends CommonBaseEntity{
         this.sd_prodcode = sd_prodcode == null ? null : sd_prodcode.trim();
     }
 
+    public Long getB2b_pd_id() {
+        return b2b_pd_id;
+    }
+
+    public void setB2b_pd_id(Long b2b_pd_id) {
+        this.b2b_pd_id = b2b_pd_id;
+    }
+
     public String getSd_prodspec() {
         return sd_prodspec;
     }

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

@@ -33,7 +33,7 @@ public class ApCheckServiceImpl implements ApCheckService{
     @Override
     public String save(List<ApcheckFormDTO> forms) {
         if (CollectionUtils.isEmpty(forms) || forms.size() == 0) {
-            return null;
+            throw new IllegalStateException("无效数据");
         }
         StringBuilder ids = new StringBuilder();
         Long companyId = TransfersContextHodler.getB2bCompanyId();
@@ -54,7 +54,7 @@ public class ApCheckServiceImpl implements ApCheckService{
             main.setCompanyId(companyId);
             main.setCreateTime(new Date());
             //获取编号
-            String code = maxnumberService.getMaxnumber(BillCodeSeq.APCHECK.getCaller(), false).getData();
+            String code = maxnumberService.getMaxnumberByCompanyid(BillCodeSeq.APCHECK.getCaller(), true, companyId).getData();
             main.setAc_code(code);
             apcheckMapper.insertSelective(main);
 

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

@@ -47,7 +47,7 @@ public class SaleDownServiceImpl implements SaleDownService{
     @Override
     public String saveData(List<SaleDownFormDTO> forms) {
         if (CollectionUtils.isEmpty(forms) || forms.size() == 0) {
-            return null;
+            throw new IllegalStateException("无效数据");
         }
         StringBuilder ids = new StringBuilder();
         Long companyId = TransfersContextHodler.getB2bCompanyId();
@@ -69,7 +69,7 @@ public class SaleDownServiceImpl implements SaleDownService{
                 main.setSa_custid(customer.getId());
             }
             //取编号
-            String code = maxnumberService.getMaxnumber(BillCodeSeq.SALEDOWN.getCaller(), false).getData();
+            String code = maxnumberService.getMaxnumberByCompanyid(BillCodeSeq.SALEDOWN.getCaller(), true, companyId).getData();
             //补充必要数据
             main.setSa_code(code);
             main.setCreateTime(new Date());

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

@@ -57,7 +57,7 @@
     ac_vendid, ac_vendcode, ac_vendname, ac_currency, ac_rate, ac_checkamount, ac_confirmstatus, 
     ac_confirmstatuscode, ac_confirmdate, ac_remark, ac_sendstatus, ac_thisamount, ac_thisuncheck, 
     ac_thispay, ac_thissend, ac_thischeck, ac_payamont, creatorId, creatorName, companyId, 
-    updaterId, updaterName, updatetime, createTime
+    updaterId, updaterName, createTime
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -163,9 +163,6 @@
       <if test="updaterName != null" >
         updaterName,
       </if>
-      <if test="updatetime != null" >
-        updatetime,
-      </if>
       <if test="createTime != null" >
         createTime,
       </if>
@@ -258,9 +255,6 @@
       <if test="updaterName != null" >
         #{updaterName,jdbcType=VARCHAR},
       </if>
-      <if test="updatetime != null" >
-        #{updatetime,jdbcType=TIMESTAMP},
-      </if>
       <if test="createTime != null" >
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -277,11 +271,11 @@
     values
     <foreach collection="list" item="item" index="index" open="" close="" separator=",">
       (
-      #{ad_acid,jdbcType=INTEGER}, #{ad_detno,jdbcType=INTEGER},
-      #{ad_inoutno,jdbcType=VARCHAR}, #{ad_pdno,jdbcType=INTEGER}, #{ad_prodcode,jdbcType=VARCHAR},
-      #{ad_pucode,jdbcType=VARCHAR}, #{ad_price,jdbcType=DOUBLE}, #{ad_taxrate,jdbcType=DOUBLE},
-      #{ad_b2bqty,jdbcType=DOUBLE}, #{companyId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP},
-      #{creatorId,jdbcType=INTEGER}, #{creatorName,jdbcType=VARCHAR}
+      #{item.ad_acid}, #{item.ad_detno,jdbcType=INTEGER},
+      #{item.ad_inoutno,jdbcType=VARCHAR}, #{item.ad_pdno,jdbcType=INTEGER}, #{item.ad_prodcode,jdbcType=VARCHAR},
+      #{item.ad_pucode,jdbcType=VARCHAR}, #{item.ad_price,jdbcType=DOUBLE}, #{item.ad_taxrate,jdbcType=DOUBLE},
+      #{item.ad_b2bqty,jdbcType=DOUBLE}, #{item.companyId,jdbcType=BIGINT}, #{item.createTime,jdbcType=TIMESTAMP},
+      #{item.creatorId,jdbcType=INTEGER}, #{item.creatorName,jdbcType=VARCHAR}
       )
     </foreach>
   </insert>
@@ -304,7 +298,6 @@
     <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" />

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

@@ -386,14 +386,14 @@
   </update>
 
   <select id="findProductBySpec" resultMap="productMap">
-    select * from product where pr_spec=#{spec} and companyid =#{companyid}
+    select * from product where pr_orispeccode=#{spec} and companyid =#{companyid}
   </select>
 
 
   <insert id="batchInsert" parameterType="java.util.List" >
     insert into saledowndetail (sd_said, sd_detno,sd_code,
-    sd_prodid, sd_prodcode, sd_prodspec,sd_orispeccode,sp_produnit,
-    sd_custorispeccode,sd_custprodcode,sd_custproddetail,sd_custprodspec
+    sd_prodid, sd_prodcode, sd_prodspec,sd_orispeccode,sd_produnit,
+    sd_custorispeccode,sd_custprodcode,sd_custproddetail,sd_custprodspec,
     sd_qty,
     sd_price, sd_total, sd_taxrate,
     sd_delivery,
@@ -404,7 +404,7 @@
       (
       #{item.sd_said,jdbcType=INTEGER}, #{item.sd_detno,jdbcType=INTEGER},#{item.sd_code,jdbcType=VARCHAR},
       #{item.sd_prodid,jdbcType=INTEGER}, #{item.sd_prodcode,jdbcType=VARCHAR},
-      #{item.sd_prodspec,jdbcType=VARCHAR},#{item.sd_orispeccode,jdbcType=VARCHAR},#{item.sp_produnit,jdbcType=VARCHAR},
+      #{item.sd_prodspec,jdbcType=VARCHAR},#{item.sd_orispeccode,jdbcType=VARCHAR},#{item.sd_produnit,jdbcType=VARCHAR},
       #{item.sd_custorispeccode,jdbcType=VARCHAR},#{item.sd_custprodcode,jdbcType=VARCHAR},#{item.sd_custproddetail,jdbcType=VARCHAR},
       #{item.sd_custprodspec,jdbcType=VARCHAR},
       #{item.sd_qty,jdbcType=DOUBLE},
@@ -418,12 +418,12 @@
 
   <update id="batchUpdateClose">
     update saledown set sa_status='已关闭', sa_statuscode='CLOSE' where
-    b2b_pd_id in #{data} and companyid =#{companyid}
+    b2b_pu_id in (${data}) and companyid =${companyid}
   </update>
 
   <update id="batchUpdateResClose">
     update saledown set sa_status='已审核',sa_statuscode='AUDITED' where
-     b2b_pd_id in #{data} and companyid =#{companyid}
+      b2b_pu_id in (${data}) and companyid =${companyid}
   </update>
 
   <select id="getCustomer" resultMap="customerMap">

framework/core/src/main/java/com/usoftchina/saas/utils/JsonUtils.java

@@ -78,6 +78,9 @@ public class JsonUtils {
             return null;
         }
         try {
+            if (!json.startsWith("[")) {
+                json = "[" + json + "]";
+            }
             return mapper.readValue(json, getJavaType(List.class, targetCls));
         } catch (Exception e) {
             e.printStackTrace();

frontend/operation-web/app/util/State.js

@@ -7,7 +7,8 @@ Ext.define('saas.util.State', {
     ],
 
     store: new Ext.util.LocalStorage({
-        id: 'app-state'
+        id: 'app-state',
+        session: true
     }),
 
     get: function(key, defaultValue) {

frontend/saas-portal-web/src/components/conenter/home.vue

@@ -318,7 +318,7 @@
         this.isproblem = this.$route.params.isporblem
       };
       let token = '';
-      if(localStorage.getItem('app-state-session')){
+      if(sessionStorage.getItem('app-state-session')){
         token = Session.getToken();
       }
       this.$ajax({

frontend/saas-portal-web/src/utils/session.js

@@ -6,7 +6,7 @@ function isValid(session) {
 
 export default {
   get() {
-    const str = localStorage.getItem(storeKey)
+    const str = sessionStorage.getItem(storeKey)
     if (str) {
       return JSON.parse(str)
     }
@@ -14,16 +14,16 @@ export default {
   },
   set(session) {
     session.span = session.timestamp - new Date().getTime()
-    return localStorage.setItem(storeKey, JSON.stringify(session))
+    return sessionStorage.setItem(storeKey, JSON.stringify(session))
   },
   remove() {
-    return localStorage.removeItem(storeKey)
+    return sessionStorage.removeItem(storeKey)
   },
   // Authorization Header
   getToken() {
     const session = this.get()
     if (!isValid(session)) {
-      localStorage.removeItem(storeKey)
+      sessionStorage.removeItem(storeKey)
       return null
     }
     return session.token
@@ -31,7 +31,7 @@ export default {
   getAccount() {
     const session = this.get()
     if (!isValid(session)) {
-      localStorage.removeItem(storeKey)
+      sessionStorage.removeItem(storeKey)
       return null
     }
     return session.account

frontend/saas-portal-web/static/set-token.html

@@ -6,10 +6,10 @@
         }
         var storeKey = 'app-state-session';
         if (e.data) {
-            localStorage.setItem(storeKey, e.data);
+            sessionStorage.setItem(storeKey, e.data);
         } else {
-            localStorage.removeItem(storeKey);
+            sessionStorage.removeItem(storeKey);
         }
         window.parent.postMessage("success", "*");
     });
-</script>
+</script>

frontend/saas-web/app/util/State.js

@@ -7,7 +7,8 @@ Ext.define('saas.util.State', {
     ],
 
     store: new Ext.util.LocalStorage({
-        id: 'app-state'
+        id: 'app-state',
+        session: true
     }),
 
     get: function(key, defaultValue) {

frontend/saas-web/app/view/main/Main.js

@@ -138,7 +138,7 @@ Ext.define('saas.view.main.Main', {
                         afterrender:function(b){
                             var main = b.ownerCt.ownerCt;
                             //调用
-                            var _localStorage = Ext.decode(localStorage.getItem('app-state-session'));
+                            var _localStorage = Ext.decode(sessionStorage.getItem('app-state-session'));
                             var nowCompanyId = _localStorage.account.companyId;
                             if(_localStorage.account.rolesMap){
                                 var rolesMap = _localStorage.account.rolesMap[nowCompanyId];

frontend/saas-web/app/view/sys/invitation/DataList.js

@@ -223,7 +223,7 @@ Ext.define('saas.view.sys.invitation.DataList', {
                         if (Ext.isEmpty(condition)) {
                             condition = [];
                         }
-                        var _localStorage = Ext.decode(localStorage.getItem('app-state-session'));
+                        var _localStorage = Ext.decode(sessionStorage.getItem('app-state-session'));
                         var nowCompanyId = _localStorage.account.companyId;
                         condition.push({
                             type:'condition',

frontend/saas-web/set-token.html

@@ -6,9 +6,9 @@
         }
         var storeKey = 'app-state-session';
         if (e.data) {
-            localStorage.setItem(storeKey, e.data);
+            sessionStorage.setItem(storeKey, e.data);
         } else {
-            localStorage.removeItem(storeKey);
+            sessionStorage.removeItem(storeKey);
         }
         window.parent.postMessage("success", "*");
     });

frontend/web/src/utils/auth.js

@@ -2,12 +2,12 @@ const authKey = 'Authorization'
 const expireAt = 'Authorization-Expire-At'
 
 function setExpire(expire) {
-  localStorage.setItem(expireAt, new Date().getTime() + expire * 1000)
+  sessionStorage.setItem(expireAt, new Date().getTime() + expire * 1000)
 }
 
 // 是否过期
 function isExpire() {
-  const expire = localStorage.getItem(expireAt)
+  const expire = sessionStorage.getItem(expireAt)
   if (expire) {
     return Number(expire) <= new Date().getTime()
   }
@@ -16,18 +16,18 @@ function isExpire() {
 
 export function getToken() {
   if (isExpire()) {
-    localStorage.removeItem(expireAt)
-    localStorage.removeItem(authKey)
+    sessionStorage.removeItem(expireAt)
+    sessionStorage.removeItem(authKey)
     return null
   }
-  return localStorage.getItem(authKey)
+  return sessionStorage.getItem(authKey)
 }
 
 export function setToken(token, expire) {
   setExpire(expire)
-  return localStorage.setItem(authKey, token)
+  return sessionStorage.setItem(authKey, token)
 }
 
 export function removeToken() {
-  return localStorage.removeItem(authKey)
+  return sessionStorage.removeItem(authKey)
 }