From c1d4b1a144cb65e9d83aa9bf700745f4827476f7 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 02 四月 2026 10:25:26 +0800
Subject: [PATCH] no message
---
src/main/webapp/static/js/orderTablePakout.js | 1
src/main/resources/mapper/WrkDetlMapper.xml | 1
src/main/webapp/views/wrkMast/wrkMast.html | 6 ++
src/main/webapp/views/orderPakout/agvOut.html | 13 ++++--
src/main/webapp/static/js/pakStore/stockAdjust.js | 7 ++-
src/main/webapp/static/js/checkOrder/checkOrder.js | 9 ++--
src/main/webapp/static/js/orderTablePakoutAGV.js | 7 ++-
src/main/resources/mapper/TaskMapper.xml | 2
src/main/webapp/views/locCache/locCache.html | 19 +++------
src/main/webapp/static/js/common.js | 1
src/main/webapp/views/basStation/basStation.html | 4 +-
src/main/webapp/static/js/orderPakout/agvOut.js | 19 +--------
12 files changed, 42 insertions(+), 47 deletions(-)
diff --git a/src/main/resources/mapper/TaskMapper.xml b/src/main/resources/mapper/TaskMapper.xml
index 350da64..6717fda 100644
--- a/src/main/resources/mapper/TaskMapper.xml
+++ b/src/main/resources/mapper/TaskMapper.xml
@@ -9,7 +9,7 @@
</resultMap>
<select id="selectToBeCompleteData" resultType="com.zy.asrs.entity.Task">
- select * from agv_task where ((wrk_sts = 204 Or wrk_sts = 304 ) and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,error_time,io_time,wrk_no
+ select * from agv_task where (wrk_sts = 204 Or wrk_sts = 304 ) order by upd_mk,error_time,io_time,wrk_no
</select>
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index bc7bfd1..84229d3 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -61,7 +61,6 @@
</choose>
</sql>
-
<select id="selectByWrkNo" resultMap="BaseResultMap">
select * from asr_wrk_detl where 1=1 and wrk_no = #{wrkNo}
</select>
diff --git a/src/main/webapp/static/js/checkOrder/checkOrder.js b/src/main/webapp/static/js/checkOrder/checkOrder.js
index 6ef09e5..d19c0c0 100644
--- a/src/main/webapp/static/js/checkOrder/checkOrder.js
+++ b/src/main/webapp/static/js/checkOrder/checkOrder.js
@@ -132,7 +132,7 @@
{field: 'zpallet', title: '瀹瑰櫒鐮�', width: 120},
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- {field: 'batch', title: '鎵瑰彿'},
+ {field: 'suppCode', title: '渚涘簲鍟�'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '鐩樼偣鏁伴噺'},
{field: 'diffQty', title: '宸紓鏁伴噺', style: 'font-weight: bold'},
@@ -256,7 +256,7 @@
{field: 'locNo', title: '搴撲綅鍙�'},
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
- {field: 'batch', title: '鎵瑰彿'},
+ {field: 'suppCode', title: '渚涘簲鍟�'},
{field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺', minWidth: 110, width: 110},
// {field: 'unit', title: '鍗曚綅', width: 80},
@@ -329,7 +329,7 @@
}
}
- if (data[j].diffQty !== 0){
+ if (undefined !== data[j] && data[j].diffQty !== 0){
isDuplicate = true;
duplicateCount++;
}
@@ -512,9 +512,10 @@
// {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
- {field: 'batch', title: '搴忓垪鐮�', align: 'center'},
+ {field: 'suppCode', title: '渚涘簲鍟�', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
+ // {field: 'suppCode', title: '渚涘簲鍟�', align: 'center', width: 100},
{field: 'frozen$', title: '鏄庣粏', align: 'center', width: 90, templet: '#locFrozen'},
{field: 'frozenLoc$', title: '搴撲綅', align: 'center', width: 90, templet: '#locFrozenLoc'},
{field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index eecb32d..4174b97 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -272,6 +272,7 @@
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
+ ,{field: 'standby1', align: 'center',title: '渚涘簲鍟嗕唬鐮�', hide:true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
diff --git a/src/main/webapp/static/js/orderPakout/agvOut.js b/src/main/webapp/static/js/orderPakout/agvOut.js
index a3243ad..6a6c368 100644
--- a/src/main/webapp/static/js/orderPakout/agvOut.js
+++ b/src/main/webapp/static/js/orderPakout/agvOut.js
@@ -35,25 +35,12 @@
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
,{field: 'standby1', align: 'center',title: '渚涘簲鍟嗕唬鐮�'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
- // ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- // ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸',hide: true}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
- // ,{field: 'name', align: 'center',title: '鍚嶇О'}
- // ,{field: 'model', align: 'center',title: '鍨嬪彿'}
+ ,{field: 'workQty', align: 'center',title: '鎵ц涓�', style: 'font-weight: bold'}
+ ,{field: 'qty', align: 'center',title: '宸插畬鎴�', style: 'font-weight: bold'}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜', hide: true}
- // ,{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: '澶囨敞'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 160}
]],
request: {
diff --git a/src/main/webapp/static/js/orderTablePakout.js b/src/main/webapp/static/js/orderTablePakout.js
index bfebb7d..e4cb4ac 100644
--- a/src/main/webapp/static/js/orderTablePakout.js
+++ b/src/main/webapp/static/js/orderTablePakout.js
@@ -43,6 +43,7 @@
{field: 'orderTime', title: '鏃ユ湡', width: 160},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', align: 'center', width: 155},
{field: 'shipName$', title: '鍗曟嵁绫诲瀷', align: 'center'}
+ // {field: 'docType$', title: '鍗曟嵁绫诲瀷', align: 'center'}
]],
done: function (res, curr, count) {
$('#dictTable+.layui-table-view .layui-table-body tbody>tr:first').trigger('click');
diff --git a/src/main/webapp/static/js/orderTablePakoutAGV.js b/src/main/webapp/static/js/orderTablePakoutAGV.js
index c018ef4..2e5a80f 100644
--- a/src/main/webapp/static/js/orderTablePakoutAGV.js
+++ b/src/main/webapp/static/js/orderTablePakoutAGV.js
@@ -40,9 +40,10 @@
defaultToolbar: [],
cols: [[
// {type: 'numbers', title: '#'},
- {field: 'orderTime', title: '鏃ユ湡', width: 160},
- {field: 'orderNo', title: '鍗曟嵁缂栧彿', align: 'center', width: 155},
- {field: 'docType$', title: '鍗曟嵁绫诲瀷', align: 'center'}
+ // {field: 'orderNo', title: '鍗曟嵁缂栧彿', align: 'center', width: 155},
+ {field: 'number', title: '娲惧伐鍗曞彿', align: 'center', width: 155},
+ {field: 'shipCode', title: '纭鍗曞彿', align: 'center'},
+ {field: 'orderTime', title: '鏃ユ湡', width: 160},
]],
done: function (res, curr, count) {
$('#dictTable+.layui-table-view .layui-table-body tbody>tr:first').trigger('click');
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index 042a8b5..4e36046 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -7,10 +7,13 @@
var cols = [
{fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿锛堢紪杈戯級', edit: true, style: 'font-weight:bold'}
+ ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗭紙缂栬緫锛�', edit: true, style: 'font-weight:bold'}
+ ,{field: 'boxType1', align: 'center',title: '闅斿眰缂栫爜', width: 150, edit: true, style: 'font-weight:bold'}
];
arrRemove(detlCols, "field", "anfme");
- arrRemove(detlCols, "field", "batch");
+ arrRemove(detlCols, "field", "boxType1");
+ arrRemove(detlCols, "field", "suppCode");
+
cols.push.apply(cols, detlCols);
cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
return cols;
diff --git a/src/main/webapp/views/basStation/basStation.html b/src/main/webapp/views/basStation/basStation.html
index c566e93..79fd5bf 100644
--- a/src/main/webapp/views/basStation/basStation.html
+++ b/src/main/webapp/views/basStation/basStation.html
@@ -52,14 +52,14 @@
<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>
- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+<!-- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
</div>
</script>
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">鏄庣粏</a>
<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>
+<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>-->
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
diff --git a/src/main/webapp/views/locCache/locCache.html b/src/main/webapp/views/locCache/locCache.html
index aa53ae9..0edaa3d 100644
--- a/src/main/webapp/views/locCache/locCache.html
+++ b/src/main/webapp/views/locCache/locCache.html
@@ -22,19 +22,14 @@
<input class="layui-input" type="text" name="loc_no" placeholder="缂栧彿" autocomplete="off">
</div>
</div>
- <div class="layui-inline" style="width: 300px">
- <div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="create_time" type="text"
- placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
- </div>
- </div>
<div class="layui-inline">
<div class="layui-input-inline">
<select name="area_name">
<option value="">搴撳尯鍚嶇О</option>
<option value="鍏ュ簱鍖�">鍏ュ簱鍖�</option>
- <option value="SO">SO搴撳尯</option>
- <option value="EO">EO搴撳尯</option>
+ <option value="SO">SO</option>
+ <option value="EO">EO</option>
+ <option value="EO">ZZ</option>
</select>
</div>
</div>
@@ -61,10 +56,10 @@
<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>
+<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
<button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="batchModifties">鎵归噺淇敼</button>
- <button class="layui-btn layui-btn-danger layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary" id="btn-init" lay-event="init">鍒濆鍖�</button>
+<!-- <button class="layui-btn layui-btn-danger layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
+<!-- <button class="layui-btn layui-btn-primary" id="btn-init" lay-event="init">鍒濆鍖�</button>-->
</div>
</script>
@@ -226,7 +221,7 @@
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-xs btn-detlShow" lay-event="showDetl">鏄庣粏</a>
<!-- <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>
+<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>-->
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
diff --git a/src/main/webapp/views/orderPakout/agvOut.html b/src/main/webapp/views/orderPakout/agvOut.html
index 4e7d077..6d6d9ac 100644
--- a/src/main/webapp/views/orderPakout/agvOut.html
+++ b/src/main/webapp/views/orderPakout/agvOut.html
@@ -66,7 +66,7 @@
<div class="layui-fluid" style="padding-bottom: 0;">
<div class="layui-row layui-col-space15">
<!-- 宸� -->
- <div class="layui-col-md3" id="left-table">
+ <div class="layui-col-md4" id="left-table">
<div class="layui-card">
<div class="layui-card-body" style="padding: 10px;">
<form class="layui-form toolbar">
@@ -74,13 +74,16 @@
<div class="layui-inline" style="max-width: 300px;">
<input name="orderNo" class="layui-input" placeholder="杈撳叆鍗曟嵁缂栧彿" autocomplete="off"/>
</div>
+ <div class="layui-inline" style="max-width: 300px;">
+ <input name="shipCode" class="layui-input" placeholder="杈撳叆纭鍗曞彿" autocomplete="off"/>
+ </div>
<div class="layui-inline">
<button class="layui-btn icon-btn" lay-filter="originTableSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
- <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>
- <i class="layui-icon"></i>閲嶇疆
- </button>
+<!-- <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>-->
+<!-- <i class="layui-icon"></i>閲嶇疆-->
+<!-- </button>-->
</div>
</div>
</form>
@@ -89,7 +92,7 @@
</div>
</div>
<!-- 鍙� -->
- <div class="layui-col-md9">
+ <div class="layui-col-md8">
<div class="layui-card">
<div class="layui-card-body" style="padding: 10px;">
<form class="layui-form toolbar">
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index aa3158f..988788c 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -89,7 +89,11 @@
<!-- <input class="layui-input layui-laydate-range" name="io_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">-->
<!-- </div>-->
<!-- </div>-->
-<!--s-->
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
--
Gitblit v1.9.1