From 29147f682c6ea31ed24c88dac14df198c43716e0 Mon Sep 17 00:00:00 2001
From: mzr <mengzhaorui@qq.com>
Date: Fri, 7 Nov 2025 19:23:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(material):=E4=BC=98=E5=8C=96=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E8=AE=A1=E5=88=92=20wasterrate-=E5=BA=9F=E5=93=81?=
 =?UTF-8?q?=E7=8E=87=20=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91-=20=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=20wasterrate=20=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uapbd/material/action/MaterialJmPushToQyMesAction.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialJmPushToQyMesAction.java b/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialJmPushToQyMesAction.java
index 57b5eb36..07a00af8 100644
--- a/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialJmPushToQyMesAction.java
+++ b/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialJmPushToQyMesAction.java
@@ -102,8 +102,11 @@ public class MaterialJmPushToQyMesAction implements ICommonAction {
             UFDouble wasterrate = UFDouble.ZERO_DBL;
             if (MMValueCheck.isNotEmpty(planMap) &&
                     MMValueCheck.isNotEmpty(planMap.get(pkMaterial))) {
-                qyCode = planMap.get(pkMaterial).getDef2();
-                wasterrate = planMap.get(pkMaterial).getWasterrate();
+                MaterialPlanVO planVO = planMap.get(pkMaterial);
+                qyCode = planVO.getDef2();
+                if (MMValueCheck.isNotEmpty(planVO.getWasterrate())) {
+                    wasterrate = planVO.getWasterrate();
+                }
             } else {
                 qyCode = vo.getCode();
             }