fubin il y a 2 ans
Parent
commit
8c44d48a3b

+ 3 - 2
src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -328,9 +328,10 @@
                tmgs.sku_name                                        as "skuName",
                tpobi.out_qty                                        as "outboundOutQty",
                tpobi.out_qty - tpobi.return_qty                     as "canReturnQty",
-               tpobi.out_qty - tpobi.return_qty                     as "outingQty",
+               - (tpobi.out_qty - tpobi.return_qty)                 as outing_qty,
                t.price_sale                                         as "priceOut",
-               t.price_sale * (tpobi.out_qty - tpobi.return_qty)    as "outingAmt",
+               - t.price_sale * (tpobi.out_qty - tpobi.return_qty)  as outing_amt,
+               tpobi.inv_id                                         as "invId",
                t.non_std_code,
                tpobi.remarks
         FROM dkic_b.t_psi_outbound_item as tpobi

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

@@ -156,7 +156,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                         .setOutAmt(BigDecimal.ZERO);
             }
             //入库状态
-            outboundItemVO.setOutStatus(outboundItemVO.getOutStatus());
+            outboundItemVO.setOutStatus(outboundVO.getOutStatus());
             //实体转换
             OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
             outboundItemMapper.insert(outboundItem);

+ 2 - 0
src/main/java/com/dk/mdm/service/sale/OrderService.java

@@ -341,6 +341,8 @@ public class OrderService extends BaseService<Order> {
     public ResponseResultVO<?> getOrderForReturn(String id) {
         Map<String, Object> dataInfo = new HashMap<>();
         OrderResponse orderResponse = orderMapper.selectById(id);
+        // 数量金额取反
+        orderResponse.setSumQuantity(orderResponse.getSumQuantity().negate()).setSumAmount(orderResponse.getSumAmount().negate());
         dataInfo.put("data", orderResponse);
 
         // 商品明细