From d8d306fd528eba289b0f6795d135fd9db88c9f3f Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 27 三月 2026 20:41:27 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 55 +++++++++++++++++++++++++++
src/main/java/com/zy/asrs/entity/WaitPakin.java | 19 ++++-----
src/main/java/com/zy/asrs/entity/WrkDetl.java | 14 +++++++
src/main/java/com/zy/asrs/entity/param/AgvCallParams.java | 4 ++
4 files changed, 82 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 948ee02..d326394 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -252,16 +252,6 @@
}
}
- 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>()
@@ -297,6 +287,15 @@
}
}
+ 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 getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index ecc80b3..38d9795 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -316,6 +316,20 @@
@TableField("box_type3")
private String boxType3 = "1";
+ @ApiModelProperty("鐮存崯鏁�")
+ @TableField("adjust_qty")
+ private Double adjustQty;
+
+ @ApiModelProperty("涓婃灦鏁�")
+ @TableField("work_qty")
+ private Double workQty;
+
+ @ApiModelProperty("宸紓鏁�")
+ @TableField("splus_qty")
+ private Double splusQty;
+
+
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 48cf60d..a9804f8 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -2,8 +2,12 @@
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.BasAreasService;
+import com.zy.asrs.service.LocCacheService;
+import com.zy.asrs.service.TaskLogService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -13,6 +17,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Objects;
@Data
@TableName("asr_wrk_detl_log")
@@ -313,6 +318,56 @@
@TableField("box_type3")
private String boxType3 = "1";
+ @ApiModelProperty("鐮存崯鏁�")
+ @TableField("adjust_qty")
+ private Double adjustQty;
+
+ @ApiModelProperty("涓婃灦鏁�")
+ @TableField("work_qty")
+ private Double workQty;
+
+ @ApiModelProperty("宸紓鏁�")
+ @TableField("splus_qty")
+ private Double splusQty;
+
+
+ /**
+ * 鑾峰彇搴撳尯绫诲瀷
+ *
+ * @return java.lang.String
+ * @author Ryan
+ * @date 2026/1/19 14:07
+ */
+ public String getAreaType() {
+ if (null == this.wrkNo) {
+ return null;
+ }
+ TaskLogService taskLogService = SpringUtils.getBean(TaskLogService.class);
+ TaskLog taskLog = taskLogService.selectOne(new EntityWrapper<TaskLog>().eq("wrk_no", this.wrkNo));
+ if (Objects.isNull(taskLog)) {
+ return null;
+ }
+ LocCacheService locCacheService = SpringUtils.getBean(LocCacheService.class);
+ LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", taskLog.getLocNo()));
+ if (Objects.isNull(locCache)) {
+ return null;
+ }
+ BasAreasService basAreasService = SpringUtils.getBean(BasAreasService.class);
+ BasAreas basAreas = basAreasService.selectById(locCache.getAreaId());
+ if (Objects.isNull(basAreas)) {
+ return null;
+ }
+ if (basAreas.getAreaNo().equals("SO")) {
+ return "2";
+ } else if (basAreas.getAreaNo().equals("EO")) {
+ return "3";
+ } else if (basAreas.getAreaNo().equals("LK")) {
+ return "1";
+ } else {
+ return "4";
+ }
+ }
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvCallParams.java b/src/main/java/com/zy/asrs/entity/param/AgvCallParams.java
index a50ab2b..e9e1796 100644
--- a/src/main/java/com/zy/asrs/entity/param/AgvCallParams.java
+++ b/src/main/java/com/zy/asrs/entity/param/AgvCallParams.java
@@ -33,10 +33,14 @@
@ApiModelProperty("鎿嶄綔绫诲瀷")
private String type;
+ @ApiModelProperty("鐗╂枡缂栫爜")
+ private String matnr;
+
@ApiModelProperty("鏄惁鏂板彴杞﹀叆搴�")
private List<Integer> isNewIn;
@ApiModelProperty("浠诲姟绫诲瀷")
private String taskType;
+
}
--
Gitblit v1.9.1