From 8b75fe61a3eefe36761aa0f82a79b59342aa6709 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 20 十月 2025 16:10:31 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/RowLastno.java |  168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 164 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/RowLastno.java b/src/main/java/com/zy/asrs/entity/RowLastno.java
index 24896aa..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;
@@ -100,6 +102,76 @@
     @TableField("limint_loc")
     private Integer limintLoc;
 
+    /**
+     * 璧峰鍫嗗灈鏈哄彿
+     */
+    @ApiModelProperty(value= "璧峰鍫嗗灈鏈哄彿")
+    @TableField("s_crn_no")
+    private Integer sCrnNo;
+
+    /**
+     * 缁堟鍫嗗灈鏈哄彿
+     */
+    @ApiModelProperty(value= "缁堟鍫嗗灈鏈哄彿")
+    @TableField("e_crn_no")
+    private Integer eCrnNo;
+
+    /**
+     * 鏍囪绫诲埆锛堟槸鍚﹁緭閫佺嚎浜掗�氾級
+     */
+    @ApiModelProperty(value= "鏍囪绫诲埆")
+    @TableField("sign_type")
+    private Integer signType;
+
+    /**
+     * 鏄惁鍚敤鍏跺畠鏍囪绫诲埆  0:鍏抽棴   1锛氭墦寮�
+     */
+    @ApiModelProperty(value= "鏄惁鍚敤鍏跺畠鏍囪绫诲埆")
+    @TableField("sign_type_other")
+    private Integer signTypeOther;
+
+    /**
+     * 鍏跺畠鏍囪绫诲埆锛堟槸鍚﹁緭閫佺嚎浜掗�氾級
+     */
+    @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() {}
 
     public RowLastno(String wrkMk,Integer currentRow,Integer sRow,Integer eRow,Integer crnQty,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Integer limintLoc) {
@@ -154,19 +226,19 @@
         this.currentRow = currentRow;
     }
 
-    public Integer getSRow() {
+    public Integer getsRow() {
         return sRow;
     }
 
-    public void setSRow(Integer sRow) {
+    public void setsRow(Integer sRow) {
         this.sRow = sRow;
     }
 
-    public Integer getERow() {
+    public Integer geteRow() {
         return eRow;
     }
 
-    public void setERow(Integer eRow) {
+    public void seteRow(Integer eRow) {
         this.eRow = eRow;
     }
 
@@ -257,6 +329,94 @@
     public void setLimintLoc(Integer limintLoc) {
         this.limintLoc = limintLoc;
     }
+    public Integer getsCrnNo() {
+        return sCrnNo;
+    }
 
+    public void setsCrnNo(Integer sCrnNo) {
+        this.sCrnNo = sCrnNo;
+    }
+
+    public Integer geteCrnNo() {
+        return eCrnNo;
+    }
+
+    public void seteCrnNo(Integer eCrnNo) {
+        this.eCrnNo = eCrnNo;
+    }
+
+    public Integer getSignType() {
+        return signType;
+    }
+
+    public void setSignType(Integer signType) {
+        this.signType = signType;
+    }
+
+    public Integer getSignTypeOther() {
+        return signTypeOther;
+    }
+
+    public void setSignTypeOther(Integer signTypeOther) {
+        this.signTypeOther = signTypeOther;
+    }
+
+    public String getSignTypeOtherBoolean() {
+        return signTypeOtherBoolean;
+    }
+
+    public void setSignTypeOtherBoolean(String signTypeOtherBoolean) {
+        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