Merge remote-tracking branch 'origin/master'

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

@@ -216,9 +216,14 @@
         tmgs.sku_code AS sku_code,
         tmgs.sku_name AS sku_name,
         tmgs.sku_model AS sku_model,
-        tmgs.sku_images AS sku_images
+        tmgs.sku_images AS sku_images,
+        tpii.into_qty as "intoQty",
+        tpii.into_amt as "intoAmt",
+        tpii.return_qty as "returnQty",
+        tpii.return_amt as "returnAmt"
         FROM dkic_b.t_psi_into_return_item  tpiri
         left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tpiri.sku_id
+        left join dkic_b.t_psi_inbound_item tpii on tpiri.into_item_id = tpii.item_id
         <include refid="Condition_Join"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}

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

@@ -248,6 +248,36 @@ public class IntoReturnItemResponse  {
     @ApiModelProperty(value = "仓库名称")
     private String whName;
 
+    /**
+     * 已入库数量
+     */
+    @Excel(name = "已入库数量")
+    @ApiModelProperty(value = "已入库数量")
+    private BigDecimal intoQty;
+
+
+    /**
+     * 已入库金额
+     */
+    @Excel(name = "已入库金额")
+    @ApiModelProperty(value = "已入库金额")
+    private BigDecimal intoAmt;
+
+    /**
+     * 已入库退货数量
+     */
+    @Excel(name = "已入库退货数量")
+    @ApiModelProperty(value = "已入库退货数量")
+    private BigDecimal returnQty;
+
+
+    /**
+     * 已入库退货金额
+     */
+    @Excel(name = "已入库退货金额")
+    @ApiModelProperty(value = "已入库退货金额")
+    private BigDecimal returnAmt;
+
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/service/pur/PurchaseService.java

@@ -245,7 +245,7 @@ public class PurchaseService extends BaseService<Purchase> {
             }
         }
         return ResponseResultUtil.success(super.update(purchase, new UpdateWrapper<Purchase>().lambda().eq(Purchase::getPurId,
-                UUID.fromString(purchase.getPurId()))));
+                UUID.fromString(purchase.getPurId ()))));
     }
 
     /**