From e85f0e74d21e49b9c68474bc4d19f5eceacf1a46 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:40:04 +0800
Subject: [PATCH] 对接
---
src/main/webapp/views/wrkMastLog/wrkMastLog.html | 2 +-
src/main/webapp/static/js/wrkMastLog/wrkMastLog.js | 2 +-
src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java | 11 +++++++++++
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 7 ++++++-
src/main/java/com/zy/asrs/service/WrkMastLogService.java | 2 ++
5 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/WrkMastLogService.java b/src/main/java/com/zy/asrs/service/WrkMastLogService.java
index 24eaef0..2a64136 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastLogService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastLogService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.service.IService;
import com.core.common.R;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.WrkMastLog;
import java.util.Map;
@@ -10,6 +11,7 @@
boolean save(Integer workNo);
+ boolean saveLog(WrkMast 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 149724b..8744bd8 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
@@ -4,11 +4,14 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.R;
import com.zy.asrs.entity.InventoryFlowDto;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.WrkMastLog;
import com.zy.asrs.mapper.WrkMastLogMapper;
import com.zy.asrs.service.WrkMastLogService;
+import com.zy.common.utils.Synchro;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.Map;
@Service("wrkMastLogService")
@@ -20,6 +23,14 @@
}
@Override
+ public boolean saveLog(WrkMast workNo) {
+ WrkMastLog wrkMastLog=new WrkMastLog();
+ Synchro.Copy(workNo,wrkMastLog);
+ wrkMastLog.setModiTime(new Date());
+ return this.baseMapper.insert(wrkMastLog) > 0;
+ }
+
+ @Override
public R inventoryFlowList(Integer curr, Integer limit, Map<String, Object> param) {
Page<InventoryFlowDto> page = new Page<>();
page.setCurrent(curr);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 5588734..8fada35 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -117,9 +117,14 @@
//wrkMastService.updateById(wrkMast);
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ if (!wrkMastLogService.saveLog(wrkMast)) {
exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
+
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+// if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+// exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+// }
// 鍒犻櫎宸ヤ綔涓绘。
if (!wrkMastService.deleteById(wrkMast)) {
exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
diff --git a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
index 5fb0f81..d64c75d 100644
--- a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
@@ -56,7 +56,7 @@
// ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
// ,{field: 'plcStrTime$', align: 'center',title: '鎷ｆ枡鏃堕棿'}
,{field: 'modiUser$', align: 'center',title: '鎿嶄綔浜哄憳'}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
// ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
,{field: 'barcode', align: 'center',title: '鏉＄爜'}
diff --git a/src/main/webapp/views/wrkMastLog/wrkMastLog.html b/src/main/webapp/views/wrkMastLog/wrkMastLog.html
index fdaa517..a496bd9 100644
--- a/src/main/webapp/views/wrkMastLog/wrkMastLog.html
+++ b/src/main/webapp/views/wrkMastLog/wrkMastLog.html
@@ -89,7 +89,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/wrkMastLog/wrkMastLog.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/wrkMastLog/wrkMastLog.js?v=1" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
--
Gitblit v1.9.1