From a484168b903a919b24d65a5d95dea88a04d8f34c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 26 十二月 2024 13:50:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

---
 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 82eafd2..e4dedf1 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;
@@ -134,6 +136,41 @@
     @ApiModelProperty(value= "鍏跺畠鏍囪绫诲埆")
     @TableField("sign_type_other_boolean")
     private String signTypeOtherBoolean;
+
+    /**
+     * 鍏跺畠鏍囪绫诲埆锛堟槸鍚﹁緭閫佺嚎浜掗�氾級
+     */
+    @ApiModelProperty(value= "鍏ュ簱绔欑偣闆嗗悎")
+    @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() {}
 
@@ -332,4 +369,54 @@
         this.signTypeOtherBoolean = signTypeOtherBoolean;
     }
 
+    public String getStaNoList() {
+        return staNoList;
+    }
+
+    public void setStaNoList(String StaNoList) {
+        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