From 4153cdc177ec3d8879ad210178ffc20ee0a2eee0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 07 一月 2026 16:39:32 +0800
Subject: [PATCH] 删除报工联动，优化报工
---
src/main/java/com/ruoyi/production/service/ProductionProductMainService.java | 1
src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java | 13 ++++++
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 66 ++++++++++++++++++++++++--------
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 5 ++
src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java | 9 +++-
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 3 +
6 files changed, 77 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
index e27be8d..d635ad9 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -2,11 +2,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.production.dto.ProductProcessRouteItemDto;
import com.ruoyi.production.dto.ProductionProductMainDto;
import com.ruoyi.production.service.ProductionProductMainService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
@@ -41,8 +43,9 @@
}
@ApiOperation("鍒犻櫎鎶ュ伐")
- @DeleteMapping("/{ids}")
- public R delete(@PathVariable("ids") Long[] ids) {
- return R.ok(productionProductMainService.removeBatchByIds(Arrays.asList(ids)));
+ @DeleteMapping("/delete")
+ @Transactional(rollbackFor = Exception.class)
+ public R delete(@RequestBody ProductionProductMainDto productionProductMainDto) {
+ return R.ok(productionProductMainService.removeProductMain(productionProductMainDto));
}
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 449b75a..f6aa5ba 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -22,4 +22,7 @@
@ApiModelProperty(value = "鏄惁鎶ュ伐")
private boolean reportWork;
+
+ @ApiModelProperty(value = "鎶ュ伐id")
+ private Long productMainId;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
index a1325bd..0715535 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
@@ -5,6 +5,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -92,4 +93,16 @@
*/
@ApiModelProperty(value = "鏄惁鎶ュ伐")
private boolean reportWork;
+
+ /**
+ * 瀹為檯鏁伴噺
+ */
+ @ApiModelProperty(value = "鏁伴噺")
+ private BigDecimal quantity;
+
+ /**
+ * 鎶ュ伐id
+ */
+ @ApiModelProperty(value = "鎶ュ伐id")
+ private Long productMainId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/production/service/ProductionProductMainService.java b/src/main/java/com/ruoyi/production/service/ProductionProductMainService.java
index bde9429..0980cae 100644
--- a/src/main/java/com/ruoyi/production/service/ProductionProductMainService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductionProductMainService.java
@@ -15,4 +15,5 @@
Boolean addProductMain(ProductionProductMainDto productionProductMainDto);
+ Boolean removeProductMain(ProductionProductMainDto productionProductMainDto);
}
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;
+ }
}
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 6c39977..e03b74a 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -140,5 +140,10 @@
private Long purchaseLedgerId;
+ /**
+ * 鎶ュ伐id
+ */
+ private Long productMainId;
+
}
--
Gitblit v1.9.3