销售出库

src/main/java/com/dk/mdm/controller/sale/OrderController.java

@@ -71,17 +71,6 @@ public class OrderController {
     }
 
     /**
-     * @desc   : 获取订单信息（编辑用）
-     * @author : 付斌
-     * @date   : 2024-03-03 9:28
-     */
-    @ApiOperation(value = "获取订单信息（编辑用）", notes = "获取订单信息（编辑用）")
-    @PostMapping({"get_order_for_update/{id}"})
-    public ResponseResultVO<?> getOrderForUpdate(@PathVariable String id) {
-        return orderService.getOrderForUpdate(id);
-    }
-
-    /**
      * @desc : 编辑订单
      * @author : 付斌
      * @date : 2023/1/9 10:49
@@ -93,6 +82,17 @@ public class OrderController {
     }
 
     /**
+     * @desc   : 获取订单信息（编辑用）
+     * @author : 付斌
+     * @date   : 2024-03-03 9:28
+     */
+    @ApiOperation(value = "获取订单信息（编辑用）", notes = "获取订单信息（编辑用）")
+    @PostMapping({"get_order_for_update/{id}"})
+    public ResponseResultVO<?> getOrderForUpdate(@PathVariable String id) {
+        return orderService.getOrderForUpdate(id);
+    }
+
+    /**
      * @desc   : 获取订单信息（出库用）
      * @author : 付斌
      * @date   : 2024-03-06 12:58
@@ -102,4 +102,15 @@ public class OrderController {
     public ResponseResultVO<?> getOrderForOut(@PathVariable String id) {
         return orderService.getOrderForOut(id);
     }
+
+    /**
+     * @desc   : 获取订单信息（退货用）
+     * @author : 付斌
+     * @date   : 2024-03-06 12:58
+     */
+    @ApiOperation(value = "获取订单信息（退货用）", notes = "获取订单信息（退货用）")
+    @PostMapping({"get_order_for_return/{id}"})
+    public ResponseResultVO<?> getOrderForReturn(@PathVariable String id) {
+        return orderService.getOrderForReturn(id);
+    }
 }

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

@@ -41,5 +41,12 @@ public interface OrderItemMapper extends BaseMapper<OrderItem>{
      * @date   : 2024-03-06 12:59
      */
     List<OrderItemResponse> selectByCondForOut(OrderItemQuery orderQuery);
+
+    /**
+     * @desc   : 根据条件进行查询（退货用）
+     * @author : 付斌
+     * @date   : 2024-03-06 12:59
+     */
+    List<OrderItemResponse> selectByCondForReturn(OrderItemQuery orderQuery);
 }
 

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

@@ -307,4 +307,33 @@
           and tpoi.order_id = #{orderId}::uuid
         order by tpoi.item_index
     </select>
+
+    <!-- 根据条件进行查询（出库用） -->
+    <select id="selectByCondForReturn" resultMap="BaseResultMapResponse">
+        SELECT tpobi.out_id                                         as "outId",
+               tpobi.item_id                                        as "outItemId",
+               tpoi.order_id                                        as order_id,
+               tpoi.item_id                                         as "orderItemId",
+               tpoi.sku_id,
+               tmgs.sku_code                                        as "skuCode",
+               tmgs.sku_model                                       as "skuModel",
+               tmgs.sku_name                                        as "skuName",
+               tpobi.out_qty                                        as out_qty,
+               tpobi.out_qty - tpobi.return_qty                     as "canReturnQty",
+               tpobi.out_qty - tpobi.return_qty                     as item_qty,
+               tpoi.price_std,
+               tpoi.price_std * (tpobi.out_qty - tpobi.return_qty)  as amt_std,
+               tpoi.price_sale                                      as "priceReturn",
+               tpoi.price_sale * (tpobi.out_qty - tpobi.return_qty) as item_amt,
+               tpoi.non_std_code,
+               tpobi.remarks
+        FROM dkic_b.t_psi_outbound_item as tpobi
+                 inner join dkic_b.t_psi_order_item as tpoi on tpoi.item_id = tpobi.from_item_id
+                 inner join dkic_b.t_mst_goods_sku tmgs on tpoi.sku_id = tmgs.sku_id
+        where tpobi.flg_valid
+          and tpobi.out_type = '出库类型-销售出库'
+          and tpobi.out_qty > tpobi.return_qty
+          and tpoi.order_id = #{orderId}::uuid
+        order by tpoi.item_index
+    </select>
 </mapper>

