From a533b1eb49d29d3fcc0fd1b16eaa51ad3f05a0a3 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: Tue, 25 Nov 2025 16:40:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zt/plat/module/contractorder/api/OrderApiImpl.java | 1 + .../admin/purchaseorder/vo/DownOrUpOrderRespVO.java | 2 -- .../admin/salesorder/vo/SalesOrderDetailRespVO.java | 2 ++ .../admin/salesorder/vo/SalesOrderDetailSaveReqVO.java | 3 +++ .../dal/dataobject/salesorder/SalesOrderDetailDO.java | 6 ++++++ 5 files changed, 12 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 c4d9fad4..76c193f2 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 @@ -231,6 +231,7 @@ public class OrderApiImpl implements OrderApi { ordDtlDTO.setIsEnable(s.getIsEnable()); ordDtlDTO.setTaxNum(s.getTaxAcctasscat()); ordDtlDTO.setTrfQty(s.getTrfQty()); + ordDtlDTO.setRmk(s.getRemark()); } return ordDtlDTO; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/DownOrUpOrderRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/DownOrUpOrderRespVO.java index 8533e852..31b7f291 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/DownOrUpOrderRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/DownOrUpOrderRespVO.java @@ -1,7 +1,5 @@ package com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo; -import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SaleOrderDetailsRespVO; -import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderRespVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; 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 98f89b24..e7950fee 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 @@ -119,4 +119,6 @@ public class SalesOrderDetailRespVO { @Schema(description = "单位", requiredMode = Schema.RequiredMode.REQUIRED) private String unt; + @Schema(description = "备注") + private String remark; } 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 499eadcd..e5cb8d65 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 @@ -99,4 +99,7 @@ public class SalesOrderDetailSaveReqVO { @Schema(description = "税率") private String taxRte; + @Schema(description = "备注") + private String remark; + } 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 31642439..05c2753c 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 @@ -157,4 +157,10 @@ public class SalesOrderDetailDO extends BusinessBaseDO { @TableField("TRF_QTY") private BigDecimal trfQty; + + /** + * 备注 + */ + @TableField("RMK") + private String remark; } From 75341ca6a923b8734a31640adc12001985e67e0f Mon Sep 17 00:00:00 2001 From: chenbowen Date: Tue, 25 Nov 2025 18:54:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=20=E5=90=8C=E6=AD=A5=20nacos=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=88=B0=E4=B8=9A=E5=8A=A1=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index a2757fab..2f6fbb30 100644 --- a/pom.xml +++ b/pom.xml @@ -179,8 +179,8 @@ 172.16.46.63:30848 dev DEFAULT_GROUP - - + nacos + P@ssword25 1.0.0 @@ -192,8 +192,8 @@ 172.16.46.63:30848 prod DEFAULT_GROUP - - + nacos + P@ssword25 1.0.0 @@ -205,8 +205,8 @@ 172.16.46.63:30848 local DEFAULT_GROUP - - + nacos + P@ssword25 1.0.0