From 6bb66501148afcd970188ed122e2ee37908e3127 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 25 五月 2026 13:45:17 +0800
Subject: [PATCH] feat: 报工投入用“投入重量/数量”

---
 src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 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 e5b5843..2ab812a 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -204,9 +204,9 @@
 
             BigDecimal previousCompleteQty =
                     previousWorkOrder.getCompleteQuantity() == null ? BigDecimal.ZERO : previousWorkOrder.getCompleteQuantity();
-            if (currentReportedQty.add(reportQty).compareTo(previousCompleteQty) > 0) {
-                throw new ServiceException("鏈鎶ュ伐鏁伴噺瓒呰繃涓婇亾宸ュ簭鍙祦杞暟閲�");
-            }
+//            if (currentReportedQty.add(reportQty).compareTo(previousCompleteQty) > 0) {
+//                throw new ServiceException("鏈鎶ュ伐鏁伴噺瓒呰繃涓婇亾宸ュ簭鍙祦杞暟閲�");
+//            }
 
             List<ProductProcessRouteItem> previousItems = productProcessRouteItemMapper.selectList(
                     Wrappers.<ProductProcessRouteItem>lambdaQuery()
@@ -250,10 +250,10 @@
                     .filter(Objects::nonNull)
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
         }
-        if (productWorkOrder.getPlanQuantity() != null
-                && currentWorkOrderReportedQty.add(reportQty).compareTo(productWorkOrder.getPlanQuantity()) > 0) {
-            throw new ServiceException("鏈鎶ュ伐鏁伴噺瓒呰繃宸ュ崟鍙姤鏁伴噺");
-        }
+//        if (productWorkOrder.getPlanQuantity() != null
+//                && currentWorkOrderReportedQty.add(reportQty).compareTo(productWorkOrder.getPlanQuantity()) > 0) {
+//            throw new ServiceException("鏈鎶ュ伐鏁伴噺瓒呰繃宸ュ崟鍙姤鏁伴噺");
+//        }
 
         // 绗簲姝ワ細鐢熸垚鎶ュ伐鍗曞彿骞剁‘瀹氭姤宸ヤ汉淇℃伅
         String productNo;

--
Gitblit v1.9.3