From 2191824072549f0da35d73686a075e59b0196321 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 25 九月 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetlLog.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetlLog.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetlLog.java
index f2c2426..54e4480 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetlLog.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetlLog.java
@@ -133,6 +133,12 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鍟嗗搧搴撳瓨绱㈠紩
+ */
+ @ApiModelProperty(value= "鍟嗗搧搴撳瓨绱㈠紩")
+ private String stockIndex;
+
public OrderDetlLog() {}
public OrderDetlLog(Long orderId,String orderNo,Double anfme,Double qty,Double workQty,Long matId,String batch,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
@@ -189,6 +195,15 @@
return null;
}
+ public Mat getMat$(){
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat mat = service.getById(this.matId);
+ if (!Cools.isEmpty(mat)){
+ return mat;
+ }
+ return null;
+ }
+
public String getHostId$(){
HostService service = SpringUtils.getBean(HostService.class);
Host host = service.getById(this.hostId);
--
Gitblit v1.9.1