From c41f915262427a9469880ae1a7f71c50f1992a63 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 01 九月 2025 15:17:14 +0800
Subject: [PATCH] 添加盘点跑库功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
index 5293829..242362e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
@@ -6,6 +6,8 @@
import java.util.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.manager.service.BasStationService;
import com.vincent.rsf.server.manager.service.LocTypeService;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.entity.DictData;
@@ -64,8 +66,8 @@
/**
* wcs绔欑偣缂栧彿
*/
- @ApiModelProperty(value= "wcs绔欑偣缂栧彿")
- private String wcsCode;
+ @ApiModelProperty(value= "鐩爣浣嶇疆")
+ private String target;
/**
* 绔欑偣鏍囩
@@ -104,6 +106,10 @@
@TableLogic
private Integer deleted;
+ @ApiModelProperty(value= "宸烽亾")
+ private Integer channel;
+
+
/**
* 绉熸埛
*/
@@ -121,6 +127,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -134,6 +141,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
@@ -154,7 +162,7 @@
this.type = type;
this.site = site;
this.name = name;
- this.wcsCode = wcsCode;
+ this.target = wcsCode;
this.label = label;
this.device = device;
this.deviceCode = deviceCode;
@@ -188,6 +196,23 @@
// null // 澶囨敞
// );
+
+ public String getSite$() {
+ if (this.site == null) {return null;}
+ BasStationService service = SpringUtils.getBean(BasStationService.class);
+ BasStation station = service.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, this.site));
+ if (Objects.isNull(station)) {return null;}
+ return station.getStationName();
+ }
+
+ public String getDeviceSite$() {
+ if (this.deviceSite == null) {return null;}
+ BasStationService service = SpringUtils.getBean(BasStationService.class);
+ BasStation station = service.getById(this.deviceSite);
+ if (Objects.isNull(station)) {return null;}
+ return station.getStationName();
+ }
+
public String getType$(){
if (null == this.type){ return null; }
String[] split = this.type.split(",");
--
Gitblit v1.9.1