From 4b280f60cfab7a27aa947a180315b67cb819ed08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 11 Jun 2023 22:53:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E4=BB=B7=E6=AF=8F=E4=B8=AA=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E7=9A=84=E4=BB=B7=E6=A0=BC=EF=BC=88=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsh/erp/controller/MaterialController.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
index c2463960..61bcf36a 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
@@ -488,7 +488,8 @@ public class MaterialController {
                             mvo.setBillPrice(mvo.getWholesaleDecimal());
                         } else {
                             //查询最后一单的销售价,实现不同的客户不同的销售价
-                            mvo.setBillPrice(depotItemService.getLastUnitPriceByParam(organId, mvo.getMeId(), prefixNo));
+                            BigDecimal lastUnitPrice = depotItemService.getLastUnitPriceByParam(organId, mvo.getMeId(), prefixNo);
+                            mvo.setBillPrice(lastUnitPrice!=null? lastUnitPrice : mvo.getWholesaleDecimal());
                         }
                     }
                     //仓库id