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

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

@@ -441,13 +441,13 @@
       <if test="pi_currency != null">
         pi_currency = #{pi_currency,jdbcType=VARCHAR},
       </if>
-      <if test="pi_said != null">
+      <if test="pi_buyerid != null">
         pi_buyerid = #{pi_buyerid,jdbcType=INTEGER},
       </if>
-      <if test="pi_currency != null">
+      <if test="pi_buyercode != null">
         pi_buyercode = #{pi_buyercode,jdbcType=VARCHAR},
       </if>
-      <if test="pi_currency != null">
+      <if test="pi_buyername != null">
         pi_buyername = #{pi_buyername,jdbcType=VARCHAR},
       </if>
     </set>

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

@@ -76,4 +76,12 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
     private String pi_prstatuscode;
 
     private String pi_prstatus;
+
+    private String pi_currency;
+
+    private Integer pi_sellerid;
+
+    private String pi_sellercode;
+
+    private String pi_seller;
 }

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

@@ -497,6 +497,11 @@ 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_sellerid(sourcePi.getPi_sellerid());
+        targetPi.setPi_sellercode(sourcePi.getPi_sellercode());
+        targetPi.setPi_seller(sourcePi.getPi_seller());
         //保存数据
         getMapper().insertSelective(targetPi);
         //插入销售退货单从表

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

@@ -27,6 +27,10 @@
     <result column="pi_text4" jdbcType="VARCHAR" property="pi_text4" />
     <result column="pi_text5" jdbcType="VARCHAR" property="pi_text5" />
     <result column="pi_address" jdbcType="VARCHAR" property="pi_address" />
+    <result column="pi_currency" jdbcType="VARCHAR" property="pi_currency" />
+    <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/sale/sale-server/src/main/resources/mapper/ProdInOutMapper.xml

@@ -37,6 +37,10 @@
       <result column="pi_ioid" jdbcType="INTEGER" property="pi_ioid" />
     <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_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.storage.po.ProdInOut">
     <result column="pi_address" jdbcType="LONGVARCHAR" property="pi_address" />
@@ -234,15 +238,27 @@
       <if test="pi_iocode != null">
         pi_iocode,
       </if>
-        <if test="pi_ioid != null">
+      <if test="pi_ioid != null">
             pi_ioid,
-        </if>
+      </if>
       <if test="pi_prstatus!=null">
         pi_prstatus,
       </if>
       <if test="pi_prstatuscode!=null">
         pi_prstatuscode,
       </if>
+      <if test="pi_currency != null">
+        pi_currency,
+      </if>
+      <if test="pi_sellerid != null">
+        pi_sellerid,
+      </if>
+      <if test="pi_sellercode != null">
+        pi_sellercode,
+      </if>
+      <if test="pi_seller != null">
+        pi_seller,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -342,6 +358,18 @@
       <if test="pi_prstatuscode!=null">
         #{pi_prstatuscode,jdbcType=VARCHAR},
       </if>
+      <if test="pi_currency!=null">
+        #{pi_currency,jdbcType=VARCHAR},
+      </if>
+      <if test="pi_sellerid != null">
+        pi_sellerid = #{pi_sellerid,jdbcType=INTEGER},
+      </if>
+      <if test="pi_sellercode != null">
+        pi_sellercode = #{pi_sellercode,jdbcType=VARCHAR},
+      </if>
+      <if test="pi_seller != null">
+        pi_seller = #{pi_seller,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
@@ -437,6 +465,18 @@
       <if test="pi_prstatuscode!=null">
         pi_prstatuscode = #{pi_prstatuscode,jdbcType=VARCHAR},
       </if>
+      <if test="pi_currency!=null">
+        pi_currency = #{pi_currency,jdbcType=VARCHAR},
+      </if>
+      <if test="pi_sellerid != null">
+        pi_sellerid = #{pi_sellerid,jdbcType=INTEGER},
+      </if>
+      <if test="pi_sellercode!=null">
+        pi_sellercode = #{pi_sellercode,jdbcType=VARCHAR},
+      </if>
+      <if test="pi_seller!=null">
+        pi_seller = #{pi_seller,jdbcType=VARCHAR},
+      </if>
     </set>
     where pi_id = #{id,jdbcType=INTEGER}
   </update>

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

@@ -76,4 +76,12 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
     private String pi_prstatuscode;
 
     private String pi_prstatus;
+
+    private String pi_currency;
+
+    private Integer pi_sellerid;
+
+    private String pi_sellercode;
+
+    private String pi_seller;
 }

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

@@ -146,6 +146,13 @@ public class ProdInOutList extends CommonBaseEntity{
 
     private String pi_iocode;
 
+    private String pi_currency;
+
+    private Integer pi_sellerid;
+
+    private String pi_sellercode;
+
+    private String pi_seller;
     //private ProductDTO productDTO;
     private Long pr_id;
     private String pr_code;