From 134dce5c589094fdad6c572fd56770922d9692a9 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期四, 10 七月 2025 21:31:59 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/WrkDetl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 926771d..ab69cc5 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -15,6 +15,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
@Data
@TableName("asr_wrk_detl")
@@ -51,7 +52,7 @@
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "瑙勬牸")
private String matnr;
/**
@@ -390,11 +391,11 @@
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)){
+ List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
+ for (BasBoxType basBoxType:basBoxTypes){
return String.valueOf(basBoxType.getBoxSpecs());
}
- return null;
+ return this.brand;
}
public void sync(Object source) {
--
Gitblit v1.9.1