From ed32b4831acf1612d23015d85ff4a14db7f9f77d Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期三, 16 七月 2025 15:07:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MesRcJobreportServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MesRcJobreportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MesRcJobreportServiceImpl.java
index 333d09d..20fdc8f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MesRcJobreportServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MesRcJobreportServiceImpl.java
@@ -58,8 +58,8 @@
MesRcJobreport mesRcJobreport = new MesRcJobreport();
mesRcJobreport.setBillDate(map.get("thedate").toString());
mesRcJobreport.setDeviceNumber(map.get("deviceNumber").toString());
- mesRcJobreport.setOkuqty(new BigDecimal(map.get("okuqty").toString()));
- mesRcJobreport.setQty(new BigDecimal(map.get("qty").toString()));
+ mesRcJobreport.setOkuqty(map.get("okuqty") == null ? BigDecimal.ZERO : new BigDecimal(map.get("okuqty").toString()));
+ mesRcJobreport.setQty(map.get("qty") == null ? BigDecimal.ZERO : new BigDecimal(map.get("qty").toString()));
return mesRcJobreport;
}).collect(Collectors.toList());
--
Gitblit v1.9.3