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

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

@@ -161,7 +161,7 @@ public class ShareController {
     private void buildQrcode(String basePath, String username, Long companyId, Long delay, String companyName, OutputStream outputStream) throws WriterException, IOException {
         String params = "username=" + username + "&companyId=" + companyId + "&timestamp=" + new Date().getTime() + "&delay=" + delay + "&companyName=" + companyName;
         String encodeParams = new String(UrlBase64.encode(params.getBytes()));
-        String text = basePath + "/invitation_mobile.html" + "?param=" + encodeParams;
+        String text = basePath + "/invitation_mobile_join.html" + "?param=" + encodeParams;
         int width = 140;
         int height = 140;
         String format = "png";

applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/ProdInOutDTO.java

@@ -82,4 +82,16 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
     private String pi_prstatuscode;
 
     private String pi_currency;
+
+    private Integer pi_buyerid;
+
+    private String pi_buyercode;
+
+    private String pi_buyername;
+
+    private Integer pi_sellerid;
+
+    private String pi_sellercode;
+
+    private String pi_seller;
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdInOut.java

@@ -78,4 +78,16 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
     private String pi_prstatuscode;
 
     private String pi_currency;
+
+    private Integer pi_buyerid;
+
+    private String pi_buyercode;
+
+    private String pi_buyername;
+
+    private Integer pi_sellerid;
+
+    private String pi_sellercode;
+
+    private String pi_seller;
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdInOutList.java

@@ -70,6 +70,18 @@ public class ProdInOutList extends CommonBaseEntity{
 
     private String pi_currency;
 
+    private Integer pi_buyerid;
+
+    private String pi_buyercode;
+
+    private String pi_buyername;
+
+    private Integer pi_sellerid;
+
+    private String pi_sellercode;
+
+    private String pi_seller;
+
     private Long pd_piid;
 
     private String pd_inoutno;

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

@@ -465,6 +465,9 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         targetPi.setPi_ioid(sourcePi.getId());
         targetPi.setPi_iocode(sourcePi.getPi_inoutno());
         targetPi.setPi_currency(sourcePi.getPi_currency());
+        targetPi.setPi_buyerid(sourcePi.getPi_buyerid());
+        targetPi.setPi_buyercode(sourcePi.getPi_buyercode());
+        targetPi.setPi_buyername(sourcePi.getPi_buyername());
         //设置付款状态
         targetPi.setPi_prstatus(Status.PAYNONE.getDisplay());
         targetPi.setPi_prstatuscode(Status.PAYNONE.name());

applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutListMapper.xml

@@ -31,6 +31,12 @@
     <result column="pi_address" jdbcType="VARCHAR" property="pi_address" />
     <result column="pi_remark" jdbcType="VARCHAR" property="pi_remark" />
     <result column="pi_currency" jdbcType="VARCHAR" property="pi_currency" />
+    <result column="pi_buyerid" jdbcType="INTEGER" property="pi_buyerid" />
+    <result column="pi_buyercode" jdbcType="VARCHAR" property="pi_buyercode" />
+    <result column="pi_buyername" jdbcType="VARCHAR" property="pi_buyername" />
+    <result column="pi_sellerid" jdbcType="INTEGER" property="pi_sellerid" />
+    <result column="pi_sellercode" jdbcType="VARCHAR" property="pi_sellercode" />
+    <result column="pi_seller" jdbcType="VARCHAR" property="pi_seller" />
     <result column="pd_piid" jdbcType="INTEGER" property="pd_piid" />
     <result column="pd_inoutno" jdbcType="VARCHAR" property="pd_inoutno" />
     <result column="pd_piclass" jdbcType="VARCHAR" property="pd_piclass" />

applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutMapper.xml

@@ -41,6 +41,12 @@
     <result column="pi_prstatus" jdbcType="VARCHAR" property="pi_prstatus" />
     <result column="pi_prstatuscode" jdbcType="VARCHAR" property="pi_prstatuscode" />
     <result column="pi_currency" jdbcType="VARCHAR" property="pi_currency" />
+    <result column="pi_buyerid" jdbcType="INTEGER" property="pi_buyerid" />
+    <result column="pi_buyercode" jdbcType="VARCHAR" property="pi_buyercode" />
+    <result column="pi_buyername" jdbcType="VARCHAR" property="pi_buyername" />
+    <result column="pi_sellerid" jdbcType="INTEGER" property="pi_sellerid" />
+    <result column="pi_sellercode" jdbcType="VARCHAR" property="pi_sellercode" />
+    <result column="pi_seller" jdbcType="VARCHAR" property="pi_seller" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.purchase.po.ProdInOut">
     <result column="pi_address" jdbcType="LONGVARCHAR" property="pi_address" />
@@ -52,7 +58,7 @@
     pi_id, pi_inoutno, pi_class, pi_date, pi_vendid, pi_vendcode, pi_vendname, pi_custid, 
     pi_custcode, pi_custname, pi_puid, pi_pucode, pi_said, pi_sacode, pi_total, pi_status, pi_statuscode, pi_printstatus, pi_printstatuscode,
     companyid, updaterid,updaterName,updatetime,creatorid,creatorName,createtime, pi_text1, pi_text2, pi_text3, pi_text4, pi_text5,pi_auditdate,
-    pi_auditman,pi_remark,pi_ioid,pi_iocode,pi_prstatus,pi_prstatuscode,pi_currency
+    pi_auditman,pi_remark,pi_ioid,pi_iocode,pi_prstatus,pi_prstatuscode,pi_currency,pi_buyerid,pi_buyercode,pi_buyername,pi_sellerid,pi_sellercode,pi_seller
   </sql>
   <sql id="Blob_Column_List">
     pi_address
@@ -196,6 +202,15 @@
       <if test="pi_currency != null">
         pi_currency,
       </if>
+      <if test="pi_buyerid != null">
+        pi_buyerid,
+      </if>
+      <if test="pi_buyercode != null">
+        pi_buyercode,
+      </if>
+      <if test="pi_buyername != null">
+        pi_buyername,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -318,6 +333,15 @@
       <if test="pi_currency != null">
         #{pi_currency,jdbcType=VARCHAR},
       </if>
+      <if test="pi_buyerid != null">
+        #{pi_buyerid,jdbcType=VARCHAR},
+      </if>
+      <if test="pi_buyercode != null">
+        #{pi_buyercode,jdbcType=VARCHAR},
+      </if>
+      <if test="pi_buyername != null">
+        #{pi_buyername,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
 
@@ -417,6 +441,15 @@
       <if test="pi_currency != null">
         pi_currency = #{pi_currency,jdbcType=VARCHAR},
       </if>
+      <if test="pi_said != null">
+        pi_buyerid = #{pi_buyerid,jdbcType=INTEGER},
+      </if>
+      <if test="pi_currency != null">
+        pi_buyercode = #{pi_buyercode,jdbcType=VARCHAR},
+      </if>
+      <if test="pi_currency != null">
+        pi_buyername = #{pi_buyername,jdbcType=VARCHAR},
+      </if>
     </set>
     where pi_id = #{id,jdbcType=INTEGER}
   </update>

base-servers/sms/sms-server/src/main/resources/config/application-docker-prod.yml

@@ -12,6 +12,10 @@ spring:
     virtual-host: docker
     username: saas
     password: select123***
+  datasource:
+    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    username: saas
+    password: select111***
   redis:
     host: 10.10.100.173
     port: 6379

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

@@ -338,9 +338,9 @@ Ext.define('saas.view.main.MainController', {
                                         "Content-Type": 'application/json;charset=UTF-8'
                                     },
                                     method: 'GET',
-                                    success: function(fp, o){
-                                        var res = Ext.decode(fp.responseText);
-                                        var url = fp.data;
+                                    success: function(response, o){
+                                        var res = Ext.decode(response.responseText);
+                                        var url = res.data;
                                         f.setValue(url)
                                     },
                                     failure: function (response, opts) {