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/WaitPakinLog.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaitPakinLog.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaitPakinLog.java
index 4437b20..9bfdbcf 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaitPakinLog.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaitPakinLog.java
@@ -5,6 +5,7 @@
import java.util.Date;
import com.zy.asrs.wms.asrs.service.OrderDetlLogService;
+import com.zy.asrs.wms.asrs.service.OrderDetlService;
import com.zy.asrs.wms.asrs.service.OrderLogService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
@@ -128,6 +129,18 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鍟嗗搧缂栧彿
+ */
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ private String matnr;
+
+ /**
+ * 鎵瑰彿
+ */
+ @ApiModelProperty(value= "鎵瑰彿")
+ private String batch;
+
public WaitPakinLog() {}
public WaitPakinLog(Long orderId,String orderNo,Double anfme,String barcode,Long detlId,Integer ioStatus,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
@@ -173,6 +186,15 @@
return null;
}
+ public OrderDetlLog getDetl$(){
+ OrderDetlLogService service = SpringUtils.getBean(OrderDetlLogService.class);
+ OrderDetlLog orderDetlLog = service.getById(this.detlId);
+ if (!Cools.isEmpty(orderDetlLog)){
+ return orderDetlLog;
+ }
+ return null;
+ }
+
public String getDetlId$(){
OrderDetlLogService service = SpringUtils.getBean(OrderDetlLogService.class);
OrderDetlLog orderDetlLog = service.getById(this.detlId);
--
Gitblit v1.9.1