采购退货

src/main/java/com/dk/mdm/mapper/ivt/IntoReturnMapper.xml

@@ -105,6 +105,7 @@
         <result column="return_address" property="returnAddress"/>
         <result column="out_status_name" property="outStatusName"/>
         <result column="return_status_name" property="returnStatusName"/>
+        <result column="into_id" property="intoId"/>
 
     </resultMap>
 
@@ -342,12 +343,14 @@
         SELECT
         <include refid="Base_Column_List_Response"/>,
         <include refid="Base_Column_List_Join"/>
+        ,tpi.into_id as into_id
         FROM dkic_b.t_psi_into_return  tpir
         left join  dkic_b.t_mst_supplier tms  on  tms.sup_id = tpir.sup_id
         left join  dkic_b.t_mst_staff tmsf  on  tmsf.staff_id = tpir.staff_id
         left join  dkic_b.t_mst_org tmo  on  tmo.org_id = tpir.org_id
         left join  sys.t_data_kind tdk1 on  tdk1.kind_code = tpir.out_status
         left join  sys.t_data_kind tdk2 on  tdk2.kind_code = tpir.return_status
+        left join  dkic_b.t_psi_inbound tpi on tpi.from_id = tpir.return_id
         <include refid="Condition_Response"/>
             order by tpir.op_create_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">

src/main/java/com/dk/mdm/model/response/ivt/IntoReturnResponse.java

@@ -324,6 +324,13 @@ public class IntoReturnResponse  {
     @ApiModelProperty(value = "退货状态")
     private String returnStatusName;
 
+    /**
+     * 入库ID
+     */
+    @Excel(name = "入库ID")
+    @ApiModelProperty(value = "入库ID")
+    private String intoId;
+
     private static final long serialVersionUID = 1L;
 
 }