From f6513ffa7e2efe2a4dc81626c7aab9cf643f8f41 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 14 三月 2024 10:14:28 +0800
Subject: [PATCH] 1.增加牌号作为唯一物料条件 （当前牌号 批号 包号可以筛选出唯一物料） 2.增加移库接口 3.订单出库可替换物料 4.页面ui完善
---
src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java b/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java
index a2ab1c4..665d316 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java
@@ -34,15 +34,17 @@
private String specs;
@ExcelProperty("鎵规")
private String batch;
- @ExcelProperty("璐т富")
+ @ExcelProperty("璐т富Id")
private String owner;
- @ExcelProperty("搴撳瓨涓婇檺")
+ @ExcelProperty("璐т富")
+ private String ownerName;
+// @ExcelProperty("搴撳瓨涓婇檺")
private String inventoryMax;
- @ExcelProperty("搴撳瓨涓嬮檺")
+// @ExcelProperty("搴撳瓨涓嬮檺")
private String inventoryMin;
@ExcelProperty("搴撻緞涓婇檺")
private String inventoryAgeMax;
- @ExcelProperty("搴撳瓨鎬绘暟閲�")
+// @ExcelProperty("搴撳瓨鎬绘暟閲�")
private Integer countAnfme;
@ExcelProperty("鍦ㄥ簱澶╂暟")
private Integer diffTime;
@@ -63,6 +65,15 @@
return null;
}
+ public String getOwnerName(){
+ LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+ LocOwner locOwner = service.selectById(this.owner);
+ if (!Cools.isEmpty(locOwner)){
+ return String.valueOf(locOwner.getOwner());
+ }
+ return null;
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
--
Gitblit v1.9.1