From b0aca4f6dc0d314c6ef336d915740e017b6fccee Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期一, 05 五月 2025 16:09:39 +0800
Subject: [PATCH] #
---
src/main/webapp/views/admin/wrkMastLog/wrkMastLog.html | 2 +-
src/main/webapp/static/js/wrkMastLog/wrkMastLog.js | 2 ++
src/main/java/com/zy/asrs/task/WrkMastScheduler.java | 2 +-
src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java | 4 ++--
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java
index 89ebe97..c44cfd7 100644
--- a/src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java
@@ -221,11 +221,11 @@
return false;
}
//褰�1011鍏ュ簱锛屾墭鐩樺湪鎻愬崌鏈洪噷锛�1014涔熷湪鍏ュ簱锛屽緟鏈轰綅琚�1014鍗犱綇锛屽幓鎻愬崌鏈洪噷鐨勪换鍔★紝灏忚溅浼氬崱浣�
- if (liftProtocol.getHasTray() && liftProtocol.getLev() == 1 && wrkMast.getStaNo() == 1015) {
+ if (liftProtocol.getHasTray() && liftProtocol.getLev() == 1 && wrkMast.getStaNo() != null && wrkMast.getStaNo() == 1015) {
News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満鍐呮湁鎵樼洏涓斿湪1灞傞渶瑕佸皬杞﹀幓鎺ワ紝灏变笉瑕佸崰浣忓緟鏈轰綅锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//鎻愬崌鏈哄唴鏃犲皬杞�
}
- if (liftProtocol.getHasTray() && liftProtocol.getLev() == 5 && wrkMast.getStaNo() == 1026) {
+ if (liftProtocol.getHasTray() && liftProtocol.getLev() == 5 && wrkMast.getStaNo() != null && wrkMast.getStaNo() == 1026) {
News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満鍐呮湁鎵樼洏涓斿湪5灞傞渶瑕佸皬杞﹀幓鎺ワ紝灏变笉瑕佸崰浣忓緟鏈轰綅锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;//鎻愬崌鏈哄唴鏃犲皬杞�
}
diff --git a/src/main/java/com/zy/asrs/task/WrkMastScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
index d83b493..aec69ad 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
@@ -286,7 +286,7 @@
locMastService.updateById(locMast);
} else if (wrkMast.getIoType() == WrkIoType.OUT.id) {
LocMast locMast = locMastService.queryByLoc(wrkMast.getSourceLocNo());
- locMast.setLocSts(String.valueOf(LocStsType.O));
+ locMast.setLocSts(String.valueOf(LocStsType.F));
locMast.setModiTime(new Date());
locMastService.updateById(locMast);
} else if (wrkMast.getIoType() == WrkIoType.LOC_MOVE.id) {
diff --git a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
index 941bc6d..1dee1a8 100644
--- a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
@@ -21,6 +21,8 @@
cellMinWidth: 50,
cols: [[
{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',event: 'wrkNo', sort: true}
+ ,{field: 'wmsWrkNo', align: 'center',title: 'WMS宸ヤ綔鍙�',event: 'wmsWrkNo', sort: true}
+ ,{field: 'mainWrkNo', align: 'center',title: '涓诲伐浣滃彿',event: 'mainWrkNo', sort: true}
,{field: 'appeTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width:160, sort: true}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��', width:160}
,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�', width:160}
diff --git a/src/main/webapp/views/admin/wrkMastLog/wrkMastLog.html b/src/main/webapp/views/admin/wrkMastLog/wrkMastLog.html
index a319d45..2592b12 100644
--- a/src/main/webapp/views/admin/wrkMastLog/wrkMastLog.html
+++ b/src/main/webapp/views/admin/wrkMastLog/wrkMastLog.html
@@ -78,7 +78,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