src/main/java/com/dk/mdm/model/response/sale/OrderItemResponse.java

@@ -311,6 +311,22 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
 
     @ApiModelProperty(value = "仓库名称")
     private String whName;
+
+    @ApiModelProperty(value = "出库ID")
+    private String outId;
+
+    @ApiModelProperty(value = "出库明细ID")
+    private String outItemId;
+
+    @ApiModelProperty(value = "订单明细ID")
+    private String orderItemId;
+
+    @ApiModelProperty(value = "可退货数量")
+    private BigDecimal canReturnQty;
+
+    @ApiModelProperty(value = "退货价")
+    private BigDecimal priceReturn;
+
     /*
      * 相关属性
      * @TableField(exist = false)

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

@@ -119,7 +119,9 @@ public class OutboundService extends BaseService<Outbound> {
 					throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ITEMQTY_NO_LESS_OUTQTY.getMessage());
 				}else{
 					OrderItem orderItemUpdate = new OrderItem();
-					orderItemUpdate.setOutingQty(orderItem.getOutingQty().add(outboundItem.getOutingQty())).setItemId(orderItem.getItemId());
+					orderItemUpdate.setOutingQty(orderItem.getOutingQty().add(outboundItem.getOutingQty()))
+							.setOutingAmt(orderItem.getOutingAmt().add(outboundItem.getOutingAmt()))
+							.setItemId(orderItem.getItemId());
 					orderItemService.updateByUuid(orderItemUpdate);
 					// 累加出库中数量，金额
 					sumOutingQty += outboundItem.getOutingQty().doubleValue();

src/main/java/com/dk/mdm/service/sale/OrderService.java

@@ -155,22 +155,6 @@ public class OrderService extends BaseService<Order> {
     }
 
     /**
-     * @desc   : 获取订单信息（编辑用）
-     * @author : 付斌
-     * @date   : 2024-03-02 17:27
-     */
-    public ResponseResultVO<?> getOrderForUpdate(String id) {
-        Map<String, Object> orderInfo = new HashMap<>();
-        OrderResponse orderResponse = orderMapper.selectById(id);
-        orderInfo.put("order", orderResponse);
-
-        // 商品明细
-        List<OrderItemResponse> orderItem = orderItemMapper.selectByCond(new OrderItemQuery().setOrderId(id));
-        orderInfo.put("orderItem", orderItem);
-        return ResponseResultUtil.success(orderInfo);
-    }
-
-    /**
      * @desc : 编辑方法
      * @author : 付斌
      * @date : 2023/1/9 10:49
@@ -218,6 +202,22 @@ public class OrderService extends BaseService<Order> {
     }
 
     /**
+     * @desc   : 获取订单信息（编辑用）
+     * @author : 付斌
+     * @date   : 2024-03-02 17:27
+     */
+    public ResponseResultVO<?> getOrderForUpdate(String id) {
+        Map<String, Object> orderInfo = new HashMap<>();
+        OrderResponse orderResponse = orderMapper.selectById(id);
+        orderInfo.put("order", orderResponse);
+
+        // 商品明细
+        List<OrderItemResponse> orderItem = orderItemMapper.selectByCond(new OrderItemQuery().setOrderId(id));
+        orderInfo.put("orderItem", orderItem);
+        return ResponseResultUtil.success(orderInfo);
+    }
+
+    /**
      * @desc   : 获取订单信息（出库用）
      * @author : 付斌
      * @date   : 2024-03-02 17:27
@@ -232,4 +232,20 @@ public class OrderService extends BaseService<Order> {
         orderInfo.put("orderItem", orderItem);
         return ResponseResultUtil.success(orderInfo);
     }
+
+    /**
+     * @desc   : 获取订单信息（退货用）
+     * @author : 付斌
+     * @date   : 2024-03-02 17:27
+     */
+    public ResponseResultVO<?> getOrderForReturn(String id) {
+        Map<String, Object> orderInfo = new HashMap<>();
+        OrderResponse orderResponse = orderMapper.selectById(id);
+        orderInfo.put("order", orderResponse);
+
+        // 商品明细
+        List<OrderItemResponse> orderItem = orderItemMapper.selectByCondForReturn(new OrderItemQuery().setOrderId(id));
+        orderInfo.put("orderItem", orderItem);
+        return ResponseResultUtil.success(orderInfo);
+    }
 }