From 2ee9e158e3129070f6b1fd953da1540f05d4f2b0 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 10 七月 2026 18:04:50 +0800
Subject: [PATCH] 修改报工
---
src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
index b3d93b8..303826a 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
@@ -73,14 +73,29 @@
QualityInspect qualityInspect = qualityInspectService.getById(unqualified.getInspectId());
String batchNo = qualityInspect == null ? null
: resolveProductionBatchNo(qualityInspect.getProductMainId(), qualityInspect.getId(), qualityInspect.getProductModelId());
+ if (qualityUnqualified.getDealType() != null) {
+ switch (qualityUnqualified.getDealType()) {
+ case 0:
+ qualityUnqualified.setDealResult("杞诲井杩斿伐");
+ break;
+ case 1:
+ qualityUnqualified.setDealResult("涓ラ噸杩斿伐");
+ break;
+ case 2:
+ qualityUnqualified.setDealResult("鎶ュ簾");
+ break;
+ default:
+ break;
+ }
+ }
if (ObjectUtils.isNotNull(qualityInspect) && qualityInspect.getInspectType() != 0) {
switch (qualityUnqualified.getDealResult()) {
- case "杩斾慨":
- case "杩斿伐":
+ case "涓ラ噸杩斿伐":
+ case "杞诲井杩斿伐":
if (ObjectUtils.isNotNull(qualityInspect.getProductMainId())) {
ProductionProductMain sourceMain = productionProductMainMapper.selectById(qualityInspect.getProductMainId());
if (sourceMain == null || sourceMain.getProductionOperationTaskId() == null) {
- throw new ServiceException("鍘嗗彶鎶ュ伐鏈粦瀹氱敓浜у伐鍗曪紝鏃犳硶鎸夋柊妯″瀷杩斾慨/杩斿伐");
+ throw new ServiceException("鍘嗗彶鎶ュ伐鏈粦瀹氱敓浜у伐鍗曪紝鏃犳硶鎸夋柊妯″瀷杩斿伐");
}
createReworkProductionByNewModel(sourceMain, unqualified.getQuantity());
}
@@ -88,6 +103,7 @@
case "鎶ュ簾":
stockUtils.addUnStockWithBatchNo(qualityInspect.getProductModelId(), unqualified.getQuantity(),
StockInQualifiedRecordTypeEnum.DEFECTIVE_SCRAP.getCode(), unqualified.getId(), batchNo);
+ qualityUnqualified.setRegenerateNewOrder(1);
break;
case "璁╂鏀捐":
stockUtils.addStockWithBatchNo(qualityInspect.getProductModelId(), unqualified.getQuantity(),
--
Gitblit v1.9.3