From 19ea4c28298563e9bb99434f50e9847087be6540 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 27 三月 2026 17:53:16 +0800
Subject: [PATCH] Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_长治_健齿齿科器材
---
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java | 1 +
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 2 ++
src/main/java/com/ruoyi/stock/pojo/StockInRecord.java | 3 ++-
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 2 +-
src/main/resources/mapper/stock/StockInventoryMapper.xml | 4 ++--
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 1 -
6 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
index 03deee4..d87a80f 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -140,5 +140,6 @@
@ApiModelProperty("鏄惁涓嶅悎鏍煎鐞嗚嚜宸辨柊澧�")
@TableField(exist = false)
private Boolean method;
+ @TableField(exist = false)
private String uidNo;
}
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 9c7c7bc..1f00a00 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -3,11 +3,13 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.stock.pojo.StockInventory;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDate;
+@EqualsAndHashCode(callSuper = true)
@Data
public class StockInventoryDto extends StockInventory {
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
index 395d18f..c0b8a27 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
@@ -7,13 +7,14 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
@TableName("stock_in_record")
@ApiModel("鍏ュ簱绠＄悊")
-public class StockInRecord {
+public class StockInRecord implements Serializable {
private static final long serialVersionUID = 1L;
/**
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
index 5cb6dda..62e7236 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 9013be3..7dfe862 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -64,7 +64,7 @@
pm.model,
si.remark,
pm.unit,
- pm.uidNo,
+ pm.uid_no as uidNo,
p.product_name
from stock_inventory si
left join product_model pm on si.product_model_id = pm.id
@@ -95,7 +95,7 @@
select sir.*,si.qualitity as current_stock,
pm.model,
pm.unit,
- pm.uidNo,
+ pm.uid_no as uidNo,
p.product_name,
su.nick_name as create_by
from
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index 5ab2916..306a298 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -23,7 +23,7 @@
p.product_name as productName,
pm.model,
pm.unit,
- pm.uidNo,
+ pm.uid_no as uidNo,
u.nick_name as createBy
FROM stock_out_record as sor
LEFT JOIN product_model as pm on sor.product_model_id = pm.id
--
Gitblit v1.9.3