From 83425ecab7ea13a6f5cbe877b1313f3e7a42b8b1 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 15 八月 2024 14:13:18 +0800
Subject: [PATCH] 成品入库修改
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 0383b98..cf70ea5 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasBoxTypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -268,6 +270,13 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鍗蜂俊鎭疘D
+ */
+ @ApiModelProperty(value= "鍗蜂俊鎭疘D")
+ @TableField("roll_up")
+ private Long rollUp;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
@@ -287,17 +296,37 @@
}
}
+// public String getSource$(){
+// if (null == this.source){ return null; }
+// switch (this.source){
+// case 1:
+// return "鍒堕��";
+// case 2:
+// return "閲囪喘";
+// case 3:
+// return "澶栧崗";
+// default:
+// return String.valueOf(this.source);
+// }
+// }
+
public String getSource$(){
- if (null == this.source){ return null; }
+ if (null == this.source){ return "鏈‘璁�"; }
switch (this.source){
case 1:
- return "鍒堕��";
- case 2:
- return "閲囪喘";
- case 3:
- return "澶栧崗";
+ return "宸茬‘璁�";
default:
- return String.valueOf(this.source);
+ return "鏈‘璁�";
+ }
+ }
+
+ public String getDeadTime(){
+ if (null == this.source){ return "鏈‘璁�"; }
+ switch (this.source){
+ case 1:
+ return "宸茬‘璁�";
+ default:
+ return "鏈‘璁�";
}
}
@@ -357,5 +386,14 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public String getBrand$(){
+ BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+ BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_type", this.brand));
+ if (!Cools.isEmpty(basBoxType)){
+ return String.valueOf(basBoxType.getBoxSpecs());
+ }
+ return this.brand;
+ }
+
}
--
Gitblit v1.9.1