From 3bd8d07970d6743204361ab3cabec44d5b456c9d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 22 一月 2026 10:37:30 +0800
Subject: [PATCH] 修改入库出库sql
---
src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java | 6 ++++++
src/main/java/com/ruoyi/stock/controller/StockInRecordController.java | 2 +-
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 7 ++++---
src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java | 2 +-
src/main/resources/mapper/stock/StockInRecordMapper.xml | 7 ++++---
src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java | 3 +++
6 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
index 0c6fa02..e5bdef2 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
@@ -22,7 +22,7 @@
@Autowired
private StockInRecordService stockInRecordService;
- @GetMapping("/listPageByProduction")
+ @GetMapping("/listPage")
@Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鍒楄〃", businessType = BusinessType.OTHER)
@ApiOperation(value = "鍏ュ簱绠＄悊鍒楄〃")
public AjaxResult listPage(Page page, StockInRecordDto stockInRecordDto) {
diff --git a/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java b/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
index bf8a619..70bed1d 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
@@ -28,7 +28,7 @@
@Autowired
private StockOutRecordService stockOutRecordService;
- @GetMapping("/listPageByProduction")
+ @GetMapping("/listPage")
@Log(title = "鐢熶骇鍑哄簱-鍑哄簱绠＄悊-鍒楄〃", businessType = BusinessType.OTHER)
@ApiOperation(value = "鍑哄簱绠＄悊鍒楄〃")
public AjaxResult listPage(Page page, StockOutRecordDto stockOutRecordDto) {
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
index 2ac682c..5419ced 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -3,6 +3,7 @@
import com.ruoyi.stock.pojo.StockInRecord;
import lombok.Data;
+
@Data
public class StockInRecordDto extends StockInRecord {
/**
@@ -17,4 +18,6 @@
* 浜у搧鍗曚綅
*/
private String unit;
+
+ private String timeStr;
}
diff --git a/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
index 6c9d455..e288256 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
@@ -1,7 +1,13 @@
package com.ruoyi.stock.dto;
import com.ruoyi.stock.pojo.StockOutRecord;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
public class StockOutRecordDto extends StockOutRecord {
/**
* 浜у搧鍚嶇О
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index b4f31dc..8064b7b 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -4,12 +4,13 @@
<select id="listPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
SELECT
- sir.*
- pm.product_name as productName,
+ sir.*,
+ p.product_name as productName,
pm.model,
pm.unit
FROM stock_in_record as sir
- LEFT JOIN product_models as pm on sir.product_model_id = pm.id
+ LEFT JOIN product_model as pm on sir.product_model_id = pm.id
+ LEFT JOIN product as p on pm.product_id = p.id
<where>
<if test="params.timeStr != null and params.timeStr != ''">
and sir.create_time like concat('%',#{param.timeStr},'%')
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index ea8e9f9..369e28f 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -20,12 +20,13 @@
<select id="listPage" resultType="com.ruoyi.stock.dto.StockOutRecordDto">
SELECT
- sor.*
- pm.product_name as productName,
+ sor.*,
+ p.product_name as productName,
pm.model,
pm.unit
FROM stock_out_record as sor
- LEFT JOIN product_models as pm on sor.product_model_id = pm.id
+ LEFT JOIN product_model as pm on sor.product_model_id = pm.id
+ LEFT JOIN product as p on pm.product_id = p.id
<where>
<if test="params.timeStr != null and params.timeStr != ''">
and sor.create_time like concat('%',#{param.timeStr},'%')
--
Gitblit v1.9.3