From 6577403b7d7aa71c55a8df80721ddfd2a82a6015 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期六, 06 十二月 2025 15:08:25 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/orderDetlPakin/orderDetl.js | 40 ++----
src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java | 13 -
src/main/webapp/views/orderDetlPakin/orderDetl.html | 220 +++++++++++++-----------------------
src/main/webapp/static/js/orderDetl/orderDetl.js | 40 ++----
4 files changed, 110 insertions(+), 203 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
index 375dd95..0c2d420 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
@@ -56,15 +56,7 @@
basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
basAgvMast.setStatus(3);
basAgvMastService.updateById(basAgvMast);
- // 鉁� 浜嬪姟鎻愪氦鍚庢墽琛�
- TransactionSynchronizationManager.registerSynchronization(
- new TransactionSynchronizationAdapter() {
- @Override
- public void afterCommit() {
- openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
- }
- }
- );
+ openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
break;
case 1:
LocMast sourceLoc1 = locMastService.selectById(basAgvMast.getSourceLocNo());
@@ -118,6 +110,7 @@
basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getLocNo()));
basAgvMast.setStatus(3);
basAgvMastService.updateById(basAgvMast);
+ openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
break;
case 2:
List<LocDetl> locDetls2 = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", basAgvMast.getLocNo()));
@@ -201,10 +194,12 @@
basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
basAgvMast.setStatus(3);
basAgvMastService.updateById(basAgvMast);
+ openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
break;
case 3:
basAgvMast.setStatus(3);
basAgvMastService.updateById(basAgvMast);
+ openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
break;
default:
return FAIL.setMsg("鏆備笉鏀寔璇ョ被鍨�");
diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index 10e83e6..6705b1d 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -21,33 +21,19 @@
cellMinWidth: 50,
height: 'full-120',
cols: [[
- {type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
- ,{field: 'maktx', align: 'center',title: '鍚嶇О'}
- ,{field: 'name', align: 'center',title: '鍚嶇О'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'standby1', align: 'center',title: 'po', hide: false}
- ,{field: 'standby2', align: 'center',title: 'upc', hide: false}
- ,{field: 'model', align: 'center',title: '鍨嬪彿'}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿',hide:true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅'}
- ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜'}
- ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
- ,{field: 'unitPrice', align: 'center',title: '鍗曚环'}
- ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'}
- ,{field: 'count', align: 'center',title: '鏁伴噺'}
- ,{field: 'weight', align: 'center',title: '閲嶉噺'}
- ,{field: 'status$', align: 'center',title: '鐘舵��'}
- ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
- ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ {field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜'},
+ {field: 'matnr', title: '鍟嗗搧缂栧彿', width: 160},
+ {field: 'maktx', title: '鍚嶇О', width: 160},
+ {field: 'standby3', title: '瀹㈡埛SKU'},
+ {field: 'boxType1', title: '璐т富'},
+ {field: 'boxType3', title: '閲囪喘鍗曞彿'},
+ // {field: 'batch', title: '鎵瑰彿'}
+ {field: 'standby1', align: 'center',title: '瀹㈡埛PO', hide: false},
+ {field: 'standby2', align: 'center',title: 'UPC', hide: false},
+ {field: 'anfme', title: '鏁伴噺'},
+ {field: 'workQty', title: '浣滀笟鏁伴噺'},
+ {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/orderDetlPakin/orderDetl.js b/src/main/webapp/static/js/orderDetlPakin/orderDetl.js
index 10e83e6..aec4053 100644
--- a/src/main/webapp/static/js/orderDetlPakin/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetlPakin/orderDetl.js
@@ -13,7 +13,7 @@
tableIns = table.render({
elem: '#orderDetl',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/orderDetl/list/auth',
+ url: baseUrl+'/order/pakin/orderDetl/list/auth',
page: true,
limit: 15,
limits: [15, 30, 50, 100, 200, 500],
@@ -21,33 +21,17 @@
cellMinWidth: 50,
height: 'full-120',
cols: [[
- {type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
- ,{field: 'maktx', align: 'center',title: '鍚嶇О'}
- ,{field: 'name', align: 'center',title: '鍚嶇О'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'standby1', align: 'center',title: 'po', hide: false}
- ,{field: 'standby2', align: 'center',title: 'upc', hide: false}
- ,{field: 'model', align: 'center',title: '鍨嬪彿'}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿',hide:true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅'}
- ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜'}
- ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
- ,{field: 'unitPrice', align: 'center',title: '鍗曚环'}
- ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'}
- ,{field: 'count', align: 'center',title: '鏁伴噺'}
- ,{field: 'weight', align: 'center',title: '閲嶉噺'}
- ,{field: 'status$', align: 'center',title: '鐘舵��'}
- ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
- ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ {field: 'matnr', title: '鍟嗗搧缂栧彿', width: 160},
+ {field: 'maktx', title: '鍚嶇О', width: 160},
+ {field: 'standby3', title: '瀹㈡埛SKU'},
+ {field: 'boxType1', title: '璐т富'},
+ {field: 'boxType3', title: '閲囪喘鍗曞彿'},
+ // {field: 'batch', title: '鎵瑰彿'}
+ {field: 'standby1', align: 'center',title: '瀹㈡埛PO', hide: false},
+ {field: 'standby2', align: 'center',title: 'UPC', hide: false},
+ {field: 'anfme', title: '鏁伴噺'},
+ {field: 'workQty', title: '浣滀笟鏁伴噺'},
+ {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/views/orderDetlPakin/orderDetl.html b/src/main/webapp/views/orderDetlPakin/orderDetl.html
index 2f890dd..e107d2c 100644
--- a/src/main/webapp/views/orderDetlPakin/orderDetl.html
+++ b/src/main/webapp/views/orderDetlPakin/orderDetl.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <title></title>
+ <title>璁㈠崟鏄庣粏绠＄悊</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -15,12 +15,32 @@
<div class="layui-fluid">
<div class="layui-card">
<div class="layui-card-body">
+
+ <!-- 鎼滅储妗� -->
<div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">缂栧彿:</label>
+ <label class="layui-form-label">鍟嗗搧缂栧彿:</label>
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚嶇О:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍚嶇О" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹㈡埛PO:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="standby1" placeholder="瀹㈡埛PO" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閲囪喘鍗曞彿:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="box_type3" placeholder="閲囪喘鍗曞彿" autocomplete="off">
</div>
</div>
<div class="layui-inline"> 
@@ -33,11 +53,15 @@
</div>
</div>
</div>
+
+ <!-- 琛ㄦ牸 -->
<table class="layui-hide" id="orderDetl" lay-filter="orderDetl"></table>
+
</div>
</div>
</div>
+<!-- 宸ュ叿鏍� -->
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
@@ -46,33 +70,67 @@
</div>
</script>
+<!-- 鎿嶄綔鍒� -->
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
<a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
</script>
+<!-- JS -->
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<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/orderDetl/orderDetl.js" charset="utf-8"></script>
-</body>
-<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/javascript" src="../../static/js/orderDetlPakin/orderDetl.js" charset="utf-8"></script>
+
+<!-- 寮圭獥琛ㄥ崟 -->
<script type="text/html" id="editDialog">
<form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
<input name="id" type="hidden">
+
<div class="layui-row">
<div class="layui-col-md12">
+
<div class="layui-form-item">
- <label class="layui-form-label">璁㈠崟鍐呯爜: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="orderId" placeholder="璇疯緭鍏ヨ鍗曞唴鐮�" style="display: none">
- <input id="orderId$" 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="orderQueryByorderId" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="orderQueryByorderIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
+ <label class="layui-form-label">鍟嗗搧缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍚嶇О: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="maktx" placeholder="璇疯緭鍏ュ悕绉�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹㈡埛SKU: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="standby3" placeholder="璇疯緭鍏ュ鎴稴KU">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璐т富: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="boxType1" placeholder="璇疯緭鍏ヨ揣涓�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">閲囪喘鍗曞彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="boxType3" placeholder="璇疯緭鍏ラ噰璐崟鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹㈡埛PO: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="standby1" placeholder="璇疯緭鍏ュ鎴稰O">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">UPC: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="standby2" placeholder="璇疯緭鍏PC">
</div>
</div>
<div class="layui-form-item">
@@ -82,138 +140,21 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍟嗗搧缂栫爜: </label>
+ <label class="layui-form-label">浣滀笟鏁伴噺: </label>
<div class="layui-input-block">
- <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鐮�">
+ <input class="layui-input" name="workQty" placeholder="璇疯緭鍏ヤ綔涓氭暟閲�">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍟嗗搧鍚嶇О: </label>
+ <label class="layui-form-label">瀹屾垚鏁伴噺: </label>
<div class="layui-input-block">
- <input class="layui-input" name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍚嶇О: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="name" placeholder="璇疯緭鍏ュ悕绉�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">瑙勬牸: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="specs" placeholder="璇疯緭鍏ヨ鏍�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍨嬪彿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="model" placeholder="璇疯緭鍏ュ瀷鍙�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鎵瑰彿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="batch" placeholder="璇疯緭鍏ユ壒鍙�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曚綅: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="unit" placeholder="璇疯緭鍏ュ崟浣�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍟嗗搧鏉＄爜: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="barcode" placeholder="璇疯緭鍏ュ晢鍝佹潯鐮�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">渚涘簲鍟�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曚环: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="unitPrice" placeholder="璇疯緭鍏ュ崟浠�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍝侀」鏁�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="itemNum" placeholder="璇疯緭鍏ュ搧椤规暟">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鏁伴噺: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="count" placeholder="璇疯緭鍏ユ暟閲�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">閲嶉噺: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="weight" placeholder="璇疯緭鍏ラ噸閲�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鐘舵��: </label>
- <div class="layui-input-block">
- <select name="status">
- <option value="">璇烽�夋嫨鐘舵��</option>
- <option value="1">姝ｅ父</option>
- <option value="0">绂佺敤</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">娣诲姞浜哄憳: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="createBy" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" style="display: none">
- <input id="createBy$" 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="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">娣诲姞鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">淇敼浜哄憳: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
- <input id="updateBy$" 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="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">淇敼鏃堕棿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">澶囨敞: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+ <input class="layui-input" name="qty" placeholder="璇疯緭鍏ュ畬鎴愭暟閲�">
</div>
</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>
@@ -221,5 +162,6 @@
</div>
</form>
</script>
-</html>
+</body>
+</html>
--
Gitblit v1.9.1