From 86d777aff8412b49fa83f51a1d9e0524e58f6059 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 18 三月 2026 14:31:13 +0800
Subject: [PATCH] fix: 删除生产订单未回退下发数量与更新下发状态
---
src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java | 2
src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java | 85 ++++++++++++++++++++++------
src/main/resources/mapper/production/ProductOrderMapper.xml | 1
src/main/java/com/ruoyi/production/enums/ProductOrderStatusEnum.java | 58 +++++++++++++++++++
src/main/java/com/ruoyi/production/pojo/ProductOrder.java | 5 +
5 files changed, 131 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/enums/ProductOrderStatusEnum.java b/src/main/java/com/ruoyi/production/enums/ProductOrderStatusEnum.java
new file mode 100644
index 0000000..6175f2f
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/enums/ProductOrderStatusEnum.java
@@ -0,0 +1,58 @@
+package com.ruoyi.production.enums;
+
+import lombok.Getter;
+
+/**
+ * <br>
+ * 鐢熶骇璁㈠崟鐘舵�佹灇涓剧被
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/18 14:18
+ */
+@Getter
+public enum ProductOrderStatusEnum {
+
+ WAIT(1, "寰呭紑濮�"),
+ RUNNING(2, "杩涜涓�"),
+ FINISHED(3, "宸插畬鎴�"),
+ CANCEL(4, "宸插彇娑�");
+
+ private final Integer code;
+ private final String desc;
+
+ ProductOrderStatusEnum(Integer code, String desc) {
+ this.code = code;
+ this.desc = desc;
+ }
+
+ /**
+ * 鏍规嵁code鑾峰彇鏋氫妇
+ */
+ public static ProductOrderStatusEnum getByCode(Integer code) {
+ if (code == null) {
+ return null;
+ }
+ for (ProductOrderStatusEnum item : values()) {
+ if (item.getCode().equals(code)) {
+ return item;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 鍒ゆ柇鏄惁鍏佽鍒犻櫎锛�1銆�4锛�
+ */
+ public static boolean canDelete(Integer code) {
+ return WAIT.getCode().equals(code) || CANCEL.getCode().equals(code);
+ }
+
+ /**
+ * 鍒ゆ柇鏄惁宸插紑濮嬬敓浜э紙2銆�3锛�
+ */
+ public static boolean isStarted(Integer code) {
+ return RUNNING.getCode().equals(code) || FINISHED.getCode().equals(code);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
index 4f5a92e..3818b43 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -16,7 +16,7 @@
@Data
@TableName("product_order")
-public class ProductOrder implements Serializable {
+public class ProductOrder implements Serializable {
private static final long serialVersionUID = 1L;
@@ -91,4 +91,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
+
+ @ApiModelProperty(value = "鐘舵�侊紙1.寰呭紑濮嬨��2.杩涜涓��3.宸插畬鎴愩��4.宸插彇娑堬級")
+ private Integer status;
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
index 57800e6..4a0cebc 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
@@ -7,11 +7,10 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.dto.ProductOrderDto;
import com.ruoyi.production.dto.ProductStructureDto;
+import com.ruoyi.production.enums.ProductOrderStatusEnum;
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.ProductOrderService;
@@ -20,7 +19,6 @@
import com.ruoyi.productionPlan.pojo.ProductOrderPlan;
import com.ruoyi.productionPlan.pojo.ProductionPlan;
import com.ruoyi.quality.mapper.QualityInspectMapper;
-import com.ruoyi.quality.pojo.QualityInspect;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -179,28 +177,77 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public Boolean delete(Long[] ids) {
- //濡傛灉宸茬粡寮�濮嬬敓浜�,涓嶈兘鍒犻櫎
- //鏌ヨ鐢熶骇璁㈠崟涓嬬殑宸ュ崟
+ List<ProductOrder> orders = productOrderMapper.selectList(Wrappers.<ProductOrder>lambdaQuery().in(ProductOrder::getId, ids));
+
+ if (orders.isEmpty()) {
+ throw new RuntimeException("鐢熶骇璁㈠崟涓嶅瓨鍦�");
+ }
+ for (ProductOrder order : orders) {
+ if (!ProductOrderStatusEnum.canDelete(order.getStatus())) {
+ throw new RuntimeException("鍙湁銆愬緟寮�濮嬨�佸凡鍙栨秷銆戠姸鎬佺殑璁㈠崟鎵嶅彲浠ュ垹闄�");
+ }
+ }
+
+ // 鏄惁宸茬敓浜�
List<ProductWorkOrder> productWorkOrders = productWorkOrderMapper.selectList(Wrappers.<ProductWorkOrder>lambdaQuery().in(ProductWorkOrder::getProductOrderId, ids));
- if (productWorkOrders.size()>0){
- //鍒ゆ柇鏄惁鏈夋姤宸ユ暟鎹�
- List<ProductionProductMain> productionProductMains = productionProductMainMapper.selectList(Wrappers.<ProductionProductMain>lambdaQuery()
- .in(ProductionProductMain::getWorkOrderId, productWorkOrders.stream().map(ProductWorkOrder::getId).collect(Collectors.toList())));
- if (productionProductMains.size()>0){
+
+ if (!productWorkOrders.isEmpty()) {
+ List<Long> workOrderIds = productWorkOrders.stream()
+ .map(ProductWorkOrder::getId)
+ .collect(Collectors.toList());
+
+ List<ProductionProductMain> productionProductMains = productionProductMainMapper.selectList(Wrappers.<ProductionProductMain>lambdaQuery().in(ProductionProductMain::getWorkOrderId, workOrderIds));
+ if (!productionProductMains.isEmpty()) {
throw new RuntimeException("鐢熶骇璁㈠崟宸茬粡寮�濮嬬敓浜�,涓嶈兘鍒犻櫎");
}
- //鍒犻櫎宸ュ崟
+
+ // 鍒犻櫎宸ュ崟
productWorkOrderMapper.delete(Wrappers.<ProductWorkOrder>lambdaQuery().in(ProductWorkOrder::getProductOrderId, ids));
}
- //鍒犻櫎宸ヨ壓璺嚎
- productProcessRouteItemMapper.delete(new LambdaQueryWrapper<ProductProcessRouteItem>()
- .in(ProductProcessRouteItem::getProductOrderId, ids));
- productProcessRouteMapper.delete(new LambdaQueryWrapper<ProductProcessRoute>()
- .in(ProductProcessRoute::getProductOrderId, ids));
- //鍒犻櫎鐢熶骇璁㈠崟
- productOrderMapper.delete(new LambdaQueryWrapper<ProductOrder>()
- .in(ProductOrder::getId, ids));
+
+ // 鍥為��鐢熶骇璁″垝
+ List<ProductOrderPlan> productOrderPlans = productOrderPlanMapper.selectList(Wrappers.<ProductOrderPlan>lambdaQuery().in(ProductOrderPlan::getProductOrderId, ids));
+
+ for (ProductOrderPlan productOrderPlan : productOrderPlans) {
+ ProductionPlan productionPlan = productionPlanMapper.selectById(productOrderPlan.getProductionPlanId());
+
+ if (productionPlan != null) {
+ // 鍥為��鏁伴噺
+ BigDecimal newAssigned = productionPlan.getAssignedQuantity()
+ .subtract(productOrderPlan.getAssignedQuantity());
+
+ if (newAssigned.compareTo(BigDecimal.ZERO) < 0) {
+ newAssigned = BigDecimal.ZERO;
+ }
+ productionPlan.setAssignedQuantity(newAssigned);
+ BigDecimal volume = productionPlan.getVolume() == null ? BigDecimal.ZERO : productionPlan.getVolume();
+
+ int status;
+ if (newAssigned.compareTo(BigDecimal.ZERO) == 0) {
+ status = 0; // 鏈笅鍙�
+ } else if (newAssigned.compareTo(volume) < 0) {
+ status = 1; // 閮ㄥ垎涓嬪彂
+ } else {
+ status = 2; // 宸蹭笅鍙�
+ }
+ productionPlan.setStatus(status);
+
+ productionPlanMapper.updateById(productionPlan);
+ }
+ }
+
+ // 鍒犻櫎涓棿琛�
+ productOrderPlanMapper.delete(Wrappers.<ProductOrderPlan>lambdaQuery().in(ProductOrderPlan::getProductOrderId, ids));
+
+ // TODO: 鍒犻櫎闄勮〃鐨勫伐鑹鸿矾绾夸笌BOM
+ productProcessRouteItemMapper.delete(new LambdaQueryWrapper<ProductProcessRouteItem>().in(ProductProcessRouteItem::getProductOrderId, ids));
+ productProcessRouteMapper.delete(new LambdaQueryWrapper<ProductProcessRoute>().in(ProductProcessRoute::getProductOrderId, ids));
+
+ // 鍒犻櫎璁㈠崟
+ productOrderMapper.delete(new LambdaQueryWrapper<ProductOrder>().in(ProductOrder::getId, ids));
+
return true;
}
diff --git a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
index 28cba27..1444f36 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
@@ -14,6 +14,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.config.AliDingConfig;
import com.ruoyi.framework.util.AliDingUtils;
+import com.ruoyi.production.enums.ProductOrderStatusEnum;
import com.ruoyi.production.pojo.ProductMaterialSku;
import com.ruoyi.production.pojo.ProductOrder;
import com.ruoyi.production.service.ProductMaterialService;
@@ -141,6 +142,7 @@
ProductOrder productOrder = new ProductOrder();
productOrder.setQuantity(productionPlanDto.getTotalAssignedQuantity());
productOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
+ productOrder.setStatus(ProductOrderStatusEnum.WAIT.getCode());
productOrderService.addProductOrder(productOrder);
// 鏍规嵁涓嬪彂鏁伴噺锛屼粠绗竴涓敓浜ц鍒掑紑濮嬪垎閰嶆柟鏁�
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index e5d318c..80606cb 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -11,6 +11,7 @@
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="planCompleteTime" column="plan_complete_time"/>
+ <result property="status" column="status"/>
</resultMap>
<select id="pageProductOrder" resultType="com.ruoyi.production.dto.ProductOrderDto">
--
Gitblit v1.9.3