From 1b912a25864dfbe6968740738afe7c042919724a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 02 二月 2026 15:53:21 +0800
Subject: [PATCH] 生产报工的报废未进入库存记录页面中+不合格处理后不能删除
---
src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java | 8 +++++---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 2 +-
2 files changed, 6 insertions(+), 4 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 76a5757..c69017f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -240,7 +240,7 @@
}
//濡傛灉鎶ュ簾鏁伴噺>0,闇�瑕佽繘鍏ユ姤搴熺殑搴撳瓨
if (ObjectUtils.isNotEmpty(dto.getScrapQty())) {
- if (BigDecimal.ZERO.compareTo(dto.getScrapQty()) > 0) {
+ if (dto.getScrapQty().compareTo(BigDecimal.ZERO) > 0) {
stockUtils.addUnStock(productModel.getId(), dto.getScrapQty(), StockUnQualifiedRecordTypeEnum.PRODUCTION_SCRAP.getCode(), productionProductMain.getId());
}
}
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
index b015150..041d75c 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
@@ -40,9 +40,11 @@
*/
@DeleteMapping("/del")
public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
- if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
- }
+ qualityUnqualifiedService.listByIds(ids).stream().forEach(qualityUnqualified -> {
+ if (qualityUnqualified.getInspectState()==1){
+ throw new RuntimeException("璇ヤ笉鍚堟牸鏁版嵁宸茬粡澶勭悊鏃犳硶鍒犻櫎!");
+ }
+ });
return AjaxResult.success(qualityUnqualifiedService.removeBatchByIds(ids));
}
--
Gitblit v1.9.3