From ecea595664c413e6b0cfbb8a7e60f2d20ad75674 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 09 八月 2021 12:55:09 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/stockIn.html | 248 ++++++++++++++++++++++++++++---------------------
1 files changed, 142 insertions(+), 106 deletions(-)
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 07c06b4..851bcd8 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
- <title>鍏ュ簱</title>
+ <title>涓婃灦</title>
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../static/css/pda.css" media="all">
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -65,24 +65,37 @@
transform:rotate(-45deg);
}
+ /**缁胯壊鍕�*/
+ #node-ok {
+ float: left;
+ width: 15px;
+ height: 15px;
+ border-radius: 50%;
+ margin-top: 13px;
+ background-color: #2ac845;
+ display: none;
+ }
+
+ #typeSelect {
+ padding: 10px 20px;
+ }
+ .layui-form-radio {
+ width: 100%;
+ }
+
</style>
</head>
<body>
<!-- 澶撮儴 -->
<header>
<div class="layui-input-inline">
- <label class="layui-form-label">鏉＄爜</label>
- <input class="layui-input" type="number" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
+ <label class="layui-form-label" style="width: 84px">鎵樼洏鐮�</label>
+ <input class="layui-input" type="text" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
</div>
- <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 STYLE="margin: 5px 0" class="layui-input-inline">
+ <label class="layui-form-label">涓婃灦璐т綅</label>
+ <input style="float: left" class="layui-input" type="text" id="node" onkeyup="findNode(this)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
+ <span id="node-ok"></span>
</div>
</header>
@@ -94,18 +107,26 @@
<footer>
<div class="layui-btn-container">
<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>
+ <button id="pakin" type="button" class="layui-btn layui-btn-normal" onclick="pakIn()" style="margin-left: 15px">涓婃灦</button>
</div>
</footer>
+
+<div id="typeSelect" style="display: none">
+ <form class="layui-form">
+ <input type="radio" name="docType" value="34" title="閲囪喘鍗�" checked="">
+ <input type="radio" name="docType" value="45" title="閿�鍞��璐у崟">
+ <hr>
+ <div style="text-align: center">
+ <button class="layui-btn layui-btn-normal" onclick="pakIn()">纭畾</button>
+ </div>
+ </form>
+</div>
</body>
<script>
var tableIns;
window.onload = function(){
document.getElementById("code").focus();
- getInBound();
}
-
layui.use(['table','laydate', 'form'], function() {
var table = layui.table;
@@ -119,9 +140,9 @@
limit: 500,
cellMinWidth: 50,
cols: [[
- {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
- {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
- {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
+ {fixed: 'left', align: 'center', field: 'anfme', title: '鏁伴噺', style:'color: blue', width:50},
+ {field: 'matnr', align: 'center', title: '鍟嗗搧缂栫爜'},
+ {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'}
]],
done: function (res, curr, count) {
@@ -131,30 +152,58 @@
});
function findCode(el) {
- if (el.value.length === 7) {
- $('#mat-btn').focus();
- getMat();
+ if (isEmpty(el.value)) {
+ return;
}
+ $.ajax({
+ url: baseUrl + "/mobile/inStock/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ zpallet: el.value
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ if (res.data.length > 0) {
+ matData = res.data;
+ tableIns.reload({data: res.data});
+ $('#node').focus();
+ } else {
+ matData = [];
+ tableIns.reload({data: res.data});
+ }
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ alert(res.msg)
+ }
+ }
+ })
}
- // 鑾峰彇鍏ュ簱鍙�
- function getInBound(){
+ function findNode(el) {
+ if (isEmpty(el.value)) {
+ $('#node-ok').hide();
+ return;
+ }
$.ajax({
- url: baseUrl+"/available/put/site",
+ url: baseUrl + "/mobile/inStock/node/auth",
headers: {'token': localStorage.getItem('token')},
+ data: {
+ node: el.value
+ },
method: 'POST',
- async: false,
success: function (res) {
- if (res.code === 200){
- var tpl = $("#putSiteSelectTemplate").html();
- var template = Handlebars.compile(tpl);
- var html = template(res);
- $('#putSiteSelect').append(html);
- layui.form.render('select');
- } else if (res.code === 403){
- top.location.href = baseUrl+"/pda";
- }else {
- tips("鑾峰彇鍏ュ簱鍙ｅけ璐�", true)
+ if (res.code === 200) {
+ if (res.data != null) {
+ $('#node-ok').show();
+ } else {
+ $('#node-ok').hide();
+ }
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ tips(res.msg, true);
}
}
})
@@ -171,6 +220,7 @@
content: 'matQuery.html',
success: function(layero, index){
$('.layui-layer-title').css('font-size', '16px');
+ $('.layui-layer.layui-layer-iframe').css('border-radius', '8px');
},
end: function () {
$('#mat-btn').focus();
@@ -181,62 +231,87 @@
// 娣诲姞琛ㄦ牸鏁版嵁
var matData = [];
function addTableData(data) {
- if (isEmpty(data.matName)){
- tips("鎻愬彇澶辫触", true);
- return;
+ if (matData.length > 0) {
+ matData = [];
}
- let toPush = true;
- for (var j=0;j<matData.length;j++){
- if (data.matNo === matData[j].matNo) {
- matData[j].count = Number(matData[j].count) + Number(data.count);
- toPush = false;
+ for (var i=0;i<data.length;i++) {
+ var toPush = true;
+ for (var j=0;j<matData.length;j++){
+ if (data[i].matnr === matData[j].matnr) {
+ matData[j].count = Number(matData[j].count) + Number(data[i].anfme);
+ toPush = false;
+ }
+ }
+ if (toPush) {
+ matData.push(data[i]);
}
}
- if (toPush) {
- matData.push(data);
- }
- tips("鎻愬彇鎴愬姛");
tableIns.reload({data: matData});
+ $("#comb-btn").focus();
}
// 閲嶇疆
function reset() {
$('#code').val("");
+ $('#node').val("");
matData = [];
tableIns.reload({data: matData});
- $('#putSiteSelect').val("");
+ $('#node-ok').hide();
layui.form.render('select');
- // tips("");
}
- // 鍏ュ簱
- function pakIn() {
- var barcode = $('#code').val();
- if (isEmpty(barcode)) {
+
+ function confirm() {
+ var zpallet = $('#code').val();
+ if (isEmpty(zpallet)) {
tips("鎵樼洏鏉＄爜涓虹┖", true);
return;
}
- if (barcode.length !== 7) {
- tips("鏉＄爜蹇呴』涓�7浣�", true);
+ var node = $('#node').val();
+ if (isEmpty(node)) {
+ tips("璐т綅涓虹┖", true);
return;
}
if (matData.length === 0) {
tips("璇锋彁鍙栫墿鏂�", true);
return;
}
- // var site = $('input:radio[name="site"]:checked').next("span").html();
- var site = $('#putSiteSelect').val();
- if (null === site || undefined === site || site === "") {
- tips("璇烽�夋嫨鍏ュ簱鍙�", true);
+ layer.open({
+ type: 1,
+ title: '鍗曟嵁绫诲瀷',
+ shade: [0.3,'#000'],
+ area: ['70%'],
+ content: $('#typeSelect'),
+ success: function(layero, index){
+ }
+ });
+ }
+
+ // 涓婃灦
+ function pakIn() {
+ var docType = $('input:radio[name="docType"]:checked').val();
+ var zpallet = $('#code').val();
+ if (isEmpty(zpallet)) {
+ tips("鎵樼洏鏉＄爜涓虹┖", true);
return;
}
+ var node = $('#node').val();
+ if (isEmpty(node)) {
+ tips("璐т綅涓虹┖", true);
+ return;
+ }
+ if (matData.length === 0) {
+ tips("璇锋彁鍙栫墿鏂�", true);
+ return;
+ }
+ layer.closeAll();
$.ajax({
- url: baseUrl+"/full/store/put/start",
+ url: baseUrl+"/work/stock/in",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
- barcode: barcode,
- devpNo: site,
- list: matData
+ nodeId: node,
+ zpallet: zpallet,
+ docType: docType
}),
contentType:'application/json;charset=UTF-8',
method: 'POST',
@@ -244,7 +319,7 @@
success: function (res) {
if (res.code === 200) {
reset();
- tips("鍏ュ簱鍚姩鎴愬姛")
+ tips("涓婃灦鎴愬姛")
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
} else {
@@ -254,42 +329,8 @@
})
}
- // 绌烘澘鍏ュ簱
- function emptyPakIn() {
- var barcode = $('#code').val();
- if (isEmpty(barcode)) {
- tips("鎵樼洏鏉＄爜涓虹┖", true);
- return;
- }
- if (barcode.length !== 7) {
- tips("鏉＄爜蹇呴』涓�7浣�", 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 {
- tips(res.msg, true)
- }
- }
- })
+ function doPost() {
+
}
/**
@@ -316,10 +357,5 @@
$("#code").focus();
}
}
-</script>
-<script type="text/template" id="putSiteSelectTemplate">
- {{#each data}}
- <option value="{{this}}">{{this}}</option>
- {{/each}}
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1