From 6094ce292d9d905af8dbee21d8f7521b4285f0c9 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 24 三月 2026 13:53:15 +0800
Subject: [PATCH] 生产订单增加预计日程和制造班组
---
src/main/resources/mapper/production/ProductOrderMapper.xml | 2 ++
src/main/java/com/ruoyi/production/controller/ProductOrderController.java | 9 +++------
src/main/java/com/ruoyi/production/pojo/ProductOrder.java | 10 ++++++++--
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
index e1c22d1..eef5b98 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
@@ -1,13 +1,11 @@
package com.ruoyi.production.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProductOrderDto;
-import com.ruoyi.production.pojo.ProcessRoute;
import com.ruoyi.production.pojo.ProductOrder;
import com.ruoyi.production.service.ProductOrderService;
import io.swagger.annotations.Api;
@@ -16,10 +14,9 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
import java.util.List;
-@RequestMapping("productOrder")
+@RequestMapping("/productOrder")
@RestController
@Api(tags = "鐢熶骇璁㈠崟")
public class ProductOrderController {
@@ -29,7 +26,7 @@
@ApiOperation("鍒嗛〉鏌ヨ")
- @GetMapping("page")
+ @GetMapping("/page")
public R page(ProductOrderDto productOrder, Page page) {
return R.ok(productOrderService.pageProductOrder(page, productOrder));
}
@@ -65,7 +62,7 @@
@ApiOperation("鏂板鐢熶骇璁㈠崟")
- @PostMapping("addProductOrder")
+ @PostMapping("/addProductOrder")
public R addProductOrder(@RequestBody ProductOrder productOrder) {
return R.ok(productOrderService.addProductOrder(productOrder));
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
index 5286cd3..7ea42ae 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -101,6 +100,13 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
+ /**
+ * 棰勮鏃ョ▼
+ */
+ private BigDecimal expectedSchedule;
-
+ /**
+ * 鍒堕�犵彮缁�
+ */
+ private String manufacturingTeam;
}
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index 6b993bf..f1750da 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -12,6 +12,8 @@
<result property="npsNo" column="nps_no"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
+ <result property="expectedSchedule" column="expected_schedule"/>
+ <result property="manufacturingTeam" column="manufacturing_team"/>
</resultMap>
<select id="pageProductOrder" resultType="com.ruoyi.production.dto.ProductOrderDto">
select po.*,
--
Gitblit v1.9.3