From 6b68b16f29da2f7961da766cc84c70a90338cc8b Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Mon, 7 Apr 2025 16:24:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=87=91=E9=A2=9D=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supermarket/vo/cgdd/SmeErpCgDdItemVo.java        |  4 ++--
 .../supermarket/vo/cgplan/SmErpCgPlanItemVo.java     | 12 ++++++------
 .../supermarket/controller/SmErpCgDdController.java  |  1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgdd/SmeErpCgDdItemVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgdd/SmeErpCgDdItemVo.java
index 2bf988ee4..53bb03b4e 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgdd/SmeErpCgDdItemVo.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgdd/SmeErpCgDdItemVo.java
@@ -87,8 +87,8 @@ public class SmeErpCgDdItemVo {
 	 * 进价（分为单位）
 	 */
 	@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-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgplan/SmErpCgPlanItemVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgplan/SmErpCgPlanItemVo.java
index f24d4932e..b61e7dc78 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgplan/SmErpCgPlanItemVo.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/cgplan/SmErpCgPlanItemVo.java
@@ -43,16 +43,16 @@ public class SmErpCgPlanItemVo {
 	* 进价
 	*/
     @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;
 
 	/**
@@ -90,8 +90,8 @@ public class SmErpCgPlanItemVo {
 	 * 进价（分为单位）
 	 */
 	@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/SmErpCgDdController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgDdController.java
index 963ada442..07c808a18 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgDdController.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgDdController.java
@@ -204,7 +204,6 @@ public class SmErpCgDdController {
         wrapper.eq(Objects.nonNull(cGPlanLinkQueryDTO.getPlanDate()),SmErpCgPlanEntity::getPlanDate,cGPlanLinkQueryDTO.getPlanDate());
         //只查询未关联的
         wrapper.eq(SmErpCgPlanEntity::getLinkStatus,"0");
-        //todo 审核成功条件
         wrapper.eq(SmErpCgPlanEntity::getCheckStatus, TaskCheckStatusEnum.RESULT.getCode());
         return R.ok(smErpCgPlanService.pageCgsqScope(page, wrapper));
     }