超市接口修改

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;
+
+
 }

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 = "包装对象集合对象")

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));
     }