From f6513ffa7e2efe2a4dc81626c7aab9cf643f8f41 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 14 三月 2024 10:14:28 +0800
Subject: [PATCH] 1.增加牌号作为唯一物料条件 （当前牌号 批号 包号可以筛选出唯一物料） 2.增加移库接口 3.订单出库可替换物料 4.页面ui完善
---
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 39011f1..4df9222 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -7,6 +7,8 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.LocOwnerService;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -162,9 +164,9 @@
private Integer owner;
/**
- * 鏄惁浠樻
+ * 璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�
*/
- @ApiModelProperty(value= "鏄惁浠樻0锛氭湭浠樻銆�1锛氬凡浠樻 ")
+ @ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�")
private Integer payment;
/**
@@ -188,9 +190,9 @@
if (null == this.payment){ return null; }
switch (this.payment){
case 1:
- return "宸蹭粯娆�";
+ return "浠撳偍";
case 0:
- return "鏈粯娆�";
+ return "浠ｉ噰";
default:
return String.valueOf(this.payment);
}
@@ -260,4 +262,13 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.1