From bd3b23b214c7090d83c91f9b9a172d4f548033dd Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 27 十月 2025 16:44:45 +0800
Subject: [PATCH] 13
---
src/main/webapp/views/wrkMast/wrkMast.html | 2 +-
src/main/java/com/zy/asrs/service/LocDetlService.java | 1 +
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 2 +-
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 6 ++++++
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index f17b8f3..1ae8eb3 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -37,6 +37,7 @@
boolean updateLocNo(String newLocNo, String oldLocNo);
+ boolean updateLocNoOrTure(String newLocNo, String oldLocNo);
/**
* 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
*
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 6756c06..6558945 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -90,6 +90,12 @@
}
@Override
+ public boolean updateLocNoOrTure(String newLocNo, String oldLocNo) {
+ baseMapper.updateLocNo(newLocNo, oldLocNo);
+ return true;
+ }
+
+ @Override
public List<String> getSameDetlToday(String matnr, Integer start, Integer end) {
return this.baseMapper.selectSameDetlToday(matnr, start, end);
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 4750a5d..72ebede 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -272,7 +272,7 @@
if (wrkMast.getEmptyMk().equals("N")) {
locSts = "F";
// 杞Щ搴撳瓨鏄庣粏鏁版嵁: 搴撳瓨鍙� 鐢卞伐浣滄。婧愬簱浣嶅彉涓虹洰鏍囧簱浣�
- if (!locDetlService.updateLocNo(wrkMast.getLocNo(), wrkMast.getSourceLocNo())) {
+ if (!locDetlService.updateLocNoOrTure(wrkMast.getLocNo(), wrkMast.getSourceLocNo())) {
// exceptionHandle("搴撲綅绉昏浆 ===>> 杞Щ搴撳瓨鏄庣粏鏁版嵁澶辫触锛沎婧愬簱浣�={0}],[鐩爣搴撲綅={1}]", wrkMast.getSourceLocNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("搴撲綅绉昏浆 ===>> 杞Щ搴撳瓨鏄庣粏鏁版嵁澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 6fc48be..67b2ce2 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -135,7 +135,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/wrkMast/wrkMast.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/wrkMast/wrkMast.js?v=1" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
--
Gitblit v1.9.1