From e726415232fd4141135a399aa51ffafd45d8deff Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 07 十一月 2024 20:12:22 +0800
Subject: [PATCH] 一楼返修入库，和出库推送mes记录日志
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 4af7c47..a97aa6a 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -397,14 +397,14 @@
}
public String getInspect$(){
- if (null == this.inspect){ return null; }
+ if (null == this.inspect){ return "寰呭璐�"; }
switch (this.inspect){
case 1:
- return "鏄�";
- case 0:
- return "鍚�";
+ return "澶囪揣涓�";
+ case 2:
+ return "宸插璐�";
default:
- return String.valueOf(this.inspect);
+ return "寰呭璐�";
}
}
@@ -417,14 +417,14 @@
}
public String getDanger$(){
- if (null == this.danger){ return null; }
+ if (null == this.danger){ return "寰呯Щ搴�"; }
switch (this.danger){
case 1:
- return "鏄�";
- case 0:
- return "鍚�";
+ return "绉诲簱涓�";
+ case 2:
+ return "绉诲簱瀹屾垚";
default:
- return String.valueOf(this.danger);
+ return "寰呯Щ搴�";
}
}
@@ -499,7 +499,7 @@
if (!Cools.isEmpty(basBoxType)){
return String.valueOf(basBoxType.getBoxSpecs());
}
- return null;
+ return this.brand;
}
}
\ No newline at end of file
--
Gitblit v1.9.1