From 704f65c54fec25aed30e6bf98bc763056dde6dc2 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 28 五月 2025 00:28:36 +0800
Subject: [PATCH] 合格
---
src/main/webapp/static/js/locDetl/locDetl.js | 4
src/main/webapp/views/locDetl/locDetl.html | 4
src/main/webapp/views/locDetl/locDetl_detail.html | 236 +++++++++++++++++++++++++---------------------
src/main/java/com/zy/asrs/controller/LocDetlController.java | 14 ++
4 files changed, 144 insertions(+), 114 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 6eba1f6..feda529 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -153,12 +153,18 @@
@RequestMapping(value = "/locDetl/update/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
public R update(LocDetl locDetl){
- if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
+ if (Cools.isEmpty(locDetl) || null==locDetl.getBatch()){
return R.error();
}
- locDetl.setModiUser(getUserId());
- locDetl.setModiTime(new Date());
- locDetlService.updateById(locDetl);
+ LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locDetl.getLocNo()).eq("batch", locDetl.getBatch()));
+ if (Cools.isEmpty(locDetl1) ){
+ return R.error();
+ }
+ locDetl1.setModiUser(getUserId());
+ locDetl1.setModiTime(new Date());
+ locDetl1.setDanger(locDetl.getDanger());
+ locDetlService.update(locDetl1,new EntityWrapper<LocDetl>().eq("loc_no", locDetl.getLocNo()).eq("batch", locDetl.getBatch()));
+// locDetlService.updateById(locDetl1);
return R.ok();
}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 9072da6..d0ab093 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -41,6 +41,8 @@
// cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
+
)
return cols;
}
@@ -391,6 +393,8 @@
var data = {
// id: $('#id').val(),
locNo: $('#locNo').val(),
+ batch: $('#batch').val(),
+ danger: $('#danger').val(),
matnr: $('#matnr').val(),
lgnum: $('#lgnum').val(),
tbnum: $('#tbnum').val(),
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 1ec1a96..544d89e 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -76,7 +76,9 @@
</script>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>-->
+ <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">缂栬緫</a>
+
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
diff --git a/src/main/webapp/views/locDetl/locDetl_detail.html b/src/main/webapp/views/locDetl/locDetl_detail.html
index 7684ede..2613794 100644
--- a/src/main/webapp/views/locDetl/locDetl_detail.html
+++ b/src/main/webapp/views/locDetl/locDetl_detail.html
@@ -15,6 +15,8 @@
<!-- 璇︽儏 -->
<div id="data-detail" class="layer_self_wrap">
<form id="detail" class="layui-form">
+
+
<!--
<div class="layui-inline" style="display: none">
<label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
@@ -23,126 +25,142 @@
</div>
</div>
-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label"><span class="not-null">*</span>搴� 浣� 鍙凤細</label>-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="locNo" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')" lay-verify="required" style="display: none">-->
+<!-- <input id="locNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label"><span class="not-null">*</span>鐗┿��銆�鏂欙細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="matnr" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')" lay-verify="required" >-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label">浠� 搴� 鍙凤細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="lgnum" class="layui-input" type="text" >-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label" style="font-size: x-small">杞偍璇锋眰缂栧彿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="tbnum" class="layui-input" type="text" lay-verify="number" >-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label">琛� 椤� 鐩細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="tbpos" class="layui-input" type="text" lay-verify="number" >-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label" style="font-size: x-small">鐗╂枡鏍囩ID锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="zmatid" class="layui-input" type="text" >-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>搴� 浣� 鍙凤細</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="locNo" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')" lay-verify="required" style="display: none">
- <input id="locNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
+ <label class="layui-form-label">搴撲綅鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="locNo" class="layui-input" type="text" readonly>
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>鐗┿��銆�鏂欙細</label>
+ <label class="layui-form-label">绠卞彿锛�</label>
<div class="layui-input-inline">
- <input id="matnr" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')" lay-verify="required" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">浠� 搴� 鍙凤細</label>
- <div class="layui-input-inline">
- <input id="lgnum" class="layui-input" type="text" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label" style="font-size: x-small">杞偍璇锋眰缂栧彿锛�</label>
- <div class="layui-input-inline">
- <input id="tbnum" class="layui-input" type="text" lay-verify="number" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">琛� 椤� 鐩細</label>
- <div class="layui-input-inline">
- <input id="tbpos" class="layui-input" type="text" lay-verify="number" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label" style="font-size: x-small">鐗╂枡鏍囩ID锛�</label>
- <div class="layui-input-inline">
- <input id="zmatid" class="layui-input" type="text" >
+ <input id="batch" class="layui-input" type="text" readonly>
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鐗╂枡鎻忚堪锛�</label>
+ <label class="layui-form-label"><span class="not-null">*</span>寰呫��銆�鍒わ細</label>
<div class="layui-input-inline">
- <input id="maktx" class="layui-input" type="text">
+ <select id="danger" lay-verify="number">
+ <option value="0" style="display: none">寰呭垽</option>
+ <option value="1">鍚堟牸</option>
+ <option value="2">涓嶅悎鏍�</option>
+ </select>
</div>
</div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">宸ャ��銆�鍘傦細</label>
- <div class="layui-input-inline">
- <input id="werks" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鏁般��銆�閲忥細</label>
- <div class="layui-input-inline">
- <input id="anfme" class="layui-input" type="text" lay-verify="number" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鍗曘��銆�浣嶏細</label>
- <div class="layui-input-inline">
- <input id="altme" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鎵樼洏鏉＄爜锛�</label>
- <div class="layui-input-inline">
- <input id="zpallet" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">鐢ㄦ埛ID锛�</label>
- <div class="layui-input-inline">
- <input id="bname" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">澶囥��銆�娉細</label>
- <div class="layui-input-inline">
- <input id="memo" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">淇敼浜哄憳锛�</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="modiUser" class="layui-input" type="text" lay-verify="number" style="display: none">
- <input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">淇敼鏃堕棿锛�</label>
- <div class="layui-input-inline">
- <input id="modiTime$" class="layui-input" type="text" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">鍒� 寤� 鑰咃細</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="appeUser" class="layui-input" type="text" lay-verify="number" style="display: none">
- <input id="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">娣诲姞鏃堕棿锛�</label>
- <div class="layui-input-inline">
- <input id="appeTime$" class="layui-input" type="text" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label">宸ャ��銆�鍘傦細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="werks" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鏁般��銆�閲忥細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="anfme" class="layui-input" type="text" lay-verify="number" >-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鍗曘��銆�浣嶏細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="altme" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鎵樼洏鏉＄爜锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="zpallet" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label">鐢ㄦ埛ID锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="bname" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">澶囥��銆�娉細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="memo" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label">淇敼浜哄憳锛�</label>-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="modiUser" class="layui-input" type="text" lay-verify="number" style="display: none">-->
+<!-- <input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label">淇敼鏃堕棿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="modiTime$" class="layui-input" type="text" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label">鍒� 寤� 鑰咃細</label>-->
+<!-- <div class="layui-input-inline cool-auto-complete">-->
+<!-- <input id="appeUser" class="layui-input" type="text" lay-verify="number" style="display: none">-->
+<!-- <input id="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label">娣诲姞鏃堕棿锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="appeTime$" class="layui-input" type="text" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<hr class="layui-bg-gray">
--
Gitblit v1.9.1