修改退货

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

@@ -5,6 +5,7 @@ import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.ivt.OutboundItemQuery;
 import com.dk.mdm.model.response.ivt.InboundItemResponse;
 import com.dk.mdm.model.response.ivt.OutboundItemResponse;
+import com.dk.mdm.model.response.sale.OutReturnItemResponse;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -43,6 +44,12 @@ public interface OutboundItemMapper extends BaseMapper<OutboundItem>{
      */
     List<OutboundItemResponse> selectByCondForOutEdit(String id);
 
+    /**
+     * @desc   : 获取退货信息（退货编辑用）
+     * @author : 付斌
+     * @date   : 2024-03-12 11:07
+     */
+    List<OutboundItemResponse> selectByCondForReturnEdit(String id);
 
     /**
      * @desc   : 根据id查询

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

@@ -335,4 +335,32 @@
           and tpoi.out_id = #{id}::uuid
         order by tpoi.item_index
     </select>
+
+    <!-- 根据条件进行查询（退货编辑用） -->
+    <select id="selectByCondForReturnEdit" resultMap="BaseResultMapResponse">
+        SELECT t.item_id,
+               t.out_id,
+               t.s_out_id,
+               t.s_out_item_id,
+               t.s_order_id,
+               t.s_order_item_id,
+               t.item_index,
+               t.sku_id,
+               tmgs.sku_code                                   as "skuCode",
+               tmgs.sku_model                                  as "skuModel",
+               tmgs.sku_name                                   as "skuName",
+               tpobi.out_qty                                   as "outboundOutQty",
+               tpobi.out_qty - tpobi.return_qty - t.outing_qty as "canReturnQty",
+               t.outing_qty,
+               t.price_out,
+               t.outing_amt,
+               t.non_std_code,
+               t.remarks
+        FROM dkic_b.t_psi_outbound_item as t
+                 left join dkic_b.t_psi_outbound_item as tpobi on tpobi.item_id = t.s_out_item_id
+                 left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = t.sku_id
+        where t.flg_valid
+          and t.out_id = #{id}::uuid
+        order by t.item_index
+    </select>
 </mapper>

src/main/java/com/dk/mdm/model/pojo/ivt/OutboundItem.java

@@ -285,15 +285,19 @@ public class OutboundItem extends PageInfo<OutboundItem> implements Serializable
     private String opDbUser;
 
     @ApiModelProperty(value = "源出库单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
     private String sOutId;
 
     @ApiModelProperty(value = "源出库单明细ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
     private String sOutItemId;
 
     @ApiModelProperty(value = "源销售订单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
     private String sOrderId;
 
     @ApiModelProperty(value = "源销售明细ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
     private String sOrderItemId;
 
 

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

@@ -265,6 +265,11 @@ public class OutboundItemResponse {
     @ApiModelProperty(value = "源销售明细ID")
     private String sOrderItemId;
 
+    @ApiModelProperty(value = "已出库数量")
+    private BigDecimal outboundOutQty;
+
+    @ApiModelProperty(value = "可退货数量")
+    private BigDecimal canReturnQty;
 
     private static final long serialVersionUID = 1L;
 

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

@@ -26,6 +26,8 @@ import com.dk.mdm.model.query.ivt.OutboundItemQuery;
 import com.dk.mdm.model.query.ivt.OutboundQuery;
 import com.dk.mdm.model.response.ivt.OutboundItemResponse;
 import com.dk.mdm.model.response.ivt.OutboundResponse;
+import com.dk.mdm.model.response.sale.OutReturnItemResponse;
+import com.dk.mdm.model.response.sale.OutReturnResponse;
 import com.dk.mdm.model.vo.ivt.OutboundItemVO;
 import com.dk.mdm.model.vo.ivt.OutboundVO;
 import com.dk.mdm.service.common.CommonService;
@@ -613,6 +615,22 @@ public class OutboundService extends BaseService<Outbound> {
     }
 
     /**
+     * @desc : 获取退货信息（编辑用）
+     * @author : 付斌
+     * @date : 2024-03-02 17:27
+     */
+    public ResponseResultVO<?> getOutReturnForUpdate(String id) {
+        Map<String, Object> dataInfo = new HashMap<>();
+        OutboundResponse outboundResponse = outboundMapper.selectById(id);
+        dataInfo.put("data", outboundResponse);
+
+        // 商品明细
+        List<OutboundItemResponse> outboundItemResponse = outboundItemMapper.selectByCondForReturnEdit(id);
+        dataInfo.put("dataItem", outboundItemResponse);
+        return ResponseResultUtil.success(dataInfo);
+    }
+
+    /**
      * @desc : 采购退货出库
      * @author : 于继渤
      * @date : 2023/1/9 10:49