From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/GlassPriceBasicService.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/GlassPriceBasicService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/GlassPriceBasicService.java
index a0b612f..80e510d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/GlassPriceBasicService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/GlassPriceBasicService.java
@@ -79,9 +79,15 @@
name = separation.get("thickness") + separation.get("color");
String[] process = productDetail.getProcess().split("->");
for (String s : process) {
- money[0] += glassPriceBasicMapper.selectOne(
+ GlassPriceBasic glassPriceBasic = glassPriceBasicMapper.selectOne(
new QueryWrapper<GlassPriceBasic>()
- .eq("name", name+s)).getPrice();
+ .eq("name", name+s));
+ if(glassPriceBasic == null) {
+ return 0.0;
+ }else{
+ money[0] += glassPriceBasic.getPrice();
+ }
+
}
break;
case "hollow":
--
Gitblit v1.8.0