From 41411a57fc0d237577aa10ccfc1aded50556f5ba Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 28 三月 2026 13:35:23 +0800
Subject: [PATCH] Revert "添加的分属环境配置文件 暂停上报功能"
---
src/main/java/com/zy/asrs/entity/OrderPakout.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakout.java b/src/main/java/com/zy/asrs/entity/OrderPakout.java
index bab33e7..ec37294 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakout.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.api.enums.OrderWkType;
import com.zy.asrs.entity.BasAreas;
import com.zy.asrs.service.BasAreasService;
import com.zy.asrs.service.DocTypeService;
@@ -380,15 +381,14 @@
return null;
}
- public String getPayType$(){
- if (null == this.payType){ return null; }
- switch (this.payType){
- case 1:
- return "鐜伴噾";
- case 2:
- return "璁拌处";
- default:
- return String.valueOf(this.payType);
+ public String getShipName$(){
+ if (null == this.shipName){ return OrderWkType.ORDER_WK_ORDER_OUT_SO.desc; }
+ if (this.shipName.equals(OrderWkType.ORDER_WK_ORDER_OUT_EO.val)){
+ return OrderWkType.ORDER_WK_ORDER_OUT_EO.desc;
+ } else if (this.shipName.equals(OrderWkType.ORDER_WK_ORDER_OUT_SO.val)){
+ return OrderWkType.ORDER_WK_ORDER_OUT_SO.desc;
+ } else {
+ return OrderWkType.ORDER_WK_ORDER_OUT.desc;
}
}
--
Gitblit v1.9.1