From 56b1b873191d6e7022ed225cf81c3eda774f210e Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 11 四月 2026 18:02:42 +0800
Subject: [PATCH] WMS2.0与WCS3.0对接完整版
---
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index 820f59d..abbb785 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -4,11 +4,11 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
import com.zy.asrs.service.*;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -29,8 +29,9 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鏃ュ織ID")
- private Long logId;
+ @ApiModelProperty("浠诲姟绫诲瀷锛� agv, crn")
+ @TableField("task_type")
+ private String taskType;
/**
* 宸ヤ綔鍙�
@@ -273,8 +274,8 @@
private String manuType;
@ApiModelProperty(value = "")
- @TableField("memo_m")
- private String memoM;
+ @TableField("memo")
+ private String memo;
@ApiModelProperty(value = "")
@TableField("sc_weight")
@@ -330,14 +331,14 @@
public WrkMastLog() {
}
- public String getWrkNo$() {
- WrkMastService service = SpringUtils.getBean(WrkMastService.class);
- WrkMast wrkMast = service.selectById(this.wrkNo);
- if (!Cools.isEmpty(wrkMast)) {
- return String.valueOf(wrkMast.getWrkNo());
- }
- return null;
- }
+// public String getWrkNo$() {
+// WrkMastService service = SpringUtils.getBean(WrkMastService.class);
+// WrkMast wrkMast = service.selectById(this.wrkNo);
+// if (!Cools.isEmpty(wrkMast)) {
+// return String.valueOf(wrkMast.getWrkNo());
+// }
+// return null;
+// }
public String getYmd$() {
if (Cools.isEmpty(this.ymd)) {
--
Gitblit v1.9.1