From d61a22ccd7bb2a3c58604b2bcf915e8192c91583 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 6 May 2025 11:14:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B8=82=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InventoryRecordSaveItemDTO.java              |  4 ++++
 .../inventoryrecord/InventoryRecordItemVo.java   | 16 ++++++++++------
 .../SmErpInventoryRecordsController.java         |  1 +
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveItemDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveItemDTO.java
index d45ee8992..a79f63cc6 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveItemDTO.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveItemDTO.java
@@ -52,4 +52,8 @@ public class InventoryRecordSaveItemDTO {
     private Long unitId;
 
 
+	@Schema(description="实际进价")
+	private Integer realPrice;
+
+
 }
\ No newline at end of file
diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/InventoryRecordItemVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/InventoryRecordItemVo.java
index c9f294d7b..999089648 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/InventoryRecordItemVo.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/inventoryrecord/InventoryRecordItemVo.java
@@ -44,16 +44,16 @@ public class InventoryRecordItemVo {
 	* 进价
 	*/
     @Schema(description="进价")
-	@JsonSerialize(using = MoneySerializer.class) // 分 -> 元
-	@JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
+//	@JsonSerialize(using = MoneySerializer.class) // 分 -> 元
+//	@JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
     private Integer unitPrice;
 
 	/**
 	* 累计总金额
 	*/
     @Schema(description="累计总金额")
-	@JsonSerialize(using = MoneySerializer.class) // 分 -> 元
-	@JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
+//	@JsonSerialize(using = MoneySerializer.class) // 分 -> 元
+//	@JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
     private Integer totalAmount;
 
 	/**
@@ -87,12 +87,16 @@ public class InventoryRecordItemVo {
 	@Schema(description="装数")
 	private Integer packageNum;
 
+
+	@Schema(description="实际进价")
+	private Integer realPrice;
+
 	/**
 	 * 进价（分为单位）
 	 */
 	@Schema(description="进价（分为单位）")
-	@JsonSerialize(using = MoneySerializer.class) // 分 -> 元
-	@JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
+//	@JsonSerialize(using = MoneySerializer.class) // 分 -> 元
+//	@JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
 	private Integer purchasePrice;
 
 	@Schema(description = "包装对象集合对象")
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsController.java
index d12e8d0c0..68a0cdb93 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsController.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpInventoryRecordsController.java
@@ -87,6 +87,7 @@ public class SmErpInventoryRecordsController {
         wrapper.eq(SmErpInventoryRecordsEntity::getInventoryType, smErpInventoryRecords.getInventoryType());
         wrapper.eq(StrUtil.isNotBlank(smErpInventoryRecords.getInventoryCode()),SmErpInventoryRecordsEntity::getInventoryCode,smErpInventoryRecords.getInventoryCode());
         wrapper.eq(null!=smErpInventoryRecords.getInventoryDate(),SmErpInventoryRecordsEntity::getInventoryDate,smErpInventoryRecords.getInventoryDate());
+        wrapper.orderByDesc(SmErpInventoryRecordsEntity::getCreateTime);
         return R.ok(smErpInventoryRecordsService.pageScope(page, wrapper));
     }