订单明细选择原单，销售退货撤销

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

@@ -139,6 +139,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
         <result column="fact_amt" property="factAmt"/>
         <result column="discount" property="discount"/>
         <result column="disc_amt" property="discAmt"/>
+        <result column="out_no" property="outNo"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -222,6 +223,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
     <select id="selectByCond" resultMap="BaseResultMapResponse">
         SELECT tpoi.item_id,
         tpoi.out_id,
+        tpo.out_no,
         tpoi.out_type,
         tpoi.from_id,
         tpoi.from_item_id,
@@ -270,6 +272,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
         u2.unit_name as "subUnitName"
         FROM dkic_b.t_psi_outbound_item as tpoi
         left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpoi.wh_id
+        left join dkic_b.t_psi_outbound as tpo on tpo.out_id = tpoi.out_id
         LEFT JOIN dkic_b.t_mst_supplier as tms ON tpoi.sup_id = tms.sup_id
         LEFT JOIN dkic_b.t_mst_unit AS ul ON tpoi.unit_id = ul.unit_id
         LEFT JOIN dkic_b.t_mst_unit AS u2 ON tpoi.sub_unit_id = u2.unit_id

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -703,6 +703,7 @@
     <select id="selectBySaleOut" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_Response"/>,
+        tpo.ordeer_no  as "orderNo",
         tmc.cus_code as "cusCode",
         tmc.cus_name as "cusName",
         tmc.cus_phone as "cusPhone",

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

@@ -437,6 +437,9 @@ public class OutboundItemResponse {
     @ApiModelProperty(value = "本次出库包装数量")
     private String unitInfo;
 
+    @ApiModelProperty(value = "出库单号")
+    private String outNo;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleReturnService.java

@@ -1080,6 +1080,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
             outboundItemResponse.setInventoryDocCode(Constant.InventoryDocCode.SALE_RETURN.getValue());
             outboundItemResponse.setOutQty(outboundItemResponse.getOutQty().negate());
             outboundItemResponse.setOutAmt(outboundItemResponse.getOutAmt().negate());
+            outboundItemResponse.setAddOrEditFlag(false);
             //endregion
 
             //region修改出库明细信息