From c494daaad7f53cd353e21e7a38a40df4d048ba5a Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 09 一月 2026 17:31:38 +0800
Subject: [PATCH] 生产工单工艺路线删除，同步删除报工，投入，产出，质检，核算
---
src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java | 194 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 184 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java b/src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java
index 66ace47..beefe5e 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java
@@ -1,23 +1,57 @@
package com.ruoyi.production.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.production.dto.ProcessRouteItemDto;
import com.ruoyi.production.dto.ProductProcessRouteItemDto;
-import com.ruoyi.production.pojo.ProcessRouteItem;
-import com.ruoyi.production.pojo.ProductProcessRouteItem;
+import com.ruoyi.production.mapper.*;
+import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.ProductProcessRouteItemService;
+import com.ruoyi.production.service.ProductWorkOrderService;
+import com.ruoyi.quality.mapper.QualityInspectMapper;
+import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.sales.mapper.SalesLedgerMapper;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-@RequestMapping("productProcessRoute")
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@RequestMapping("/productProcessRoute")
@RestController
+@AllArgsConstructor
@Api(tags = "鐢熶骇宸ヨ壓璺嚎")
public class ProductProcessRouteItemController {
- @Autowired
+
+ private final ProductOrderMapper productOrderMapper;
private ProductProcessRouteItemService productProcessRouteItemService;
+
+ private ProductWorkOrderService productWorkOrderService;
+
+ private ProductWorkOrderMapper productWorkOrderMapper;
+
+ private SalesLedgerProductMapper salesLedgerProductMapper;
+
+ private ProductionProductMainMapper productionProductMainMapper;
+
+ private ProductionProductInputMapper productionProductInputMapper;
+
+ private ProductionProductOutputMapper productionProductOutputMapper;
+
+ private QualityInspectMapper qualityInspectMapper;
+
+ private SalesLedgerProductionAccountingMapper salesLedgerProductionAccountingMapper;
@GetMapping("list")
@ApiOperation("鏍规嵁Id鏌ヨ宸ヨ壓椤圭洰")
@@ -25,10 +59,150 @@
return R.ok(productProcessRouteItemService.listItem(orderId));
}
- @PostMapping ()
- @ApiOperation("鏂板淇敼")
+ @PostMapping("/updateRouteItem")
+ @ApiOperation("鎵归噺鏂板淇敼")
+ @Transactional(rollbackFor = Exception.class)
public R addOrUpdate(@RequestBody ProductProcessRouteItemDto processRouteItemDto) {
- productProcessRouteItemService.remove(new QueryWrapper<ProductProcessRouteItem>().lambda().eq(ProductProcessRouteItem::getRouteId, processRouteItemDto.getRouteId()));
- return R.ok(productProcessRouteItemService.saveBatch(processRouteItemDto.getProcessRouteItem()));
+
+ ProductOrder productOrder = productOrderMapper.selectById(processRouteItemDto.getRouteId());
+ if (productOrder == null) {
+ return R.fail("鏈壘鍒癐D涓篬" + processRouteItemDto.getRouteId() + "]鐨勪骇鍝佽鍗�");
+ }
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectOne(new LambdaQueryWrapper<SalesLedgerProduct>()
+ .eq(SalesLedgerProduct::getSalesLedgerId, productOrder.getSalesLedgerId()));
+
+ if (salesLedgerProduct == null) {
+ return R.fail("鏈壘鍒伴攢鍞彴璐D涓篬" + productOrder.getSalesLedgerId() + "]鐨勫彴璐︿骇鍝�");
+ }
+
+ List<ProductProcessRouteItem> items = processRouteItemDto.getProcessRouteItem();
+ if (CollectionUtils.isEmpty(items)) {
+ return R.ok();
+ }
+
+ Map<Boolean, List<ProductProcessRouteItem>> partitioned = items.stream()
+ .collect(Collectors.partitioningBy(
+ item -> item.getId() != null && item.getId() > 0
+ ));
+
+ List<ProductProcessRouteItem> toUpdate = partitioned.get(true);
+ List<ProductProcessRouteItem> toInsert = partitioned.get(false);
+ // 鎵归噺澶勭悊
+ boolean result = true;
+ if (!toInsert.isEmpty()) {
+ result = productProcessRouteItemService.saveBatch(toInsert);
+ if (result) {
+ // 鐢熸垚宸ュ崟鍙�
+ String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ // 鏌ヨ浠婃棩鏈�澶у伐鍗曞彿
+ QueryWrapper<ProductWorkOrder> queryWrapper = new QueryWrapper<>();
+ queryWrapper.likeRight("work_order_no", datePrefix)
+ .select("MAX(work_order_no) as maxNo");
+
+ List<Map<String, Object>> maxNoList = productWorkOrderMapper.selectMaps(queryWrapper);
+ String maxWorkOrderNo = null;
+ if (!maxNoList.isEmpty() && maxNoList.get(0) != null && maxNoList.get(0).get("maxNo") != null) {
+ maxWorkOrderNo = maxNoList.get(0).get("maxNo").toString();
+ }
+ int startSequence = 1;
+ if (maxWorkOrderNo != null && maxWorkOrderNo.startsWith(datePrefix)) {
+ try {
+ String seqStr = maxWorkOrderNo.substring(datePrefix.length());
+ startSequence = Integer.parseInt(seqStr) + 1;
+ } catch (NumberFormatException e) {
+ startSequence = 1;
+ }
+ }
+ // 鎵归噺鐢熸垚宸ュ崟
+ List<ProductWorkOrder> workOrders = new ArrayList<>();
+ for (int i = 0; i < toInsert.size(); i++) {
+ ProductProcessRouteItem item = toInsert.get(i);
+ String workOrderNoStr = String.format("%s%03d", datePrefix, startSequence + i);
+ ProductWorkOrder workOrder = new ProductWorkOrder();
+ workOrder.setProductProcessRouteItemId(item.getId());
+ workOrder.setProductOrderId(item.getRouteId());
+ workOrder.setWorkOrderNo(workOrderNoStr);
+ workOrder.setPlanQuantity(salesLedgerProduct.getQuantity());
+ workOrder.setStatus(1);
+ workOrders.add(workOrder);
+ }
+ result = productWorkOrderService.saveBatch(workOrders);
+ }
+ }
+ if (!toUpdate.isEmpty()) {
+ result = productProcessRouteItemService.updateBatchById(toUpdate) && result;
+ }
+ return R.ok(result);
+ }
+
+ @DeleteMapping("/deleteRouteItem")
+ @ApiOperation("鍒犻櫎鐢熶骇宸ヨ壓璺嚎")
+ @Transactional(rollbackFor = Exception.class)
+ public R deleteRouteItem(@RequestBody ProductProcessRouteItemDto processRouteItemDto) {
+
+ if (processRouteItemDto == null || processRouteItemDto.getId() == null) {
+ return R.fail("鍒犻櫎澶辫触锛氬伐鑹鸿矾绾块」ID涓嶈兘涓虹┖");
+ }
+ Long routeItemId = processRouteItemDto.getId();
+
+ try {
+ // 鏌ヨ宸ュ崟
+ ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectOne(
+ new LambdaQueryWrapper<ProductWorkOrder>()
+ .eq(ProductWorkOrder::getProductProcessRouteItemId, routeItemId)
+ .last("LIMIT 1")
+ );
+ if (productWorkOrder == null) {
+ return R.fail("鍒犻櫎澶辫触锛氭湭鎵惧埌鍏宠仈鐨勭敓浜у伐鍗�");
+ }
+ Long workOrderId = productWorkOrder.getId();
+ Long productOrderId = productWorkOrder.getProductOrderId();
+
+ // 鏌ヨ鐢熶骇涓昏〃
+ List<ProductionProductMain> productionProductMains = productionProductMainMapper.selectList(
+ new LambdaQueryWrapper<ProductionProductMain>()
+ .eq(ProductionProductMain::getWorkOrderId, workOrderId)
+ );
+ if (!productionProductMains.isEmpty()) {
+ // 鎵归噺鍒犻櫎瀛愯〃
+ for (ProductionProductMain main : productionProductMains) {
+ Long mainId = main.getId();
+ // 鍒犻櫎鎶曞叆
+ productionProductInputMapper.delete(new LambdaQueryWrapper<ProductionProductInput>()
+ .eq(ProductionProductInput::getProductMainId, mainId));
+ // 鍒犻櫎浜у嚭
+ productionProductOutputMapper.delete(new LambdaQueryWrapper<ProductionProductOutput>()
+ .eq(ProductionProductOutput::getProductMainId, mainId));
+ // 鍒犻櫎璐ㄦ
+ qualityInspectMapper.delete(new LambdaQueryWrapper<QualityInspect>()
+ .eq(QualityInspect::getProductMainId, mainId));
+ }
+ }
+
+ // 鍒犻櫎鎶ュ伐锛堢敓浜т富琛級
+ productionProductMainMapper.delete(new LambdaQueryWrapper<ProductionProductMain>()
+ .eq(ProductionProductMain::getWorkOrderId, workOrderId));
+
+ // 鏌ヨ璁㈠崟 + 鍒犻櫎鏍哥畻
+ ProductOrder productOrder = productOrderMapper.selectById(productOrderId);
+ if (productOrder != null && productOrder.getSalesLedgerId() != null) {
+ salesLedgerProductionAccountingMapper.delete(new LambdaQueryWrapper<SalesLedgerProductionAccounting>()
+ .eq(SalesLedgerProductionAccounting::getSalesLedgerId, productOrder.getSalesLedgerId()));
+ }
+
+ // 鍒犻櫎鍏宠仈宸ュ崟
+ productWorkOrderMapper.delete(new LambdaQueryWrapper<ProductWorkOrder>()
+ .eq(ProductWorkOrder::getProductProcessRouteItemId, routeItemId));
+
+ // 鍒犻櫎涓昏〃鏁版嵁
+ boolean removeFlag = productProcessRouteItemService.removeById(routeItemId);
+ if (!removeFlag) {
+ return R.fail("鍒犻櫎澶辫触锛氬伐鑹鸿矾绾块」涓昏〃鏁版嵁涓嶅瓨鍦�");
+ }
+
+ return R.ok();
+ } catch (Exception e) {
+ return R.fail("鍒犻櫎鐢熶骇宸ヨ壓璺嚎澶辫触锛�" + e.getMessage());
+ }
}
}
--
Gitblit v1.9.3