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