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

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

@@ -37,6 +37,37 @@ public class Bom extends CommonBaseEntity implements Serializable {
 
     private String pr_unit;
 
+    private String pr_whid;
+
+    private String pr_whcode;
+
+    public String getPr_whname() {
+        return pr_whname;
+    }
+
+    public void setPr_whname(String pr_whname) {
+        this.pr_whname = pr_whname;
+    }
+
+    public String getPr_whid() {
+
+        return pr_whid;
+    }
+
+    public void setPr_whid(String pr_whid) {
+        this.pr_whid = pr_whid;
+    }
+
+    public String getPr_whcode() {
+        return pr_whcode;
+    }
+
+    public void setPr_whcode(String pr_whcode) {
+        this.pr_whcode = pr_whcode;
+    }
+
+    private String pr_whname;
+
     public String getPr_unit() {
         return pr_unit;
     }

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

@@ -25,6 +25,9 @@
     <result column="pr_spec" property="pr_spec" jdbcType="VARCHAR" />
     <result column="pr_unit" property="pr_unit" jdbcType="VARCHAR" />
     <result column="pr_orispeccode" property="pr_orispeccode" jdbcType="VARCHAR" />
+    <result column="pr_whid" property="pr_whid" jdbcType="VARCHAR" />
+    <result column="pr_whcode" property="pr_whcode" jdbcType="VARCHAR" />
+    <result column="pr_whname" property="pr_whname" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     bo_id, bo_motherid, bo_mothercode, bo_mothername, bo_version, bo_status, bo_statuscode, 

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

@@ -526,7 +526,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         result.setMessage(purchasedetailMapper.checkzxbzs(id));
         //检测单据是否关闭
         Integer checkClose = purchaseMapper.checkClose(id);
-        if (count > 0) {
+        if (checkClose > 0) {
             throw new BizException(BizExceptionCode.SALE_CLOSE.getCode(), String.format(BizExceptionCode.SALE_CLOSE.getMessage(),"审核"));
         }
 

applications/purchase/purchase-server/src/main/resources/logback-spring.xml

@@ -96,9 +96,9 @@
     </springProfile>
 
     <springProfile name="docker">
-        <logger name="org.springframework" level="WARN"/>
-        <logger name="com.usoftchina.saas" level="WARN"/>
-        <root level="WARN">
+        <logger name="org.springframework" level="INFO"/>
+        <logger name="com.usoftchina.saas" level="INFO"/>
+        <root level="INFO">
             <appender-ref ref="CONSOLE_APPENDER"/>
             <appender-ref ref="JSON_APPENDER"/>
         </root>

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/report/SaleProfitView.java

@@ -47,6 +47,8 @@ public class SaleProfitView {
 
     private Double pd_total;
 
+    private Double pd_nettotal;
+
     private Double pd_profit;
 
     private Double pd_price;

applications/sale/sale-server/src/main/resources/mapper/SaleProfitViewMapper.xml

@@ -27,6 +27,7 @@
     <result column="companyid" property="companyid" jdbcType="INTEGER" />
       <result column="pd_remark" property="pd_remark" jdbcType="VARCHAR" />
     <result column="pw_costprice" property="pw_costprice" jdbcType="DOUBLE" />
+    <result column="pd_nettotal" property="pd_nettotal" jdbcType="DOUBLE" />
     <result column="pr_orispeccode" property="pr_orispeccode" jdbcType="VARCHAR" />
     <result column="pr_brand" property="pr_brand" jdbcType="VARCHAR" />
   </resultMap>

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

@@ -37,9 +37,12 @@ public class AuthRestInterceptor extends HandlerInterceptorAdapter {
             if (annotation != null) {
                 return super.preHandle(request, response, handler);
             }
+            log.info("请求方法: " + request.getRequestURI());
             String token = request.getHeader(authConfig.getAuthHeader());
+            log.info("token: " + request.getRequestURI());
             if (null != token) {
                 JwtInfo infoFromToken = JwtHelper.getInfoFromToken(token, authConfig.getPublicKey());
+                log.info("CompanyId: " + infoFromToken.getCompanyId());
                 BaseContextHolder.setAppId(infoFromToken.getAppId());
                 BaseContextHolder.setUserId(infoFromToken.getUserId());
                 BaseContextHolder.setUserName(infoFromToken.getRealName());