From 4d99e718536ac77dff26dde8da7a59cdc9b52de8 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 10:13:57 +0800
Subject: [PATCH] fix:1.生产报工优化
---
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
index 29378ac..982009f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -69,7 +69,7 @@
} else {
// 涓婁竴涓伐搴忔槸鍚﹀凡鎶ュ伐
boolean isPreviousReported = productionProductMainMapper.checkPreviousProcessReported(
- record.getProductRouteId(),
+ record.getId(),
currentDragSort
);
record.setIsCanReport(isPreviousReported);
@@ -94,7 +94,13 @@
}
// 妫�鏌ヤ箣鍓嶇殑宸ュ簭鏄惁鏈夎闅旂鐨勪笉鍚堟牸璁板綍
- List<QualityUnqualified> unqualifiedList = qualityUnqualifiedMapper.selectUnqualifiedByProcessNames(previousProcessNames);
+ List<QualityUnqualified> unqualifiedList = Collections.emptyList();
+ if (CollectionUtils.isNotEmpty(previousProcessNames)) {
+ unqualifiedList = qualityUnqualifiedMapper.selectUnqualifiedByProductOrderAndProcessNames(
+ record.getProductOrderId(),
+ previousProcessNames
+ );
+ }
if (CollectionUtils.isNotEmpty(unqualifiedList)) {
record.setIsCanReport(false);
}
@@ -158,6 +164,7 @@
put("productName", productWorkOrderDto.getProductName());
put("planQuantity", productWorkOrderDto.getPlanQuantity());
put("model", productWorkOrderDto.getModel());
+ put("unit", productWorkOrderDto.getUnit());
put("completeQuantity", productWorkOrderDto.getCompleteQuantity());
put("scrapQty", productWorkOrderDto.getScrapQty());
put("planStartTime", productWorkOrderDto.getPlanStartTime());
@@ -230,4 +237,4 @@
}
return productWorkOrderDtos;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3