From c27bbcc497711df8b13d096f4917b5a8f16508c9 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期日, 28 九月 2025 10:28:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/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..598e748 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) {
+ money[0] += 0.0;
+ }else{
+ money[0] += glassPriceBasic.getPrice();
+ }
+
}
break;
case "hollow":
--
Gitblit v1.8.0