From 2acfc2d2a0e956910c51bd996f443b3cb9bd3dc9 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 22 三月 2026 14:27:21 +0800
Subject: [PATCH] 优化找库位规则
---
src/main/java/com/zy/asrs/entity/RowLastno.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/RowLastno.java b/src/main/java/com/zy/asrs/entity/RowLastno.java
index 06d1e23..8be0bc9 100644
--- a/src/main/java/com/zy/asrs/entity/RowLastno.java
+++ b/src/main/java/com/zy/asrs/entity/RowLastno.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.zy.asrs.service.BasWhsService;
import com.zy.asrs.service.RowLastnoTypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -41,6 +42,13 @@
@ApiModelProperty(value= "褰撳墠鎺掑彿")
@TableField("current_row")
private Integer currentRow;
+
+ /**
+ * 褰撳墠鍫嗗灈鏈哄彿
+ */
+ @ApiModelProperty(value= "褰撳墠鍫嗗灈鏈哄彿")
+ @TableField("current_crn_no")
+ private Integer currentCrnNo;
/**
* 璧峰鎺掑彿
@@ -225,6 +233,14 @@
this.currentRow = currentRow;
}
+ public Integer getCurrentCrnNo() {
+ return currentCrnNo;
+ }
+
+ public void setCurrentCrnNo(Integer currentCrnNo) {
+ this.currentCrnNo = currentCrnNo;
+ }
+
public Integer getsRow() {
return sRow;
}
@@ -382,8 +398,10 @@
public String getTypeId$() {
RowLastnoTypeService rowLastnoTypeService = SpringUtils.getBean(RowLastnoTypeService.class);
RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(this.typeId.longValue());
+ BasWhsService basWhsService = SpringUtils.getBean(BasWhsService.class);
+ BasWhs basWhs = basWhsService.selectById(rowLastnoType.getType().longValue());
if (!Cools.isEmpty(rowLastnoType)){
- return rowLastnoType.getTypeName()+"<==>"+rowLastnoType.getMemo();
+ return rowLastnoType.getTypeName()+"<==>"+rowLastnoType.getMemo()+"<==>"+basWhs.getWhsDesc();
}
return typeId.toString();
}
--
Gitblit v1.9.1