From 759cd0e706e252e907955073eed8e4935b21d9c8 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 31 十二月 2025 08:13:48 +0800
Subject: [PATCH] 1.修复拣料回库时拣料出库转历史档 2.生成移动任务修复 3.完善agv搬运入库出库申请
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index e896efc..9629ac2 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -9,6 +9,7 @@
import com.zy.asrs.mapper.BasWrkIotypeMapper;
import com.zy.asrs.mapper.BasWrkStatusMapper;
import com.zy.asrs.service.*;
+import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -24,6 +25,9 @@
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value= "")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
/**
* 宸ヤ綔鍙�
*/
@@ -45,6 +49,14 @@
@ApiModelProperty(value= "")
@TableField("whs_type")
private Integer whsType;
+
+ /**
+ * 0锛氶渶瑕佸垱寤篴gv鎼繍绌烘枡鏋朵换鍔�
+ * 1锛歸ms鎴愬姛鍒涘缓agv鎼繍绌烘枡鏋朵换鍔�
+ */
+ @ApiModelProperty(value= "闇�瑕佷笅鍙慳gv浠诲姟鐨勭姸鎬�")
+ @TableField("ctn_type")
+ private Integer ctnType;
/**
* 宸ヤ綔鐘舵��
@@ -156,10 +168,6 @@
@ApiModelProperty(value= "宸ヤ綔鏃堕棿")
@TableField("io_time")
private Date ioTime;
-
- @ApiModelProperty(value= "")
- @TableField("ctn_type")
- private Integer ctnType;
@ApiModelProperty(value= "")
private String packed;
@@ -307,6 +315,10 @@
@ApiModelProperty(value= "婊℃澘")
@TableField("full_plt")
private String fullPlt;
+
+ @ApiModelProperty(value= "鎷嶇収鍥剧墖")
+ private String pic;
+
public String getWrkSts$(){
BasWrkStatusMapper mapper = SpringUtils.getBean(BasWrkStatusMapper.class);
@@ -484,4 +496,8 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
}
--
Gitblit v1.9.1