From 50435a81915932eda06b7f1afd48f9ff1ae84f19 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 10 四月 2025 17:50:28 +0800
Subject: [PATCH] 1
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasConveyorSta.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasConveyorSta.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasConveyorSta.java
index a89c054..fa3cf6d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasConveyorSta.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasConveyorSta.java
@@ -3,7 +3,9 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.zy.asrs.wcs.core.model.enums.SiteStatusType;
import com.zy.asrs.wcs.core.service.BasConveyorService;
+import com.zy.asrs.wcs.rcs.model.enums.WorkModeType;
import com.zy.asrs.wcs.system.entity.Host;
import com.zy.asrs.wcs.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
@@ -165,6 +167,30 @@
@ApiModelProperty(value= "鍥涘悜绌挎杞︽墍璇嗗埆鐨勪簩缁寸爜")
private String qrCodeValue;
+ /**
+ * 宸ヤ綔鍙�
+ */
+ @ApiModelProperty(value= "宸ヤ綔鍙�")
+ private Integer taskNo;
+
+ /**
+ * 宸ヤ綔妯″紡
+ */
+ @ApiModelProperty(value= "宸ヤ綔妯″紡")
+ private Integer workMode;
+
+ /**
+ * 鐩爣绔�
+ */
+ @ApiModelProperty(value= "鐩爣绔�")
+ private Integer staNo;
+
+ /**
+ * 鏉＄爜鍣↖D
+ */
+ @ApiModelProperty(value= "鏉＄爜鍣↖D")
+ private Long barcodeId;
+
public BasConveyorSta() {}
public BasConveyorSta(Long conveyorId,Integer conveyorNo,Long updateBy,Long createBy,Date createTime,Date updateTime,String memo,Integer deleted,Long hostId,Integer siteNo,String inEnable,String outEnable,String autoing,String loading,String canining,String canouting,Integer locType1,Integer locType2,Integer locType3,String locNo,String qrCodeValue) {
@@ -319,5 +345,29 @@
}
}
+ public String getWorkMode$() {
+ if (null == this.workMode){ return null; }
+ WorkModeType workModeType = WorkModeType.get(this.workMode.shortValue());
+ if(!Cools.isEmpty(workModeType)){
+ return workModeType.desc;
+ }
+ return null;
+ }
+
+ public String getSiteStatusType$() {
+ String siteStatus = String.valueOf(SiteStatusType.process(this));
+ return siteStatus.toLowerCase().replaceAll("_", "-");
+ }
+
+ public Long getConveyorDeviceId() {
+ if (null == this.conveyorId){ return null; }
+ BasConveyorService basConveyorService = SpringUtils.getBean(BasConveyorService.class);
+ BasConveyor basConveyor = basConveyorService.getById(this.conveyorId);
+ if (basConveyor == null) {
+ return null;
+ }
+ return basConveyor.getDeviceId();
+ }
+
}
--
Gitblit v1.9.1