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 |   87 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 87 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/RowLastno.java b/src/main/java/com/zy/asrs/entity/RowLastno.java
index 82cf0e3..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,8 @@
 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;
 import com.core.common.Cools;
@@ -40,6 +42,13 @@
     @ApiModelProperty(value= "褰撳墠鎺掑彿")
     @TableField("current_row")
     private Integer currentRow;
+
+    /**
+     * 褰撳墠鍫嗗灈鏈哄彿
+     */
+    @ApiModelProperty(value= "褰撳墠鍫嗗灈鏈哄彿")
+    @TableField("current_crn_no")
+    private Integer currentCrnNo;
 
     /**
      * 璧峰鎺掑彿
@@ -142,6 +151,34 @@
     @TableField("sta_no_list")
     private String staNoList;
 
+    /**
+     * 搴撶被鍨婭D
+     */
+    @ApiModelProperty(value= "搴撶被鍨婭D")
+    @TableField("type_id")
+    private Integer typeId;
+
+    /**
+     * 鐩镐技鐗╂枡寮�鍏�
+     */
+    @ApiModelProperty(value= "鐩镐技鐗╂枡寮�鍏�")
+    @TableField("be_similar")
+    private String beSimilar;
+
+    /**
+     * 鏄惁瀛樺湪鐐逛綅
+     */
+    @ApiModelProperty(value= "鏄惁瀛樺湪鐐逛綅")
+    @TableField("point_switch")
+    private String pointSwitch;
+
+    /**
+     * 绌烘澘闈犺繎鎽嗘斁
+     */
+    @ApiModelProperty(value= "绌烘澘闈犺繎鎽嗘斁")
+    @TableField("empty_similar")
+    private String emptySimilar;
+
     public RowLastno() {}
 
     public RowLastno(String wrkMk,Integer currentRow,Integer sRow,Integer eRow,Integer crnQty,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Integer limintLoc) {
@@ -194,6 +231,14 @@
 
     public void setCurrentRow(Integer currentRow) {
         this.currentRow = currentRow;
+    }
+
+    public Integer getCurrentCrnNo() {
+        return currentCrnNo;
+    }
+
+    public void setCurrentCrnNo(Integer currentCrnNo) {
+        this.currentCrnNo = currentCrnNo;
     }
 
     public Integer getsRow() {
@@ -347,4 +392,46 @@
         this.staNoList = StaNoList;
     }
 
+    public Integer getTypeId() {
+        return typeId;
+    }
+    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()+"<==>"+basWhs.getWhsDesc();
+        }
+        return typeId.toString();
+    }
+
+    public void setTypeId(Integer typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getBeSimilar() {
+        return beSimilar;
+    }
+
+    public void setBeSimilar(String beSimilar) {
+        this.beSimilar = beSimilar;
+    }
+
+    public String getPointSwitch() {
+        return pointSwitch;
+    }
+
+    public void setPointSwitch(String pointSwitch) {
+        this.pointSwitch = pointSwitch;
+    }
+
+    public String getEmptySimilar() {
+        return emptySimilar;
+    }
+
+    public void setEmptySimilar(String emptySimilar) {
+        this.emptySimilar = emptySimilar;
+    }
+
 }

--
Gitblit v1.9.1