From b473b8de811b86fd7da321f1148b5c17de9b1394 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 15:07:46 +0800
Subject: [PATCH] refactor(production): 移除生产订单中的强度字段
---
src/main/java/com/ruoyi/production/controller/ProductionOrderController.java | 3 ++-
src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java | 1 -
src/main/java/com/ruoyi/production/pojo/ProductionOrder.java | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
index 2206cad..5421995 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
@@ -1,5 +1,6 @@
package com.ruoyi.production.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.bean.dto.ProductionOrderDto;
@@ -32,7 +33,7 @@
@GetMapping("/page")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public R page(ProductionOrderDto dto, Page<ProductionOrderDto> page) {
+ public R<IPage<ProductionOrderVo>> page(ProductionOrderDto dto, Page<ProductionOrderDto> page) {
return R.ok(productionOrderService.pageProductionOrder(page, dto));
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
index a5570dd..bc805bc 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
@@ -77,6 +77,4 @@
@Schema(description = "鐘舵�侊紙1.寰呭紑濮嬨��2.杩涜涓��3.宸插畬鎴愩��4.宸插彇娑堬級")
private Integer status;
- @Schema(description = "寮哄害")
- private String strength;
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
index 8e70889..2f9d675 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
@@ -86,7 +86,6 @@
productionOrder.setQuantity(productionPlanDto.getTotalAssignedQuantity());
productionOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
productionOrder.setStatus(ProductOrderStatusEnum.WAIT.getCode());
- productionOrder.setStrength(productionPlanDto.getStrength());
return true;
}
--
Gitblit v1.9.3