From 85f15182f6a6d97ad86739967e59e80299e1b98f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 09 九月 2025 14:14:10 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
index 0eaf8d2..efe6155 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
@@ -148,6 +148,9 @@
@ApiModelProperty("浼樺厛绾�")
private Integer sorted;
+ @ApiModelProperty("浠撳簱绫诲瀷")
+ private Integer wareType;
+
/**
* 鍟嗗搧搴撳瓨绱㈠紩
*/
@@ -233,6 +236,17 @@
return null;
}
+ public String getWareType$(){
+ if (wareType == null) {return null;}
+ if (wareType == 1) {
+ return "绔嬪簱";
+ } else if (wareType == 2) {
+ return "骞冲簱";
+ } else {
+ return "绔嬪簱/骞冲簱";
+ }
+ }
+
public String getMatId$(){
MatService service = SpringUtils.getBean(MatService.class);
Mat mat = service.getById(this.matId);
--
Gitblit v1.9.1