From 3ad65283c54059e0c61110589fb19398ac3525fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 08 七月 2025 08:32:32 +0800
Subject: [PATCH] 完善拣料转全板
---
src/main/java/com/zy/asrs/entity/WrkDetl.java | 77 ++++++++++++++++++++++++++++++++++++++
1 files changed, 76 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 39ea4d5..064e589 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.*;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -16,7 +18,7 @@
@Data
@TableName("asr_wrk_detl")
-public class WrkDetl implements Serializable {
+public class WrkDetl implements Serializable, Cloneable {
private static final long serialVersionUID = 1L;
@@ -268,6 +270,21 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鏄惁鍐荤粨
+ */
+ @ApiModelProperty(value= "鏄惁鍐荤粨")
+ private Integer frozen;
+
+ /**
+ * 涓婃灦鍖哄煙{1:鍗曞搧鍖�,2:楂橀娣锋斁鍖�,3:浣庨娣锋斁鍖簘
+ */
+ @ApiModelProperty(value= "涓婃灦鍖哄煙")
+ @TableField("mat_type")
+ private Integer matType;
+
+ @ApiModelProperty(value= "瀹㈡埛淇℃伅ID")
+ private Long owner;
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
@@ -287,6 +304,16 @@
return String.valueOf(this.beBatch);
}
}
+
+ public String getOwner$(){
+ LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+ LocOwner locOwner = service.selectById(this.owner);
+ if (!Cools.isEmpty(locOwner)){
+ return String.valueOf(locOwner.getOwner());
+ }
+ return null;
+ }
+
public String getSource$(){
if (null == this.source){ return null; }
@@ -358,8 +385,56 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public String getWrkSts$(){
+ WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
+ if (!Cools.isEmpty(this.wrkNo)){
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", this.wrkNo));
+ if (!Cools.isEmpty(wrkMast)){
+ return wrkMast.getWrkSts$();
+ }
+ }
+ return null;
+ }
+ public String getIoType$(){
+ WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
+ if (!Cools.isEmpty(this.wrkNo)){
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", this.wrkNo));
+ if (!Cools.isEmpty(wrkMast)){
+ return wrkMast.getIoType$();
+ }
+ }
+ return null;
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
+ public String getMatType$() {
+ if (this.matType == null) {
+ return "";
+ }
+ switch (this.matType) {
+ case 1:
+ return "鍗曞搧鍖�";
+ case 2:
+ return "楂橀娣锋斁鍖�";
+ case 3:
+ return "浣庨娣锋斁鍖�";
+ default:
+ return "";
+ }
+ }
+
+
+ @Override
+ public WrkDetl clone() {
+ try {
+ return (WrkDetl) super.clone();
+ } catch (CloneNotSupportedException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.1