From ce3fdb298990ae8baef7ca595fe3b17e7929fca3 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 08 十一月 2025 18:54:09 +0800
Subject: [PATCH] 工作主档转历史字段类型不一样数据丢失修复
---
src/main/resources/mapper/WrkMastLogMapper.xml | 2 +-
src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java | 2 +-
version/bak/wms.bak | 0
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 7 ++-----
src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java | 15 +--------------
5 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index a477ba7..27472d2 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -33,9 +33,6 @@
@TableField("task_type")
private String taskType;
- @ApiModelProperty("鏃ュ織ID")
- private Long logId;
-
/**
* 宸ヤ綔鍙�
*/
@@ -277,8 +274,8 @@
private String manuType;
@ApiModelProperty(value = "")
- @TableField("memo_m")
- private String memoM;
+ @TableField("memo")
+ private String memo;
@ApiModelProperty(value = "")
@TableField("sc_weight")
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java
index 002fd0d..88f6644 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java
@@ -15,7 +15,7 @@
@Repository
public interface WrkMastLogMapper extends BaseMapper<WrkMastLog> {
- @Insert("insert into asr_wrk_mast_log select *, id as log_id from asr_wrk_mast where wrk_no=#{workNo}")
+ @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
int save(Integer workNo);
/**
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
index 0321a08..6e49f85 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
@@ -28,21 +28,8 @@
private WrkMastLogService wrkMastLogService;
@Override
- @Transactional(rollbackFor = Exception.class)
public boolean save(Integer workNo) {
- WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", workNo));
- if (Objects.isNull(mast)) {
- throw new CoolException("鏁版嵁閿欒锛氫换鍔′笉瀛樺湪锛侊紒");
- }
- WrkMastLog mastLog = new WrkMastLog();
- BeanUtils.copyProperties(mast, mastLog);
- mastLog.setLogId(mast.getId());
-
- if (!wrkMastLogService.insert(mastLog)) {
- throw new CoolException("浠诲姟鏃ュ織淇濆瓨澶辫触锛侊紒");
- }
-
- return true;
+ return this.baseMapper.save(workNo) > 0;
}
@Override
diff --git a/src/main/resources/mapper/WrkMastLogMapper.xml b/src/main/resources/mapper/WrkMastLogMapper.xml
index 193b20e..dd1bdf7 100644
--- a/src/main/resources/mapper/WrkMastLogMapper.xml
+++ b/src/main/resources/mapper/WrkMastLogMapper.xml
@@ -52,7 +52,7 @@
<result column="error_memo" property="errorMemo" />
<result column="ctn_kind" property="ctnKind" />
<result column="manu_type" property="manuType" />
- <result column="memo_m" property="memoM" />
+ <result column="memo" property="memo" />
<result column="sc_weight" property="scWeight" />
<result column="log_mk" property="logMk" />
<result column="log_err_time" property="logErrTime" />
diff --git a/version/bak/wms.bak b/version/bak/wms.bak
index f024b84..643457d 100644
--- a/version/bak/wms.bak
+++ b/version/bak/wms.bak
Binary files differ
--
Gitblit v1.9.1