From 08b4403ec8d6b69528d161cfcad80b5d64dea76c Mon Sep 17 00:00:00 2001
From: Administrator <876263681@qq.com>
Date: 星期三, 02 七月 2025 15:12:43 +0800
Subject: [PATCH] #优化库位检索
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 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..0f4bd0c 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.WrkMastLogService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -48,13 +50,13 @@
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鍝佸彿")
private String matnr;
/**
* 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鍝佸悕")
private String maktx;
/**
@@ -91,7 +93,8 @@
/**
* 鍝佺墝
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "绫诲瀷")
+// @ApiModelProperty(value= "鍝佺墝")
private String brand;
/**
@@ -268,6 +271,10 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "bom鍙�")
+ @TableField("bom_code")
+ private String bomCode;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
@@ -357,5 +364,20 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public String getIoType$(){
+ if (Cools.isEmpty(this.wrkNo) || Cools.isEmpty(this.ioTime)){
+ return "";
+ }
+ WrkMastLogService wrkMastLogService = SpringUtils.getBean(WrkMastLogService.class);
+ EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
+ wrapper.eq("wrk_no", wrkNo);
+ wrapper.eq("io_time", ioTime);
+ WrkMastLog wrkMastLog = wrkMastLogService.selectOne(wrapper);
+ if (Cools.isEmpty(wrkMastLog)){
+ return "";
+ }
+ return wrkMastLog.getIoType$();
+ }
+
}
--
Gitblit v1.9.1