From 84b131de4a1deb526066fc0f7e7514ac43838bf8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 08 八月 2026 16:16:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index d3712b1..d1fe581 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -254,6 +254,9 @@
}
productOrderMapper.updateById(productOrder);
/*娣诲姞鐢熶骇鏍哥畻 鍖哄垎宸ュ簭鏄浠惰繕鏄鏃�*/
+ if (productProcess.getSalaryQuota() == null){
+ throw new IllegalArgumentException("璇疯缃搴斿伐搴忓伐璧勫畾棰�");
+ }
BigDecimal workHours = (productProcess.getType() == 1)
? productProcess.getSalaryQuota().multiply(productQty)
: productProcess.getSalaryQuota();
--
Gitblit v1.9.3