From b14d85a242a9e2e42627e637c0495860984e2b91 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 07 一月 2026 17:43:37 +0800
Subject: [PATCH] feat(production): 添加字段计划数量
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 66 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 17 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 f100c7f..c333c78 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -74,23 +74,23 @@
throw new RuntimeException("鍙傛暟涓嶈兘涓虹┖");
}
-// if (dto.isReportWork()) {
-// // 鏇存柊閫昏緫 - 鍙洿鏂版暟閲�
-// QueryWrapper<ProductionProductOutput> outputWrapper = new QueryWrapper<>();
-// outputWrapper.eq("product_main_id", dto.getId());
-//
-// ProductionProductOutput output = productionProductOutputMapper.selectOne(outputWrapper);
-// if (output == null) {
-// throw new RuntimeException("浜у嚭璁板綍涓嶅瓨鍦�");
-// }
-//
-// // 鍙洿鏂版暟閲�
-// if (dto.getQuantity() != null) {
-// output.setQuantity(dto.getQuantity());
-// productionProductOutputMapper.updateById(output);
-// }
-// return true;
-// }
+ if (dto.isReportWork()) {
+ // 鏇存柊閫昏緫 - 鍙洿鏂版暟閲�
+ QueryWrapper<ProductionProductOutput> outputWrapper = new QueryWrapper<>();
+ outputWrapper.eq("product_main_id", dto.getProductMainId());
+
+ ProductionProductOutput output = productionProductOutputMapper.selectOne(outputWrapper);
+ if (output == null) {
+ throw new RuntimeException("浜у嚭璁板綍涓嶅瓨鍦�");
+ }
+
+ // 鍙洿鏂版暟閲�
+ if (dto.getQuantity() != null) {
+ output.setQuantity(dto.getQuantity());
+ productionProductOutputMapper.updateById(output);
+ }
+ return true;
+ }
// 鏂板閫昏緫
ProductionProductMain productionProductMain = new ProductionProductMain();
@@ -144,6 +144,7 @@
UpdateWrapper<ProductWorkOrder> wrapper = new UpdateWrapper<>();
wrapper.set("report_work", true)
.set("quantity",dto.getQuantity())
+ .set("product_main_id",productionProductMain.getId())
.eq("id", dto.getWorkOrderId());
productWorkOrderMapper.update(null, wrapper);
}
@@ -164,6 +165,7 @@
qualityInspect.setProcess(productProcess.getName());
qualityInspect.setInspectState(0);
qualityInspect.setInspectType(inspectType);
+ qualityInspect.setProductMainId(productionProductMain.getId());
qualityInspectMapper.insert(qualityInspect);
qualityTestStandardMapper.selectList(
@@ -177,6 +179,11 @@
qualityInspectParamMapper.insert(param);
});
}
+
+
+
+
+
// 娣诲姞浜у嚭
ProductionProductOutput productionProductOutput = new ProductionProductOutput();
productionProductOutput.setProductMainId(productionProductMain.getId());
@@ -186,4 +193,29 @@
return true;
}
+
+ @Override
+ @Transactional
+ public Boolean removeProductMain(ProductionProductMainDto dto) {
+ Long id = dto.getId();
+
+ // 鍒犻櫎璐ㄦ鍙傛暟鍜岃川妫�璁板綍
+ qualityInspectMapper.selectList(
+ new LambdaQueryWrapper<QualityInspect>()
+ .eq(QualityInspect::getProductMainId, id)
+ ).forEach(q -> {
+ qualityInspectParamMapper.delete(
+ new LambdaQueryWrapper<QualityInspectParam>()
+ .eq(QualityInspectParam::getInspectId, q.getId()));
+ qualityInspectMapper.deleteById(q.getId());
+ });
+
+ // 鍒犻櫎浜у嚭璁板綍
+ productionProductOutputMapper.delete(new LambdaQueryWrapper<ProductionProductOutput>()
+ .eq(ProductionProductOutput::getProductMainId, id)
+ );
+
+ // 鍒犻櫎涓昏〃
+ return productionProductMainMapper.deleteById(id) > 0;
+ }
}
--
Gitblit v1.9.3