From 3e468c21724ebc982f11f3e3a48259e3ef24e841 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 08 十一月 2025 10:42:34 +0800
Subject: [PATCH] 工作主档缺少字段修复
---
src/main/resources/mapper/WrkMastLogMapper.xml | 1 +
src/main/java/com/zy/asrs/entity/WrkMast.java | 1 +
src/main/resources/mapper/WrkMastMapper.xml | 4 +++-
version/bak/wms.bak | 0
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 4 ++++
5 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index f3fbc07..2f643bf 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -33,6 +33,7 @@
private Integer wrkNo;
@ApiModelProperty("浠诲姟绫诲瀷锛� agv, crn")
+ @TableField("task_type")
private String taskType;
@ApiModelProperty(value = "")
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index a45d330..a477ba7 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -29,6 +29,10 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ @ApiModelProperty("浠诲姟绫诲瀷锛� agv, crn")
+ @TableField("task_type")
+ private String taskType;
+
@ApiModelProperty("鏃ュ織ID")
private Long logId;
diff --git a/src/main/resources/mapper/WrkMastLogMapper.xml b/src/main/resources/mapper/WrkMastLogMapper.xml
index 8086afb..193b20e 100644
--- a/src/main/resources/mapper/WrkMastLogMapper.xml
+++ b/src/main/resources/mapper/WrkMastLogMapper.xml
@@ -5,6 +5,7 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastLog">
<id column="id" property="id" />
+ <result column="task_type" property="taskType" />
<result column="wrk_no" property="wrkNo" />
<result column="inv_wh" property="invWh" />
<result column="ymd" property="ymd" />
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 83c4cce..afa1793 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -4,7 +4,9 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMast">
- <id column="wrk_no" property="wrkNo" />
+ <id column="id" property="id" />
+ <result column="wrk_no" property="wrkNo" />
+ <result column="task_type" property="taskType" />
<result column="inv_wh" property="invWh" />
<result column="ymd" property="ymd" />
<result column="mk" property="mk" />
diff --git a/version/bak/wms.bak b/version/bak/wms.bak
index 1a4cfbc..f024b84 100644
--- a/version/bak/wms.bak
+++ b/version/bak/wms.bak
Binary files differ
--
Gitblit v1.9.1