From 4b079b635d7d968496c7c13ab97a32fd815ebf43 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 27 三月 2026 20:40:36 +0800
Subject: [PATCH] no message

---
 src/main/java/com/zy/asrs/entity/WaitPakin.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 159a96a..948ee02 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -13,6 +13,8 @@
 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;
 
@@ -177,7 +179,7 @@
      * 澶囩敤1
      */
     @ApiModelProperty(value= "澶囩敤1")
-    private String standby1 = "";
+    private String standby1;
 
     /**
      * 澶囩敤2
@@ -196,7 +198,7 @@
      */
     @ApiModelProperty(value= "澶囩敤1")
     @TableField("box_type1")
-    private String boxType1 = "1";
+    private String boxType1;
 
     /**
      * 澶囩敤2
@@ -250,9 +252,21 @@
         }
     }
 
+    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("matnr", this.matnr));
+        Mat order = service.selectOne(new EntityWrapper<Mat>()
+                .eq("supp_code", this.suppCode)
+                .eq("matnr", this.matnr));
         if (Cools.isEmpty(order)){
             return null;
         }

--
Gitblit v1.9.1