From c6fc15962080f9eb54e17b8a0e14adaa8cf8291f Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 21 Feb 2025 09:49:01 +0800 Subject: [PATCH] =?UTF-8?q?2/21=20=E5=90=8C=E6=AD=A5=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B91.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/purchase/PurArrivalController.java | 2 +- .../glxp/api/controller/purchase/PurDeliveryController.java | 2 +- .../glxp/api/controller/purchase/PurOrderController.java | 2 +- .../com/glxp/api/controller/purchase/PurPlanController.java | 2 +- .../glxp/api/controller/purchase/PurReturnedController.java | 2 +- .../java/com/glxp/api/entity/basic/BasicProductsEntity.java | 6 +++++- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java b/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java index 46acc744..ad42e043 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java @@ -212,7 +212,7 @@ public class PurArrivalController extends BaseController { ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname()); ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh()); if (basicProductsEntity.getPrice() != null) { - ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice())); + ioOrderDetailBizEntity.setPrice(basicProductsEntity.getPrice()); } ioOrderDetailBizEntity.setSupId(obj.getSupId()); ioOrderDetailBizService.insert(ioOrderDetailBizEntity); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java b/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java index f3034563..71af97c2 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java @@ -220,7 +220,7 @@ public class PurDeliveryController extends BaseController { ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname()); ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh()); if (basicProductsEntity.getPrice() != null) { - ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice())); + ioOrderDetailBizEntity.setPrice(basicProductsEntity.getPrice()); } ioOrderDetailBizEntity.setSupId(obj.getSupId()); ioOrderDetailBizService.insert(ioOrderDetailBizEntity); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java index 74fa2a7a..1746b755 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java @@ -288,7 +288,7 @@ public class PurOrderController { ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname()); ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh()); if (basicProductsEntity.getPrice() != null) { - ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice())); + ioOrderDetailBizEntity.setPrice(basicProductsEntity.getPrice()); } ioOrderDetailBizEntity.setSupId(obj.getSupId()); ioOrderDetailBizService.insert(ioOrderDetailBizEntity); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java index 03771ef7..5e4f75c6 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java @@ -240,7 +240,7 @@ public class PurPlanController { ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname()); ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh()); if (basicProductsEntity.getPrice() != null) { - ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice())); + ioOrderDetailBizEntity.setPrice(basicProductsEntity.getPrice()); } ioOrderDetailBizEntity.setSupId(obj.getSupId()); ioOrderDetailBizService.insert(ioOrderDetailBizEntity); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java b/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java index e4bb606a..8eaa6b03 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java @@ -209,7 +209,7 @@ public class PurReturnedController extends BaseController { ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname()); ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh()); if (basicProductsEntity.getPrice() != null) { - ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice())); + ioOrderDetailBizEntity.setPrice(basicProductsEntity.getPrice()); } ioOrderDetailBizEntity.setSupId(obj.getSupId()); ioOrderDetailBizService.insert(ioOrderDetailBizEntity); diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java index 4122676c..94f91608 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; @Data @@ -272,8 +273,11 @@ public class BasicProductsEntity { /** * 价格 */ +// @TableField(value = "price") +// private Long price; + @TableField(value = "price") - private Long price; + private BigDecimal price; /** * 备注字段1