退货单关联出货单号

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

@@ -31,4 +31,6 @@ public class StockTaking extends CommonBaseEntity implements Serializable {
 
     private Double st_num;
 
+    private String pr_brand;
+
 }

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

@@ -27,6 +27,8 @@ public class ProdinoutCountView implements Serializable{
     private Double pwm_endqty;
     private Double pwm_endamount;
     private Integer companyid;
+    private String pr_orispeccode;
+    private String pr_barnd;
 
 
 }

applications/storage/storage-server/src/main/resources/mapper/ProdInOutReportMapper.xml

@@ -33,6 +33,8 @@
     <result column="pr_detail" jdbcType="VARCHAR" property="pr_detail" />
     <result column="pr_spec" jdbcType="VARCHAR" property="pr_spec" />
     <result column="pr_unit" jdbcType="VARCHAR" property="pr_unit" />
+    <result column="pr_barnd" jdbcType="VARCHAR" property="pr_barnd" />
+    <result column="pr_orispeccode" jdbcType="VARCHAR" property="pr_orispeccode" />
     <result column="wh_description" jdbcType="VARCHAR" property="wh_description" />
     <result column="pwm_beginqty" jdbcType="DOUBLE" property="pwm_beginqty" />
     <result column="pwm_beginamount" jdbcType="DOUBLE" property="pwm_beginamount" />

applications/storage/storage-server/src/main/resources/mapper/StockTakingMapper.xml

@@ -22,6 +22,7 @@
     <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="updaterName" jdbcType="TIMESTAMP" property="updaterName" />
     <result column="updaterId" jdbcType="INTEGER" property="updaterId" />
+    <result column="pr_brand" jdbcType="VARCHAR" property="pr_brand" />
   </resultMap>
   <sql id="Base_Column_List">
     st_id, st_prodid, st_prodcode, st_proddetail, st_prodorispeccode, st_prodkind, st_produnit, 
@@ -231,8 +232,8 @@
 
   <select id="selectStockTakingBycondition" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List" />
-    from stocktaking
+    stocktaking.*,pr_brand
+    from stocktaking left join product on pr_id = st_prodid
     <where>
       <if test="con != null">
         ${con}