From 6b7bd186b3216dbc991eba9db751b59dd95492ad Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 26 三月 2026 11:21:45 +0800
Subject: [PATCH] feat:1.生产订单增加清场记录弹框（保存查看）
---
src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java | 13 +++++++++++++
src/main/java/com/ruoyi/production/controller/ProductOrderController.java | 7 +++++++
src/main/java/com/ruoyi/production/service/ProductOrderService.java | 3 +++
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 6 +++++-
src/main/java/com/ruoyi/production/pojo/ProductOrder.java | 6 ++++++
5 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index 40a9bcd..1705753 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -5,12 +5,13 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
@TableName("product_model")
-public class ProductModel {
+public class ProductModel implements Serializable {
private static final long serialVersionUID = 1L;
@@ -51,12 +52,15 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
@TableField(exist = false)
@Excel(name = "鍏ュ簱鏁伴噺")
private BigDecimal inboundNum;
+
@TableField(exist = false)
@Excel(name = "鍑哄簱鏁伴噺")
private BigDecimal outboundNum;
+
@TableField(exist = false)
@Excel(name = "鍓╀綑搴撳瓨")
private BigDecimal stockQuantity;
diff --git a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
index d513b6c..6896542 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
@@ -15,6 +15,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.Map;
@RequestMapping("/productOrder")
@RestController
@@ -77,4 +78,10 @@
public R finishOrder(@PathVariable Long id) {
return R.ok(productOrderService.finishOrder(id));
}
+
+ @ApiOperation("鏇存柊鐢熶骇璁㈠崟鐨勬竻鍦鸿褰�")
+ @PatchMapping("/cleanRecord/{id}")
+ public R cleanRecord(@PathVariable Long id, @RequestBody Map<String, Object> cleanRecord) {
+ return R.ok(productOrderService.cleanRecord(id, cleanRecord));
+ }
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
index 7367483..126cf8f 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -117,4 +117,10 @@
private String batchNo;
private Boolean isEnd;
+
+ /**
+ * 娓呭満璁板綍
+ */
+ @ApiModelProperty(value = "娓呭満璁板綍")
+ private String cleanRecord;
}
diff --git a/src/main/java/com/ruoyi/production/service/ProductOrderService.java b/src/main/java/com/ruoyi/production/service/ProductOrderService.java
index 44edb22..0389601 100644
--- a/src/main/java/com/ruoyi/production/service/ProductOrderService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductOrderService.java
@@ -9,6 +9,7 @@
import com.ruoyi.production.pojo.ProductOrder;
import java.util.List;
+import java.util.Map;
public interface ProductOrderService extends IService<ProductOrder> {
@@ -26,4 +27,6 @@
Boolean delete(Long[] id);
int finishOrder(Long orderId);
+
+ int cleanRecord(Long id, Map<String, Object> cleanRecord);
}
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 c7ea9f2..65498fc 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.production.service.impl;
import cn.hutool.core.util.BooleanUtil;
+import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,6 +9,7 @@
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.exception.base.BaseException;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.dto.ProductOrderDto;
import com.ruoyi.production.dto.ProductStructureDto;
@@ -22,6 +24,7 @@
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
@Service
@@ -216,4 +219,14 @@
productOrder.setIsEnd(true);
return productOrderMapper.updateById(productOrder);
}
+
+ @Override
+ public int cleanRecord(Long id, Map<String, Object> cleanRecord) {
+ ProductOrder productOrder = productOrderMapper.selectById(id);
+ if (productOrder == null) {
+ throw new BaseException("璁㈠崟涓嶅瓨鍦�");
+ }
+ productOrder.setCleanRecord(JSON.toJSONString(cleanRecord));
+ return productOrderMapper.updateById(productOrder);
+ }
}
--
Gitblit v1.9.3