From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/views/pda/stockIn.html | 143 +++++++++++++++++++++++++++++++++++------------
1 files changed, 106 insertions(+), 37 deletions(-)
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 44169ee..9825eb6 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -12,9 +12,6 @@
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<style>
- main {
- height: 145px;
- }
.site-list {
padding: 2px 0;
height: 22px;
@@ -75,10 +72,17 @@
<header>
<div class="layui-input-inline">
<label class="layui-form-label">鏉＄爜</label>
- <input class="layui-input" type="text" id="code" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
+ <input class="layui-input" type="number" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
</div>
- <div style="margin: 5px 5px">
- <button type="button" class="layui-btn layui-btn-normal layui-btn-xs" onclick="getMat()"><i class="layui-icon">+</i>鎻愬彇</button>
+ <div style="margin: 5px 5px" class="layui-form">
+ <button id="mat-btn" type="button" class="layui-btn layui-btn-normal" onclick="getMat()"><i class="layui-icon">+</i>鎻愬彇</button>
+ <!-- 鍏ュ簱鍙� -->
+ <div class="layui-inline" style="width: 120px; margin-left: 15px">
+ <select id="putSiteSelect">
+ <option value="">鍏ュ簱鍙�</option>
+ </select>
+ </div>
+
</div>
</header>
@@ -88,14 +92,10 @@
</main>
<!-- 灏鹃儴 -->
<footer>
- <!-- 鍏ュ簱鍙� -->
- <div class="site-list">
- <span style="display: inline-block; margin:0 0 0 10px; font-size: 12px">鍏ュ簱鍙ｏ細</span>
- </div>
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-xs layui-btn-primary" onclick="reset()">閲嶇疆</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-xs" onclick="pakIn()" style="margin-left: 20px">鍏ュ簱</button>
- <span id="tips"></span>
+ <button type="button" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
+ <button id="empty-pakin" type="button" class="layui-btn layui-btn-normal" onclick="emptyPakIn()" style="margin-left: 15px">绌烘澘鍏ュ簱</button>
+ <button id="pakin" type="button" class="layui-btn layui-btn-normal" onclick="pakIn()" style="margin-left: 15px">鍏ュ簱</button>
</div>
</footer>
</body>
@@ -105,6 +105,7 @@
document.getElementById("code").focus();
getInBound();
}
+
layui.use(['table','laydate', 'form'], function() {
var table = layui.table;
@@ -118,15 +119,23 @@
limit: 500,
cellMinWidth: 50,
cols: [[
- {fixed: 'left', align: 'center', field: 'count', title: '閲�', style:'color: blue', width:20},
- {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
- {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
+ {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
+ {field: 'matnr', align: 'center', title: '鐗╂枡鍙�'},
+ {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
done: function (res, curr, count) {
+
}
});
});
+
+ function findCode(el) {
+ if (el.value.length === 8) {
+ $('#mat-btn').focus();
+ getMat();
+ }
+ }
// 鑾峰彇鍏ュ簱鍙�
function getInBound(){
@@ -137,10 +146,11 @@
async: false,
success: function (res) {
if (res.code === 200){
- var tpl = $("#inSitesTemplate").html();
+ var tpl = $("#putSiteSelectTemplate").html();
var template = Handlebars.compile(tpl);
var html = template(res);
- $('.site-list').append(html);
+ $('#putSiteSelect').append(html);
+ layui.form.render('select');
} else if (res.code === 403){
top.location.href = baseUrl+"/pda";
}else {
@@ -157,11 +167,13 @@
type: 2,
title: '鐗╂枡',
shade: [0.3,'#000'],
- area: ['90%', '90%'],
+ area: ['90%', '80%'],
content: 'matQuery.html',
success: function(layero, index){
- $('.layui-layer-title').css('height', '20px').css('line-height', '20px').css('font-size', '12px').css('padding-left', '10px')
- $('.layui-layer-setwin').css("top", '2px').css('right', '3px')
+ $('.layui-layer-title').css('font-size', '16px');
+ },
+ end: function () {
+ $('#mat-btn').focus();
}
});
}
@@ -169,13 +181,13 @@
// 娣诲姞琛ㄦ牸鏁版嵁
var matData = [];
function addTableData(data) {
- if (isEmpty(data.matName)){
- tips("鎻愬彇澶辫触");
+ if (isEmpty(data.maktx)){
+ tips("鎻愬彇澶辫触", true);
return;
}
let toPush = true;
for (var j=0;j<matData.length;j++){
- if (data.matNo === matData[j].matNo) {
+ if (data.matnr === matData[j].matnr) {
matData[j].count = Number(matData[j].count) + Number(data.count);
toPush = false;
}
@@ -192,24 +204,29 @@
$('#code').val("");
matData = [];
tableIns.reload({data: matData});
- tips("");
+ $('#putSiteSelect').val("");
+ layui.form.render('select');
+ // tips("");
}
// 鍏ュ簱
function pakIn() {
- let barcode = $('#code').val();
+ var barcode = $('#code').val();
if (isEmpty(barcode)) {
tips("鎵樼洏鏉＄爜涓虹┖", true);
- document.getElementById("code").focus();
+ return;
+ }
+ if (barcode.length !== 8) {
+ tips("鏉＄爜蹇呴』涓�8浣�", true);
return;
}
if (matData.length === 0) {
tips("璇锋彁鍙栫墿鏂�", true);
return;
}
- let site = $('input:radio[name="site"]:checked').next("span").html();
- console.log(site);
- if (null === site || undefined === site) {
+ // var site = $('input:radio[name="site"]:checked').next("span").html();
+ var site = $('#putSiteSelect').val();
+ if (null === site || undefined === site || site === "") {
tips("璇烽�夋嫨鍏ュ簱鍙�", true);
return;
}
@@ -227,7 +244,45 @@
success: function (res) {
if (res.code === 200) {
reset();
- tips("鍚姩鍏ュ簱鎴愬姛")
+ tips("鍏ュ簱鍚姩鎴愬姛")
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ tips(res.msg, true)
+ }
+ }
+ })
+ }
+
+ // 绌烘澘鍏ュ簱
+ function emptyPakIn() {
+ var barcode = $('#code').val();
+ if (isEmpty(barcode)) {
+ tips("鎵樼洏鏉＄爜涓虹┖", true);
+ return;
+ }
+ if (barcode.length !== 8) {
+ tips("鏉＄爜蹇呴』涓�8浣�", true);
+ return;
+ }
+ var site = $('#putSiteSelect').val();
+ if (null === site || undefined === site || site === "") {
+ tips("璇烽�夋嫨鍏ュ簱鍙�", true);
+ return;
+ }
+ $.ajax({
+ url: baseUrl+"/empty/plate/in/start",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ barcode: barcode,
+ sourceStaNo: site
+ },
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200) {
+ reset();
+ tips("绌烘澘鍏ュ簱鍚姩鎴愬姛")
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
} else {
@@ -243,14 +298,28 @@
* @param warn true锛氱孩鑹插瓧浣�
*/
function tips(msg, warn) {
- let tips = $('#tips');
- tips.html(msg);
- tips.css("color", warn?"red":'#666');
+ // let tips = $('#tips');
+ // tips.html(msg);
+ // tips.css("color", warn?"red":'#666');
+ layer.msg(msg, {icon: warn?2:1})
+ }
+
+ document.onkeyup = function (e) {
+ if (window.event)//濡傛灉window.event瀵硅薄瀛樺湪锛屽氨浠ユ浜嬩欢瀵硅薄涓哄噯
+ e = window.event;
+ var key = e.charCode || e.keyCode;
+ if (key === 115) {
+ $("#pakin").focus();
+ pakIn();
+ } else if (key === 113) {
+ $("#code").val("");
+ $("#code").focus();
+ }
}
</script>
-<script type="text/template" id="inSitesTemplate">
+<script type="text/template" id="putSiteSelectTemplate">
{{#each data}}
- <label><input class="cool-checkbox" type="radio" name="site"><span>{{this}}</span></label>
+ <option value="{{this}}">{{this}}</option>
{{/each}}
</script>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.1