merge

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

@@ -90,6 +90,22 @@ public enum Status {
      */
     PAYPART("部分付款"),
 
+    /**
+     * 未确认
+     */
+    UNCONFIRM("未确认"),
+
+    /**
+     * 确认
+     */
+    CONFIRMED("确认"),
+
+    /**
+     * 确认
+     */
+    REJECT("不同意"),
+
+
     /**
      * 已付款
      */

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

@@ -26,6 +26,36 @@ public class ApcheckDetail extends CommonBaseEntity{
 
     private Double ad_b2bqty;
 
+    private String pr_detail;
+
+    private String pr_spec;
+
+    private String pr_orispeccode;
+
+    public String getPr_detail() {
+        return pr_detail;
+    }
+
+    public void setPr_detail(String pr_detail) {
+        this.pr_detail = pr_detail;
+    }
+
+    public String getPr_spec() {
+        return pr_spec;
+    }
+
+    public void setPr_spec(String pr_spec) {
+        this.pr_spec = pr_spec;
+    }
+
+    public String getPr_orispeccode() {
+        return pr_orispeccode;
+    }
+
+    public void setPr_orispeccode(String pr_orispeccode) {
+        this.pr_orispeccode = pr_orispeccode;
+    }
+
     public Long getAd_acid() {
         return ad_acid;
     }

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

@@ -50,6 +50,9 @@
     <result column="createTime" property="createTime" jdbcType="TIMESTAMP" />
     <result column="creatorId" property="creatorId" jdbcType="INTEGER" />
     <result column="creatorName" property="creatorName" jdbcType="VARCHAR" />
+    <result column="pr_detail" property="pr_detail" jdbcType="VARCHAR" />
+    <result column="creatorName" property="pr_spec" jdbcType="VARCHAR" />
+    <result column="pr_orispeccode" property="pr_orispeccode" jdbcType="VARCHAR" />
   </resultMap>
 
   <sql id="Base_Column_List" >
@@ -72,7 +75,8 @@
     order by ac_id desc
   </select>
   <select id="selectByFK" resultMap="detailMap" parameterType="long">
-    select * from apcheckdetail where ad_acid=#{id}
+    select * from apcheckdetail left join product on pr_code = ad_prodcode
+     and apcheckdetail.companyid=product.companyid where ad_acid=#{id}
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="long" >
     select 

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

@@ -62,6 +62,26 @@ public class SaleDown extends CommonBaseEntity{
 
     private String sa_turnstatuscode;
 
+    private String sa_salecode;
+
+    private String sa_sendstatus;
+
+    public String getSa_salecode() {
+        return sa_salecode;
+    }
+
+    public void setSa_salecode(String sa_salecode) {
+        this.sa_salecode = sa_salecode;
+    }
+
+    public String getSa_sendstatus() {
+        return sa_sendstatus;
+    }
+
+    public void setSa_sendstatus(String sa_sendstatus) {
+        this.sa_sendstatus = sa_sendstatus;
+    }
+
     public String getSa_turnstatus() {
         return sa_turnstatus;
     }

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

@@ -32,6 +32,8 @@
     <result column="creatorId" property="creatorId" jdbcType="INTEGER" />
     <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
+    <result column="sa_salecode" property="sa_salecode" jdbcType="VARCHAR" />
+    <result column="sa_sendstatus" property="sa_sendstatus" jdbcType="VARCHAR" />
   </resultMap>
 
   <sql id="Base_Column_List" >
@@ -436,7 +438,8 @@
   </select>
 
   <select id="selectListByCon" resultMap="BaseResultMap">
-    select  *  from saledown
+    select  *  from
+    (select saledown.*,sale.sa_sendstatus from saledown left join sale on sa_saleid = sale.sa_id)tab_
     <where>
       <if test="con != null">
         ${con}

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

@@ -2,6 +2,7 @@ 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.commons.po.Status;
 import com.usoftchina.saas.document.entities.Vendor;
 import com.usoftchina.saas.money.dto.ApcheckFormDTO;
 import com.usoftchina.saas.money.po.Apcheck;
@@ -64,6 +65,8 @@ public class ApCheckServiceImpl implements ApCheckService{
             main.setAc_vendname(vendor.getVe_name());
             main.setCompanyId(companyId);
             main.setCreateTime(new Date());
+            main.setAc_confirmstatus(Status.UNCONFIRM.getDisplay());
+            main.setAc_confirmstatuscode(Status.UNCONFIRM.name());
             //获取编号
             String code = maxnumberService.getMaxnumberByCompanyid(BillCodeSeq.APCHECK.getCaller(), true, companyId).getData();
             main.setAc_code(code);

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

@@ -7,4 +7,4 @@ eureka:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
 spring:
   rabbitmq:
-    virtual-host: docker
+    virtual-host: dev

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

@@ -28,7 +28,7 @@
     <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
     <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
     <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="192.168.0.63:5000"/>
+    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="10.1.81.1:5000"/>
 
     <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
 

base-servers/auth/auth-server/src/main/java/com/usoftchina/saas/auth/controller/AuthController.java

@@ -5,6 +5,7 @@ import com.usoftchina.saas.account.api.AccountApi;
 import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.account.constant.AccountType;
 import com.usoftchina.saas.account.dto.*;
+import com.usoftchina.saas.auth.client.annotation.IgnoreAuth;
 import com.usoftchina.saas.auth.common.cookie.CookieHelper;
 import com.usoftchina.saas.auth.common.cookie.CookieInfo;
 import com.usoftchina.saas.auth.common.jwt.JwtHelper;
@@ -49,6 +50,7 @@ import java.util.List;
 @RestController
 @RequestMapping
 @EnableConfigurationProperties(CookieConfig.class)
+@IgnoreAuth
 public class AuthController {
 
     @Autowired

frontend/saas-web/app/Application.scss

@@ -233,6 +233,15 @@ body.launching {
   }
 }
 
+.x-formpanel-btn-red {
+  background: #ff0000;
+  border-color: #ff0000;
+
+  .x-btn-inner-default-toolbar-small {
+    color: #fff !important;
+  }
+}
+
 .x-formpanel-btn-white {
   border: 1px solid #c1c1c1 !important;
 
@@ -626,16 +635,16 @@ input::-webkit-input-placeholder {
   }
 }
 
-.x-quotation-main{
-  .x-grid-row{
-    border-color:#fff !important;
-    background-color: #fff !important;
-  }
-  .x-grid-item-selected{
-    border-color:#fff !important;
-    background-color: #fff !important;
-  }
-}
+// .x-quotation-main{
+//   .x-grid-row{
+//     border-color:#fff !important;
+//     //background-color: #fff !important;
+//   }
+//   .x-grid-item-selected{
+//     border-color:#fff !important;
+//     background-color: #fff !important;
+//   }
+// }
 
 .x-btn-quotation{
   .x-btn-over {

frontend/saas-web/app/view/document/uusetting/UUSetting.js

@@ -34,7 +34,7 @@ Ext.define('saas.view.document.uusetting.UUSetting', {
             }, {
                 text: '供应商名称',
                 dataIndex: 've_name',
-                width: 120
+                width: 200
             }, {
                 text: '状态',
                 dataIndex: 've_status',
@@ -63,7 +63,7 @@ Ext.define('saas.view.document.uusetting.UUSetting', {
             }, {
                 text: '客户名称',
                 dataIndex: 'cu_name',
-                width: 120
+                width: 200
             }, {
                 text: '状态',
                 dataIndex: 'cu_status',

frontend/saas-web/app/view/document/uusetting/UUSettingWin.js

@@ -342,6 +342,7 @@ Ext.define('saas.view.document.uusetting.UUSettingWin', {
             columns: [{
                 text: '企业名称',
                 dataIndex: 'name',
+                width: 200
             }, {
                 text: 'UU',
                 dataIndex: 'uu'

frontend/saas-web/app/view/purchase/quotationList/DataList.js

@@ -85,6 +85,8 @@ Ext.define('saas.view.purchase.quotationList.DataList', {
                             listeners: {								          
                                 beforeshow: function updateTipBody(tip) {
                                     var dg = Ext.getCmp('grid-'+id);
+                                    var rowindex = tip.triggerElement.parentNode.rowIndex;
+							        var rec = Ext.getCmp(grid.id).getStore().getAt(rowindex-1);
                                     dg.store.loadData(val);
                                     dg.show();
                                 }

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

@@ -257,6 +257,8 @@ Ext.define('saas.view.sys.invitation.DataList', {
             gridBodyBoxHeight = gridBodyBox.height;
             var pageSize = Math.floor(gridBodyBoxHeight / 35);
             store.setPageSize(pageSize);
+            grid.ownerCt.el.dom.style.left = '8px';
+            grid.el.dom.style.padding = '0px'
         }
     },
 

frontend/saas-web/resources/json/navigation.json

@@ -33,6 +33,11 @@
             "id": "quotationList",
             "text": "询价信息查询",
             "viewType": "purchase-quotationList-datalist"
+        },{
+            "b2b":true,
+            "id":"reconciliation",  
+            "text":"平台对账单",  
+            "viewType": "purchase-reconciliation-datalist"
         }]
     }, {
         "text": "报表",