From 01a820eb2c03c4602bdf0fc3480207869d5b27ad Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 09 十一月 2025 16:45:53 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index 4b3f7e0..f13553a 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -8,6 +8,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasBoxTypeService;
+import com.zy.asrs.service.OrderPakoutService;
import com.zy.asrs.service.OrderService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -259,7 +260,7 @@
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value= "鐘舵�� 1: 鏈笂鎶� 0: 绂佺敤 2: 绛夊緟涓婃姤 3: 涓婃姤瀹屾垚")
private Integer status;
/**
@@ -354,8 +355,8 @@
}
public String getOrderId$(){
- OrderService service = SpringUtils.getBean(OrderService.class);
- Order order = service.selectById(this.orderId);
+ OrderPakoutService service = SpringUtils.getBean(OrderPakoutService.class);
+ OrderPakout order = service.selectById(this.orderId);
if (!Cools.isEmpty(order)){
return String.valueOf(order.getId());
}
@@ -440,6 +441,8 @@
return "绂佺敤";
case 2:
return "绛夊緟涓婃姤";
+ case 3:
+ return "涓婃姤瀹屾垚";
default:
return String.valueOf(this.status);
}
--
Gitblit v1.9.1