From 7c91bf8fbbc98dcfe3d1c33786a0b4390523b5b2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 06 一月 2026 16:55:32 +0800
Subject: [PATCH] 1.生产订单工艺路线排序 2.生产订单删除并对应工单删除 3.生产订单更新优化 4.工单更新
---
src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java | 110 ++++++++++++++++++++++++++++++++++--
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 5 +
src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java | 8 ++
src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java | 9 +-
src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java | 13 +++-
src/main/java/com/ruoyi/production/service/ProductWorkOrderService.java | 2
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 3 +
src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml | 2
src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java | 3 +
9 files changed, 139 insertions(+), 16 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..8b172c7 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductProcessRouteItemController.java
@@ -1,23 +1,39 @@
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.mapper.ProductWorkOrderMapper;
import com.ruoyi.production.pojo.ProductProcessRouteItem;
+import com.ruoyi.production.pojo.ProductWorkOrder;
import com.ruoyi.production.service.ProductProcessRouteItemService;
+import com.ruoyi.production.service.ProductWorkOrderService;
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.*;
+
+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 ProductProcessRouteItemService productProcessRouteItemService;
+
+ private ProductWorkOrderService productWorkOrderService;
+
+ private ProductWorkOrderMapper productWorkOrderMapper;
@GetMapping("list")
@ApiOperation("鏍规嵁Id鏌ヨ宸ヨ壓椤圭洰")
@@ -25,10 +41,88 @@
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()));
+ 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).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.setWorkOrderNo(workOrderNoStr);
+ 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("鍙傛暟閿欒锛孖D涓嶈兘涓虹┖");
+ }
+
+ try {
+ // 鍏堝垹闄ゅ叧鑱旂殑宸ュ崟鏁版嵁
+ LambdaQueryWrapper<ProductWorkOrder> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(ProductWorkOrder::getProductProcessRouteItemId, processRouteItemDto.getId());
+ productWorkOrderMapper.delete(wrapper);
+
+ // 鍒犻櫎涓昏〃鏁版嵁
+ productProcessRouteItemService.removeById(processRouteItemDto.getId());
+ return R.ok();
+ } catch (Exception e) {
+ throw new RuntimeException("鍒犻櫎澶辫触锛�" + e.getMessage());
+ }
+ }
+
}
diff --git a/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java
index 339ab7d..f595d98 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductWorkOrderController.java
@@ -6,9 +6,7 @@
import com.ruoyi.production.service.ProductWorkOrderService;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RestController
@AllArgsConstructor
@@ -27,4 +25,13 @@
return R.ok(productWorkOrderservice.listPage(page, productWorkOrder));
}
+ /**
+ * 浜у搧宸ュ崟鏇存柊
+ */
+ @ApiOperation("浜у搧宸ュ崟鏇存柊")
+ @PostMapping ("/updateProductWorkOrder")
+ public R updateProductWorkOrder(@RequestBody ProductWorkOrderDto productWorkOrderDto) {
+ return R.ok(productWorkOrderservice.updateProductWorkOrder(productWorkOrderDto));
+ }
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java b/src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java
index af13c69..324740e 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java
@@ -32,4 +32,7 @@
@TableField(fill = FieldFill.UPDATE)
private LocalDateTime updateTime;
+ @ApiModelProperty(value ="鎷栧姩鎺掑簭")
+ private Integer dragSort;
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
index a217b9b..30208f9 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.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -66,23 +67,23 @@
* 璁″垝寮�濮嬫椂闂�
*/
@ApiModelProperty(value = "璁″垝寮�濮嬫椂闂�")
- private LocalDateTime planStartTime;
+ private LocalDate planStartTime;
/**
* 璁″垝缁撴潫鏃堕棿
*/
@ApiModelProperty(value = "璁″垝缁撴潫鏃堕棿")
- private LocalDateTime planEndTime;
+ private LocalDate planEndTime;
/**
* 瀹為檯寮�濮嬫椂闂�
*/
@ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�")
- private LocalDateTime actualStartTime;
+ private LocalDate actualStartTime;
/**
* 瀹為檯缁撴潫鏃堕棿
*/
@ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
- private LocalDateTime actualEndTime;
+ private LocalDate actualEndTime;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
index 9a8088a..5bd20c0 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
@@ -22,16 +22,24 @@
@ApiModelProperty(value = "鎶ュ伐浜哄憳id")
private Long userId;
+ @ApiModelProperty(value = "鎶ュ伐浜哄憳")
+ private Long userName;
+
@ApiModelProperty(value = "宸ュ崟id")
private String productProcessRouteItemId;
@ApiModelProperty(value = "鎶ュ伐鐘舵��")
private Integer status;
+ @TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.UPDATE)
+ private LocalDateTime updateTime;
+
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
diff --git a/src/main/java/com/ruoyi/production/service/ProductWorkOrderService.java b/src/main/java/com/ruoyi/production/service/ProductWorkOrderService.java
index 57c5b19..392230e 100644
--- a/src/main/java/com/ruoyi/production/service/ProductWorkOrderService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductWorkOrderService.java
@@ -10,4 +10,6 @@
IPage<ProductWorkOrderDto> listPage(Page<ProductWorkOrderDto> page, ProductWorkOrderDto productWorkOrder);
+ int updateProductWorkOrder(ProductWorkOrderDto productWorkOrderDto);
+
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
index 3d2d7e3..6f70e7c 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -24,4 +24,9 @@
return productWorkOrdermapper.pageProductWorkOrder(page, productWorkOrder);
}
+ @Override
+ public int updateProductWorkOrder(ProductWorkOrderDto productWorkOrderDto) {
+ return productWorkOrdermapper.updateById(productWorkOrderDto);
+ }
+
}
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index d3a7135..7db5456 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -644,11 +644,13 @@
List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(new QueryWrapper<ProcessRouteItem>().lambda().eq(ProcessRouteItem::getRouteId, processRoute.getId()));
// 鐢熸垚褰撳墠鏃ユ湡鐨勫墠缂�锛氬勾鏈堟棩
String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ int dragSort = 1;
for (ProcessRouteItem processRouteItem : processRouteItems) {
ProductProcessRouteItem productProcessRouteItem = new ProductProcessRouteItem();
productProcessRouteItem.setProductModelId(processRouteItem.getProductModelId());
productProcessRouteItem.setProcessId(processRouteItem.getProcessId());
productProcessRouteItem.setRouteId(productOrder.getId());
+ productProcessRouteItem.setDragSort(dragSort);
int insert = productProcessRouteItemMapper.insert(productProcessRouteItem);
if (insert > 0) {
// 鏌ヨ浠婃棩宸插瓨鍦ㄧ殑鏈�澶у伐鍗曞彿
@@ -679,6 +681,7 @@
productWorkOrder.setStatus(1);
productWorkOrderMapper.insert(productWorkOrder);
}
+ dragSort++;
}
productOrder.setRouteId(processRoute.getId());
productOrderMapper.updateById(productOrder);
diff --git a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
index d1c013d..caa7890 100644
--- a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
@@ -21,7 +21,7 @@
left join product p on pm.product_id = p.id
left join product_process pp on pp.id = ppri.process_id
where ppri.route_id = #{orderId}
- order by ppri.id
+ order by ppri.drag_sort
</select>
--
Gitblit v1.9.3