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/LocInPrintMat.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocInPrintMat.java b/src/main/java/com/zy/asrs/entity/LocInPrintMat.java
index 07be576..072f075 100644
--- a/src/main/java/com/zy/asrs/entity/LocInPrintMat.java
+++ b/src/main/java/com/zy/asrs/entity/LocInPrintMat.java
@@ -5,6 +5,7 @@
import com.core.common.Cools;import java.text.SimpleDateFormat;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.zy.asrs.service.LocOwnerService;
import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
@@ -112,6 +113,12 @@
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
+ /**
+ * 鍟嗗搧鍚嶇О
+ */
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ private Long ownerId;
+
public LocInPrintMat() {}
public LocInPrintMat(String uuid,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,String matnr,String batch,Double anfme,String locNo,String maktx) {
@@ -130,7 +137,7 @@
}
public LocInPrintMat(Date now,Long userId,String matnr,String batch,Double anfme,String locNo,String maktx) {
- this.uuid = now.toString();
+ this.uuid = String.valueOf(now.getTime());
this.createTime = now;
this.createBy = userId;
// this.updateTime = now;
@@ -185,6 +192,15 @@
return null;
}
+ public String getOwner$(){
+ LocOwnerService locOwnerService = SpringUtils.getBean(LocOwnerService.class);
+ LocOwner locOwner = locOwnerService.selectById(this.ownerId);
+ if (!Cools.isEmpty(locOwner)){
+ return String.valueOf(locOwner.getOwner());
+ }
+ return null;
+ }
+
public String getUpdateTime$(){
if (Cools.isEmpty(this.updateTime)){
return "";
--
Gitblit v1.9.1