From e549bc25fce8679682e7698c9ad725dfaf37d82c Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期一, 15 十二月 2025 16:52:28 +0800
Subject: [PATCH] #平板入
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 12178a7..43bf291 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -9,16 +9,12 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasProcessProceduresService;
-import com.zy.asrs.service.BasQualityTestingService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.LocOwnerService;
+import com.zy.asrs.service.*;
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 lombok.experimental.Accessors;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -27,7 +23,6 @@
@Data
@TableName("asr_loc_detl")
-@Accessors(chain = true)
@ExcelIgnoreUnannotated
public class LocDetl implements Serializable {
@@ -261,6 +256,12 @@
LocMast locMast = service.selectById(this.locNo);
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
+ }else {
+ LocCacheService service2 = SpringUtils.getBean(LocCacheService.class);
+ LocCache locCache = service2.selectOne(new EntityWrapper<LocCache>().eq("loc_no", this.locNo));
+ if (!Cools.isEmpty(locCache)){
+ return String.valueOf(locCache.getLocNo());
+ }
}
return null;
}
@@ -284,6 +285,15 @@
}
}
+ public String getTag$() {
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat order = service.selectOne(new EntityWrapper<Mat>().eq("matnr", this.matnr));
+ if (Cools.isEmpty(order)){
+ return null;
+ }
+ return order.getTagId$();
+ }
+
public String getSource$(){
if (null == this.source){ return null; }
switch (this.source){
--
Gitblit v1.9.1