From 59fbaf58a71992995c84a09ad46c2a2a60c661a0 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期六, 24 一月 2026 15:00:38 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/webapp/views/order/order.html | 2
zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml | 1
zy-asrs-wms/src/main/webapp/views/home/console.html | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java | 6 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java | 7 ++-
zy-asrs-wms/src/main/resources/license.lic | 0
zy-asrs-wms/src/main/webapp/views/index.html | 94 +++++++++++++++++++++++++++++++++++++++--------
7 files changed, 89 insertions(+), 23 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
index 4ec8359..f53cbdd 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
@@ -481,9 +481,9 @@
if (!Cools.isEmpty(matParam.getAccountingClass())) {
mat.setAccountingClass(matParam.getAccountingClass());
}
- if (!Cools.isEmpty(matParam.getBatch())) {
- mat.setBatch(matParam.getBatch());
- }
+// if (!Cools.isEmpty(matParam.getBatch())) {
+// mat.setBatch(matParam.getBatch());
+// }
if (!Cools.isEmpty(matParam.getInventoryAccount())) {
mat.setInventoryAccount(matParam.getInventoryAccount());
}
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml
index 04e1c8d..f84e034 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml
@@ -25,6 +25,7 @@
FROM wms_loc_detl
INNER JOIN common_loc_mast ON wms_loc_detl.loc_no = common_loc_mast.loc_no and wms_loc_detl.host_id = common_loc_mast.host_id
where 1=1
+ order by wms_loc_detl.appe_time
<include refid="viewStayTimeConditionSql"></include>
</select>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java
index b11a982..e42039f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlLogController.java
@@ -60,8 +60,11 @@
if (!Cools.isEmpty(param.get("zpallet"))) {
wrapper.like("zpallet", param.get("zpallet"));
}
- if (!Cools.isEmpty(param.get("orderNo"))) {
- wrapper.like("order_no", param.get("orderNo"));
+ if (!Cools.isEmpty(param.get("order_no"))) {
+ wrapper.like("order_no", param.get("order_no"));
+ }
+ if (!Cools.isEmpty(param.get("wrk_no"))){
+ wrapper.like("wrk_no", param.get("wrk_no"));
}
allLike(WrkDetlLog.class, param.keySet(), wrapper, condition);
wrapper.orderByDesc("io_time");
diff --git a/zy-asrs-wms/src/main/resources/license.lic b/zy-asrs-wms/src/main/resources/license.lic
index 6af8e0d..0b5251f 100644
--- a/zy-asrs-wms/src/main/resources/license.lic
+++ b/zy-asrs-wms/src/main/resources/license.lic
Binary files differ
diff --git a/zy-asrs-wms/src/main/webapp/views/home/console.html b/zy-asrs-wms/src/main/webapp/views/home/console.html
index ce1ed60..c24fb28 100644
--- a/zy-asrs-wms/src/main/webapp/views/home/console.html
+++ b/zy-asrs-wms/src/main/webapp/views/home/console.html
@@ -236,7 +236,7 @@
function getCol() {
var cols = [
{field: 'appeTime$', title: '鍏ュ簱鏃堕棿', align: 'center', width: 200}
- ,{field: 'stay_time', align: 'center',title: '婊炵暀澶╂暟'}
+ ,{field: 'stayTime', align: 'center',title: '婊炵暀澶╂暟'}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
];
cols.push.apply(cols, detlCols);
diff --git a/zy-asrs-wms/src/main/webapp/views/index.html b/zy-asrs-wms/src/main/webapp/views/index.html
index 0d8647b..f51f367 100644
--- a/zy-asrs-wms/src/main/webapp/views/index.html
+++ b/zy-asrs-wms/src/main/webapp/views/index.html
@@ -11,6 +11,7 @@
<link rel="stylesheet" href="../static/css/admin.css?v=318" media="all">
<link rel="stylesheet" href="../static/css/loader.css" media="all">
<link rel="stylesheet" href="../static/css/originTable.css" media="all">
+ <link rel="stylesheet" href="../static/css/layx.min.css" type="text/css" />
<style>
.layui-logo img {
width: 25px;
@@ -19,6 +20,28 @@
font-size: 18px;
font-weight: 400;
/*margin-left: 5px;*/
+ }
+
+ /* 寮圭獥鏍峰紡 */
+ .popup {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0,0,0,0.5);
+ display: none;
+ justify-content: center;
+ align-items: center;
+ z-index: 9999;
+ }
+
+ .popup-content {
+ background-color: #fff;
+ padding: 20px;
+ border-radius: 5px;
+ box-shadow: 0px 0px 20px rgba(0,0,0,0.3);
+ text-align: center;
}
</style>
</head>
@@ -93,8 +116,18 @@
<div class="layuimini-loader-inner"></div>
</div>
+<!-- 寮圭獥鍐呭 -->
+<div class="popup" id="popup">
+ <div class="popup-content">
+ <h2 style="font-size: 28px;margin-bottom: 10px;">璁稿彲璇佸嵆灏嗚繃鏈�</h2>
+ <div id="popup-text" style="font-size: 28px;color: red"></div>
+ <button style="background-color: #007bff;color: #fff;border: none;padding: 10px 20px;border-radius: 5px;cursor: pointer;font-size: 16px;" onclick="hidePopup()">鍏抽棴</button>
+ </div>
+</div>
+
<script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../static/layui/layui.js"></script>
+<script type="text/javascript" src="../static/js/tools/layx.min.js"></script>
<script type="text/javascript" src="../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../static/js/common.js"></script>
<script>
@@ -104,6 +137,31 @@
top.location.href = baseUrl + "/login";
}
});
+
+ // 鏄剧ず寮圭獥
+ function showPopup(res) {
+ console.log(res)
+ document.getElementById('popup').style.display = 'block';
+ // 鑾峰彇寮瑰嚭绐楀彛鍐呭鐨勫鍣ㄥ厓绱�
+ var popupText = document.getElementById('popup-text');
+ // 鍋囪鍚庡彴杩斿洖鐨勫瓧绗︿覆涓� responseString
+ if (res!==""){
+ // 鑾峰彇褰撳墠鏃ユ湡
+ const currentDate = new Date();
+ // 鍒涘缓鏂版棩鏈熷璞″苟娣诲姞澶╂暟
+ const newDate = new Date();
+ newDate.setDate(currentDate.getDate() + res + 1);
+ // 灏嗗瓧绗︿覆璁剧疆涓哄脊绐楀唴瀹圭殑鏂囨湰
+ popupText.textContent = "璁稿彲璇佸皢浜�" + new Intl.DateTimeFormat('zh-CN').format(newDate) + "杩囨湡锛屽墿浣欐湁鏁堟湡:" + res + "澶╋紒";
+ }else {
+ document.getElementById('popup').style.display = 'none';
+ }
+ }
+
+ // 闅愯棌寮圭獥
+ function hidePopup() {
+ document.getElementById('popup').style.display = 'none';
+ }
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
@@ -169,22 +227,26 @@
}
});
- // $.ajax({
- // url: baseUrl + "/license/getLicenseDays",
- // headers: {'token': localStorage.getItem('token')},
- // method: 'POST',
- // success: function (res) {
- // if (res.code == 200) {
- // let days = res.data
- // if (days <= 30) {
- // $("#licenseShow").show()
- // $("#licenseDays").html(days)
- // }
- // }else {
- // top.location.href = baseUrl + "/login";
- // }
- // }
- // });
+ $.ajax({
+ url: baseUrl + "/license/getLicenseDays",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code == 200) {
+ let days = res.data
+ if (days <= 30) {
+ $("#licenseShow").show()
+ $("#licenseDays").html(days)
+ }
+
+ if (days <= 15) {
+ showPopup(days)
+ }
+ }else {
+ top.location.href = baseUrl + "/login";
+ }
+ }
+ });
// 榛樿鍔犺浇涓婚〉
index.loadHome({
diff --git a/zy-asrs-wms/src/main/webapp/views/order/order.html b/zy-asrs-wms/src/main/webapp/views/order/order.html
index 3aa8f67..02bf872 100644
--- a/zy-asrs-wms/src/main/webapp/views/order/order.html
+++ b/zy-asrs-wms/src/main/webapp/views/order/order.html
@@ -112,7 +112,7 @@
{{# } }}
{{# } }}
<a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="dy">鎵撳嵃</a>
+ <a class="layui-btn layui-btn-primary layui-btn-xs " lay-event="dy">鎵撳嵃</a>
</script>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="tbLook">
--
Gitblit v1.9.1