From 93104c7cbb24e57091117b37efb33cac756935f4 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: Thu, 4 Dec 2025 10:35:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=8A=E6=9A=82=E4=BC=B0=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E6=94=B9=E6=88=90=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/purchaseorder/vo/PrchOrdDtlDetailsRespVO.java         | 2 +-
 .../controller/admin/purchaseorder/vo/PrchOrdDtlRespVO.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PrchOrdDtlDetailsRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PrchOrdDtlDetailsRespVO.java
index a059eef8..bb7d12d7 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PrchOrdDtlDetailsRespVO.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PrchOrdDtlDetailsRespVO.java
@@ -57,7 +57,7 @@ public class PrchOrdDtlDetailsRespVO {
      * 暂估数量;推送ERP（必须）
      */
 
-    private String qty;
+    private BigDecimal qty;
     /**
      * 计量单位;推送ERP（必须）
      */
diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PrchOrdDtlRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PrchOrdDtlRespVO.java
index d2e296b3..4eeca21c 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PrchOrdDtlRespVO.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PrchOrdDtlRespVO.java
@@ -51,7 +51,7 @@ public class PrchOrdDtlRespVO {
 
     @Schema(description = "暂估数量;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("暂估数量;推送ERP（必须）")
-    private String qty;
+    private BigDecimal qty;
 
     @Schema(description = "计量单位;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("计量单位;推送ERP（必须）")

From 088a7c3f2d009eecffe599b73e0381ba5e825ecc 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: Thu, 4 Dec 2025 17:20:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85Feign?=
 =?UTF-8?q?=E8=80=81=E8=A1=97=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=B2=A1=E6=9C=89=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zt/plat/module/contractorder/api/ContractApiImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java
index 5ca45d3e..e3e3f780 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java
@@ -674,7 +674,9 @@ public class ContractApiImpl implements ContractApi {
     @Override
     public CommonResult<SalesOrdDtlDTO> getSalesOrderDetailById(Long id) {
         SalesOrderDetailDO salesOrderDetailDO = SpringUtil.getBean(SalesOrderDetailMapper.class).selectOne(SalesOrderDetailDO::getId, id);
-        return success(BeanUtils.toBean(salesOrderDetailDO, SalesOrdDtlDTO.class));
+        SalesOrdDtlDTO salesOrdDtlDTO = BeanUtils.toBean(salesOrderDetailDO, SalesOrdDtlDTO.class);
+        salesOrdDtlDTO.setUnit(salesOrderDetailDO.getUnt());
+        return success(salesOrdDtlDTO);
     }
 
     @Override