From 833a285ef00a84fc1a88464eb3d7d1934cf71ff6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 23 四月 2026 14:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子
---
src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
index 1aed75c..a2df741 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -15,6 +15,10 @@
*/
private String model;
/**
+ * 浜у搧鏂欏彿
+ */
+ private String materialCode;
+ /**
* 浜у搧鍗曚綅
*/
private String unit;
@@ -25,4 +29,10 @@
//鐜板瓨閲�
private String currentStock;
+
+ //璁㈠崟
+ private String npsNo;
+
+ //宸ュ崟
+ private String workOrderNo;
}
--
Gitblit v1.9.3