From 48d6408e92431e23351afff0eb7e667eaa8c6cc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Fri, 28 Nov 2025 10:12:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=B7=BB=E5=8A=A0=E5=90=AB=E7=A8=8E=E5=8D=95=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zt/plat/module/contractorder/api/OrderApiImpl.java | 1 + .../admin/salesorder/vo/SalesOrderDetailRespVO.java | 2 ++ .../admin/salesorder/vo/SalesOrderDetailSaveReqVO.java | 8 ++++++-- .../dal/dataobject/salesorder/SalesOrderDetailDO.java | 5 +++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java index 614b09ae..fb082d9f 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java @@ -239,6 +239,7 @@ public class OrderApiImpl implements OrderApi { ordDtlDTO.setLstQty(s.getTrfQty()); ordDtlDTO.setRmk(s.getRemark()); ordDtlDTO.setTaxRte(s.getTaxRte()); + ordDtlDTO.setInTaxUprc(s.getInTaxUnitPrice()); } return ordDtlDTO; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailRespVO.java index e7950fee..8ddb35c5 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailRespVO.java @@ -121,4 +121,6 @@ public class SalesOrderDetailRespVO { @Schema(description = "备注") private String remark; + @Schema(description = "含税单价") + private BigDecimal inTaxUnitPrice; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailSaveReqVO.java index e5cb8d65..62fa61a6 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailSaveReqVO.java @@ -2,8 +2,11 @@ package com.zt.plat.module.contractorder.controller.admin.salesorder.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; + import java.util.*; + import jakarta.validation.constraints.*; + import java.math.BigDecimal; @Schema(description = "管理后台 - 销售订单明细新增/修改 Request VO") @@ -19,7 +22,7 @@ public class SalesOrderDetailSaveReqVO { @Schema(description = "行项目;推送ERP(必须)", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "行项目;推送ERP(必须)不能为空") - private Long lineNumber; + private Long lineNumber; @Schema(description = "物料名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") @NotEmpty(message = "物料名称不能为空") @@ -101,5 +104,6 @@ public class SalesOrderDetailSaveReqVO { @Schema(description = "备注") private String remark; - + @Schema(description = "含税单价") + private BigDecimal inTaxUnitPrice; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDetailDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDetailDO.java index fc403c60..1c1a403a 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDetailDO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDetailDO.java @@ -166,4 +166,9 @@ public class SalesOrderDetailDO extends BusinessBaseDO { */ @TableField("RMK") private String remark; + /** + * 含税单价 + */ + @TableField("IN_TAX_UPRC") + private BigDecimal inTaxUnitPrice; }