From 0ab29c6d89777a832e21c5d2934e3e3e1544c6d8 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期日, 19 十月 2025 08:51:46 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4
src/main/webapp/static/js/mat/mat.js | 130 +++++++++---------
src/main/webapp/views/mat/mat.html | 218 +++++++++++++++---------------
src/main/java/com/zy/asrs/controller/MatController.java | 18 +-
4 files changed, 185 insertions(+), 185 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 35c113e..06d4717 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -171,15 +171,15 @@
}
/*鐗╂枡鎵樼洏缁戝畾*/
-// @RequestMapping(value = "/mat/barcode/auth")
-// @ManagerAuth
-// public R addBarcodeMatnr(Mat mat) {
-// if (Cools.isEmpty(mat.getUnit())){
-// return R.error(BaseRes.PARAM);
-// }
-// matBarcodeService.addBarcodeMatnrTwo(mat);
-// return R.ok();
-// }
+ @RequestMapping(value = "/mat/barcode/auth")
+ @ManagerAuth
+ public R addBarcodeMatnr(Mat mat) {
+ if (Cools.isEmpty(mat.getUnit())){
+ return R.error(BaseRes.PARAM);
+ }
+ matBarcodeService.addBarcodeMatnrTwo(mat);
+ return R.ok();
+ }
@RequestMapping(value = "/mat/delete/auth")
@ManagerAuth
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 43bc75a..8e3ac1c 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -934,7 +934,7 @@
String locNo = ""; // 寰呬慨鏀圭洰鏍囧簱浣�
String locSts = ""; // 寰呬慨鏀圭洰鏍囧簱浣嶇姸鎬�
// 鍏ュ簱鍙栨秷锛堜慨鏀圭洰鏍囧簱浣嶏級
- if (wrkMast.getWrkSts() < 4) {
+ if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts()>= 103 && wrkMast.getWrkSts() <= 105)) {
locNo = wrkMast.getLocNo();
locSts = "O";
@@ -951,7 +951,7 @@
locMastService.updateById(locMast);
}
// 鍑哄簱鍙栨秷锛堜慨鏀规簮搴撲綅锛�
- } else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14) {
+ } else if ((wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14)) {
locNo = wrkMast.getSourceLocNo();
// 鍑哄簱 ===>> F.鍦ㄥ簱
if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 110) {
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index a7c3636..68492d2 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -315,71 +315,71 @@
});
}
- // /* 鏄剧ず琛ㄥ崟寮圭獥 */
- // function showEditModelBarcode(mData) {
- // admin.open({
- // type: 1,
- // area: '600px',
- // title: '缁戝畾鍟嗗搧',
- // content: $('#editDialogBarcode').html(),
- // success: function (layero, dIndex) {
- // // 鍥炴樉琛ㄥ崟鏁版嵁
- // form.val('detail', mData);
- // // 琛ㄥ崟鎻愪氦浜嬩欢
- // form.on('submit(editSubmit)', function (data) {
- // console.log(data)
- // data.field.tagId = insXmSel.getValue('valueStr');
- // if (isEmpty(data.field.tagId)) {
- // layer.msg('鍒嗙被涓嶈兘涓虹┖', {icon: 2});
- // return false;
- // }
- // var loadIndex = layer.load(2);
- // $.ajax({
- // url: baseUrl+"/mat/barcode/auth",
- // headers: {'token': localStorage.getItem('token')},
- // data: data.field,
- // method: 'POST',
- // success: function (res) {
- // layer.close(loadIndex);
- // if (res.code === 200){
- // layer.close(dIndex);
- // layer.msg(res.msg, {icon: 1});
- // $(".layui-laypage-btn")[0].click();
- // } else if (res.code === 403){
- // top.location.href = baseUrl+"/";
- // }else {
- // layer.msg(res.msg, {icon: 2});
- // }
- // }
- // })
- // return false;
- // });
- // // 娓叉煋涓嬫媺鏍�
- // var insXmSel = xmSelect.render({
- // el: '#tagSelBarcode',
- // height: '250px',
- // data: insTb.options.data,
- // initValue: mData ? [mData.tagId] : [],
- // model: {label: {type: 'text'}},
- // prop: {
- // name: 'name',
- // value: 'id'
- // },
- // radio: true,
- // clickClose: true,
- // tree: {
- // show: true,
- // indent: 15,
- // strict: false,
- // expandedKeys: true
- // }
- // });
- // // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
- // $(layero).children('.layui-layer-content').css('overflow', 'visible');
- // layui.form.render('select');
- // }
- // });
- // }
+ /* 鏄剧ず琛ㄥ崟寮圭獥 */
+ function showEditModelBarcode(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: '缁戝畾鍟嗗搧',
+ content: $('#editDialogBarcode').html(),
+ success: function (layero, dIndex) {
+ // 鍥炴樉琛ㄥ崟鏁版嵁
+ form.val('detail', mData);
+ // 琛ㄥ崟鎻愪氦浜嬩欢
+ form.on('submit(editSubmit)', function (data) {
+ console.log(data)
+ data.field.tagId = insXmSel.getValue('valueStr');
+ if (isEmpty(data.field.tagId)) {
+ layer.msg('鍒嗙被涓嶈兘涓虹┖', {icon: 2});
+ return false;
+ }
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/mat/barcode/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ $(".layui-laypage-btn")[0].click();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ // 娓叉煋涓嬫媺鏍�
+ var insXmSel = xmSelect.render({
+ el: '#tagSelBarcode',
+ height: '250px',
+ data: insTb.options.data,
+ initValue: mData ? [mData.tagId] : [],
+ model: {label: {type: 'text'}},
+ prop: {
+ name: 'name',
+ value: 'id'
+ },
+ radio: true,
+ clickClose: true,
+ tree: {
+ show: true,
+ indent: 15,
+ strict: false,
+ expandedKeys: true
+ }
+ });
+ // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
// 妯℃澘閫夋嫨
form.on('radio(selectTemplateRadio)', function (data) {
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index a9ff054..fc3aeb1 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -148,7 +148,7 @@
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="edit">淇敼</a>
-<!-- <a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="editBarcode">缁戝畾</a>-->
+ <a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="editBarcode">缁戝畾</a>
<button class="layui-btn layui-btn-xs btn-print" lay-event="btnPrint">鎵撳嵃</button>
</script>
@@ -273,121 +273,121 @@
-<!--<!– 琛ㄥ崟寮圭獥 –>-->
-<!--<script type="text/html" id="editDialogBarcode">-->
-<!-- <form id="detailBarcode" lay-filter="detail" class="layui-form admin-form">-->
-<!-- <input name="id" type="hidden">-->
-<!-- <input name="uuid" type="hidden">-->
-<!-- <input name="nodeId" type="hidden">-->
-<!-- <input name="tag_id" type="hidden">-->
-<!-- <input name="model" type="hidden">-->
-<!-- <input name="name" type="hidden">-->
-<!-- <input name="batch" type="hidden">-->
-<!-- <input name="docId" type="hidden">-->
-<!-- <input name="docNum" type="hidden">-->
-<!-- <input name="custName" type="hidden">-->
-<!-- <input name="itemNum" type="hidden">-->
-<!-- <input name="count" type="hidden">-->
-<!-- <input name="weight" type="hidden">-->
-<!-- <input name="status" type="hidden">-->
-<!-- <input name="createBy" type="hidden">-->
-<!-- <input name="updateTime$" type="hidden">-->
-<!-- <input name="updateBy" type="hidden">-->
-<!-- <div class="layui-row">-->
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialogBarcode">
+ <form id="detailBarcode" lay-filter="detail" class="layui-form admin-form">
+ <input name="id" type="hidden">
+ <input name="uuid" type="hidden">
+ <input name="nodeId" type="hidden">
+ <input name="tag_id" type="hidden">
+ <input name="model" type="hidden">
+ <input name="name" type="hidden">
+ <input name="batch" type="hidden">
+ <input name="docId" type="hidden">
+ <input name="docNum" type="hidden">
+ <input name="custName" type="hidden">
+ <input name="itemNum" type="hidden">
+ <input name="count" type="hidden">
+ <input name="weight" type="hidden">
+ <input name="status" type="hidden">
+ <input name="createBy" type="hidden">
+ <input name="updateTime$" type="hidden">
+ <input name="updateBy" type="hidden">
+ <div class="layui-row">
-<!-- <div class="layui-col-md6">-->
+ <div class="layui-col-md6">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍒嗙被</label>
+ <div class="layui-input-block">
+ <div id="tagSelBarcode" class="ew-xmselect-tree"></div>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鍨嬫潗鍨嬪彿</label>
+ <div class="layui-input-block">
+ <input name="maktx" placeholder="璇疯緭鍏ュ瀷鏉愬瀷鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">妯″叿鍚嶇О</label>
+ <div class="layui-input-block">
+ <input name="matnr" placeholder="璇疯緭鍏ユā鍏峰悕绉�" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">濂楀彿</label>
+ <div class="layui-input-block">
+ <input name="name" placeholder="璇疯緭鍏ュ鍙�" class="layui-input">
+ </div>
+ </div>
+
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">寮�妯″鍘�</label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input name="volume" placeholder="璇疯緭鍏ュ紑妯″鍘�" class="layui-input">-->
+ <!-- </div>-->
+ <!-- </div>-->
+
+ </div>
+
+ <div class="layui-col-md6">
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label layui-form-required">妯″叿鍚嶇О</label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input id="matnr" name="matnr" placeholder="璇疯緭鍏ユā鍏峰悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">-->
+ <!-- </div>-->
+ <!-- </div>-->
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">瑙勬牸</label>
+ <div class="layui-input-block">
+ <input name="specs" placeholder="璇疯緭鍏ヤ唬鐮�" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎵樼洏鐮�</label>
+ <div class="layui-input-block">
+ <input name="unit" placeholder="璇疯緭鍏ユ墭鐩樼爜" class="layui-input">
+ </div>
+ </div>
+
+ <!-- <div class="layui-form-item">-->
+ <!-- <label class="layui-form-label">澶囨敞</label>-->
+ <!-- <div class="layui-input-block">-->
+ <!-- <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">-->
+ <!-- </div>-->
+ <!-- </div>-->
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐘舵��</label>
+ <div class="layui-input-block">
+ <input name="color" placeholder="" class="layui-input">
+ </div>
+ </div>
<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">鍒嗙被</label>-->
+<!-- <label class="layui-form-label">鐘舵��</label>-->
<!-- <div class="layui-input-block">-->
-<!-- <div id="tagSelBarcode" class="ew-xmselect-tree"></div>-->
+<!-- <select id="colorBarcode" name="color" lay-filter="color" placeholder="璇烽�夋嫨鐘舵��">-->
+<!-- <option value="">璇烽�夋嫨鐘舵��</option>-->
+<!-- <option value="姝ｅ父" name="color" class="layui-input">姝ｅ父</option>-->
+<!-- <option value="鎶ュ簾" name="color" class="layui-input">鎶ュ簾</option>-->
+<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label layui-form-required">鍨嬫潗鍨嬪彿</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input name="maktx" placeholder="璇疯緭鍏ュ瀷鏉愬瀷鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">-->
-<!-- </div>-->
-<!-- </div>-->
-
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">妯″叿鍚嶇О</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input name="matnr" placeholder="璇疯緭鍏ユā鍏峰悕绉�" class="layui-input">-->
-<!-- </div>-->
-<!-- </div>-->
-
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">濂楀彿</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input name="name" placeholder="璇疯緭鍏ュ鍙�" class="layui-input">-->
-<!-- </div>-->
-<!-- </div>-->
-
-<!-- <!– <div class="layui-form-item">–>-->
-<!-- <!– <label class="layui-form-label">寮�妯″鍘�</label>–>-->
-<!-- <!– <div class="layui-input-block">–>-->
-<!-- <!– <input name="volume" placeholder="璇疯緭鍏ュ紑妯″鍘�" class="layui-input">–>-->
-<!-- <!– </div>–>-->
-<!-- <!– </div>–>-->
-
-<!-- </div>-->
-
-<!-- <div class="layui-col-md6">-->
-<!-- <!– <div class="layui-form-item">–>-->
-<!-- <!– <label class="layui-form-label layui-form-required">妯″叿鍚嶇О</label>–>-->
-<!-- <!– <div class="layui-input-block">–>-->
-<!-- <!– <input id="matnr" name="matnr" placeholder="璇疯緭鍏ユā鍏峰悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">–>-->
-<!-- <!– </div>–>-->
-<!-- <!– </div>–>-->
-
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">瑙勬牸</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input name="specs" placeholder="璇疯緭鍏ヤ唬鐮�" class="layui-input">-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">鎵樼洏鐮�</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input name="unit" placeholder="璇疯緭鍏ユ墭鐩樼爜" class="layui-input">-->
-<!-- </div>-->
-<!-- </div>-->
-
-<!-- <!– <div class="layui-form-item">–>-->
-<!-- <!– <label class="layui-form-label">澶囨敞</label>–>-->
-<!-- <!– <div class="layui-input-block">–>-->
-<!-- <!– <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">–>-->
-<!-- <!– </div>–>-->
-<!-- <!– </div>–>-->
-
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">鐘舵��</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input name="color" placeholder="" class="layui-input">-->
-<!-- </div>-->
-<!-- </div>-->
-<!--<!– <div class="layui-form-item">–>-->
-<!--<!– <label class="layui-form-label">鐘舵��</label>–>-->
-<!--<!– <div class="layui-input-block">–>-->
-<!--<!– <select id="colorBarcode" name="color" lay-filter="color" placeholder="璇烽�夋嫨鐘舵��">–>-->
-<!--<!– <option value="">璇烽�夋嫨鐘舵��</option>–>-->
-<!--<!– <option value="姝ｅ父" name="color" class="layui-input">姝ｅ父</option>–>-->
-<!--<!– <option value="鎶ュ簾" name="color" class="layui-input">鎶ュ簾</option>–>-->
-<!--<!– </select>–>-->
-<!--<!– </div>–>-->
-<!--<!– </div>–>-->
-
-<!-- </div>-->
-<!-- </div>-->
-<!-- <hr class="layui-bg-gray">-->
-<!-- <div class="layui-form-item text-right">-->
-<!-- <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>-->
-<!-- <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>-->
-<!-- </div>-->
-<!-- </form>-->
-<!--</script>-->
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
<!-- 鎵撳嵃鎿嶄綔寮圭獥 -->
<div id="printDataDiv" style="display: none;padding: 20px">
--
Gitblit v1.9.1