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

@@ -66,6 +66,22 @@ public class ShareController {
         }
     }
 
+    /**
+     * 生成分享链接
+     * @param basePath
+     * @param companyName
+     * @param delay
+     * @return
+     */
+    @GetMapping("/pc")
+    public Result getPcUrl(String basePath, String companyName, @RequestParam(value = "delay", defaultValue = "1")Long delay){
+        Long companyId = BaseContextHolder.getCompanyId();
+        String username = BaseContextHolder.getUserName();
+        String params = "username=" + username + "&companyId=" + companyId + "&timestamp=" + new Date().getTime() + "&delay=" + delay + "&companyName=" + companyName;
+        String encodeParams = new String(UrlBase64.encode(params.getBytes()));
+        return Result.success(basePath + "/#/invitation" + "?param=" + encodeParams);
+    }
+
     /**
      * 将前台传入的encode参数decode并校验,返回给前端
      * @param param

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

@@ -90,6 +90,8 @@ public class ProdIODetailDTO implements Serializable {
 
     private Double pd_ordertotal;
 
+    private String pd_iocode;
+
     private ProductDTO productDTO;
 
 }

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

@@ -39,6 +39,7 @@
     <result column="pd_text4" jdbcType="VARCHAR" property="pd_text4" />
     <result column="pd_text5" jdbcType="VARCHAR" property="pd_text5" />
     <result column="pd_remark" jdbcType="VARCHAR" property="pd_remark" />
+    <result column="pi_iocode" jdbcType="VARCHAR" property="pd_iocode" />
     <result column="pd_ym" jdbcType="INTEGER" property="pd_ym" />
     <result column="pd_yqty" jdbcType="INTEGER" property="pd_yqty" />
     <result column="pd_ioid" jdbcType="INTEGER" property="pd_ioid" />
@@ -746,6 +747,7 @@
 
   <select id="selectByFK" parameterType="long" resultMap="BaseResultMap">
     select * from prodiodetail a left join product b on b.pr_id= a.pd_prodid and a.companyid = b.companyid
+    left join prodinout on pi_id = pd_piid
     where pd_piid=#{id} order by pd_pdno
   </select>
 

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdIODetail.java

@@ -63,6 +63,8 @@ public class ProdIODetail extends CommonBaseEntity implements Serializable {
 
     private Long pd_sdid;
 
+    private String pd_iocode;
+
     private Integer pd_status;
 
     private String pd_text1;