From 82de5a307466894bbb0258f8a63a26a7bb96d80d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 16 十月 2025 09:55:35 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/entity/RowLastno.java | 136 +++++++++++++++++++++++++++++++++++----------
1 files changed, 106 insertions(+), 30 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..0f8a551 100644
--- a/src/main/java/com/zy/asrs/entity/RowLastno.java
+++ b/src/main/java/com/zy/asrs/entity/RowLastno.java
@@ -4,10 +4,13 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+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 io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -22,7 +25,7 @@
/**
* 绫诲埆
*/
- @ApiModelProperty(value= "绫诲埆")
+ @ApiModelProperty(value = "绫诲埆")
@TableId(value = "whs_type", type = IdType.INPUT)
@TableField("whs_type")
private Integer whsType;
@@ -30,121 +33,150 @@
/**
* 褰撳墠宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "褰撳墠宸ヤ綔鍙�")
+ @ApiModelProperty(value = "褰撳墠宸ヤ綔鍙�")
@TableField("wrk_mk")
private String wrkMk;
/**
* 褰撳墠鎺掑彿
*/
- @ApiModelProperty(value= "褰撳墠鎺掑彿")
+ @ApiModelProperty(value = "褰撳墠鎺掑彿")
@TableField("current_row")
private Integer currentRow;
/**
* 璧峰鎺掑彿
*/
- @ApiModelProperty(value= "璧峰鎺掑彿")
+ @ApiModelProperty(value = "璧峰鎺掑彿")
@TableField("s_row")
private Integer sRow;
/**
* 缁堟鎺掑彿
*/
- @ApiModelProperty(value= "缁堟鎺掑彿")
+ @ApiModelProperty(value = "缁堟鎺掑彿")
@TableField("e_row")
private Integer eRow;
/**
* 鍫嗗灈鏈烘暟閲�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈烘暟閲�")
+ @ApiModelProperty(value = "鍫嗗灈鏈烘暟閲�")
@TableField("crn_qty")
private Integer crnQty;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("limint_loc")
private Integer limintLoc;
/**
* 璧峰鍫嗗灈鏈哄彿
*/
- @ApiModelProperty(value= "璧峰鍫嗗灈鏈哄彿")
+ @ApiModelProperty(value = "璧峰鍫嗗灈鏈哄彿")
@TableField("s_crn_no")
private Integer sCrnNo;
/**
* 缁堟鍫嗗灈鏈哄彿
*/
- @ApiModelProperty(value= "缁堟鍫嗗灈鏈哄彿")
+ @ApiModelProperty(value = "缁堟鍫嗗灈鏈哄彿")
@TableField("e_crn_no")
private Integer eCrnNo;
/**
* 鏍囪绫诲埆锛堟槸鍚﹁緭閫佺嚎浜掗�氾級
*/
- @ApiModelProperty(value= "鏍囪绫诲埆")
+ @ApiModelProperty(value = "鏍囪绫诲埆")
@TableField("sign_type")
private Integer signType;
/**
* 鏄惁鍚敤鍏跺畠鏍囪绫诲埆 0:鍏抽棴 1锛氭墦寮�
*/
- @ApiModelProperty(value= "鏄惁鍚敤鍏跺畠鏍囪绫诲埆")
+ @ApiModelProperty(value = "鏄惁鍚敤鍏跺畠鏍囪绫诲埆")
@TableField("sign_type_other")
private Integer signTypeOther;
/**
* 鍏跺畠鏍囪绫诲埆锛堟槸鍚﹁緭閫佺嚎浜掗�氾級
*/
- @ApiModelProperty(value= "鍏跺畠鏍囪绫诲埆")
+ @ApiModelProperty(value = "鍏跺畠鏍囪绫诲埆")
@TableField("sign_type_other_boolean")
private String signTypeOtherBoolean;
/**
* 鍏跺畠鏍囪绫诲埆锛堟槸鍚﹁緭閫佺嚎浜掗�氾級
*/
- @ApiModelProperty(value= "鍏ュ簱绔欑偣闆嗗悎")
+ @ApiModelProperty(value = "鍏ュ簱绔欑偣闆嗗悎")
@TableField("sta_no_list")
private String staNoList;
- public RowLastno() {}
+ /**
+ * 搴撶被鍨婭D
+ */
+ @ApiModelProperty(value = "搴撶被鍨婭D")
+ @TableField("type_id")
+ private Integer typeId;
- public RowLastno(String wrkMk,Integer currentRow,Integer sRow,Integer eRow,Integer crnQty,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Integer limintLoc) {
+ /**
+ * 鐩镐技鐗╂枡寮�鍏�
+ */
+ @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) {
this.wrkMk = wrkMk;
this.currentRow = currentRow;
this.sRow = sRow;
@@ -232,10 +264,10 @@
return modiUser;
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -249,8 +281,8 @@
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
@@ -264,10 +296,10 @@
return appeUser;
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -281,8 +313,8 @@
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
@@ -299,6 +331,7 @@
public void setLimintLoc(Integer limintLoc) {
this.limintLoc = limintLoc;
}
+
public Integer getsCrnNo() {
return sCrnNo;
}
@@ -347,4 +380,47 @@
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.selectOne(new EntityWrapper<BasWhs>().eq("identifying", 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