From d52b5d11199cc6b7cec42deb82c831a4ed15a3b4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 31 五月 2024 14:56:58 +0800
Subject: [PATCH] 仓库： 显示在库信息，入库完成后显示成功入库的包数 订单出库页面显示剩余待检包数 (PDA) 未查询到的提示改为显示物料实际状态 拣货单已完成，单据未完成 ✔ 单据数量字段显示变更 ✔ 拣货单按实际操作时间降序排序 ✔ 拣货单明细导出 ✔ 拣货单显示创建时间与操作时间 ✔
---
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