From d9fd877179522eac8ebb34da661d1f1efd8ef9b6 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 27 三月 2026 20:38:10 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 06ae509..948ee02 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -7,15 +7,21 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.api.enums.MatLocType;
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
+import com.zy.asrs.service.MatService;
+import com.zy.asrs.service.TagService;
import com.zy.common.utils.Synchro;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Objects;
@Data
@TableName("cust_wait_pakin")
@@ -173,7 +179,7 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private String standby1 = "";
+ private String standby1;
/**
* 澶囩敤2
@@ -192,7 +198,7 @@
*/
@ApiModelProperty(value= "澶囩敤1")
@TableField("box_type1")
- private String boxType1 = "1";
+ private String boxType1;
/**
* 澶囩敤2
@@ -246,6 +252,27 @@
}
}
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+
+ public String getTag$() {
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat order = service.selectOne(new EntityWrapper<Mat>()
+ .eq("supp_code", this.suppCode)
+ .eq("matnr", this.matnr));
+ if (Cools.isEmpty(order)){
+ return null;
+ }
+ return order.getTagId$();
+ }
+
public String getType$(){
if (null == this.type){ return null; }
switch (this.type){
--
Gitblit v1.9.1