|
|
|
@ -18,6 +18,7 @@ |
|
|
|
<legend>搜索信息</legend> |
|
|
|
<div style="margin: 10px 10px 10px 10px"> |
|
|
|
<input style="display: none" th:value="${number}" id="number"> |
|
|
|
<input style="display: none" th:value="${display}" id="display"> |
|
|
|
<form class="layui-form layui-form-pane" action=""> |
|
|
|
<div class="layui-form-item"> |
|
|
|
<div class="layui-inline"> |
|
|
|
@ -127,7 +128,7 @@ |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
function showDetail(){ |
|
|
|
function showDetail() { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
@ -136,13 +137,14 @@ |
|
|
|
let newIndexShade; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
layui.use(['form', 'table', 'upload'], function () { |
|
|
|
var $ = layui.jquery, |
|
|
|
form = layui.form, |
|
|
|
upload = layui.upload, |
|
|
|
table = layui.table; |
|
|
|
|
|
|
|
let display = $("#display").val(); |
|
|
|
|
|
|
|
$('#openSonByMateralType').on('click', function () { |
|
|
|
layer.open({ |
|
|
|
type: 2, |
|
|
|
@ -187,6 +189,28 @@ |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
let cols = [ |
|
|
|
{type: "checkbox", width: 50}, |
|
|
|
{title: '存货编码', width: 150, templet: '#materialCode'}, |
|
|
|
{field: 'mname', width: 200, title: '物料名称'}, |
|
|
|
{field: 'brand', width: 200, title: '品牌'}, |
|
|
|
{field: 'version', width: 200, title: '规格型号'}, |
|
|
|
{field: 'typeName', width: 200, title: '物料类型'}, |
|
|
|
{title: '计量单位', width: 200, templet: '#changeUnit', align: "center"}, |
|
|
|
{field: 'quantity', width: 200, title: '数量'}, |
|
|
|
{field: 'depositoryName', width: 200, title: '仓库名称'}, |
|
|
|
{field: 'depositoryCode', width: 200, title: '仓库编码'}, |
|
|
|
{title: '所处库位', width: 200, templet: '#changePlace', align: "center"}, |
|
|
|
{field: 'warningCount', width: 200, title: '待过期数量', sort: true}, |
|
|
|
{field: 'price', title: '单价', width: 200, sort: true}, |
|
|
|
{field: 'amounts', title: '总金额', width: 200, sort: true}, |
|
|
|
{field: 'texture', width: 200, title: '材质',}, |
|
|
|
{field: 'iremark', width: 200, title: '备注',}, |
|
|
|
{title: '操作', minWidth: 250, toolbar: '#currentTableBar', align: "center"} |
|
|
|
]; |
|
|
|
|
|
|
|
let flagForReload = true; |
|
|
|
|
|
|
|
table.render({ |
|
|
|
elem: "#currentTableId", |
|
|
|
url: '/material/findInventory', |
|
|
|
@ -225,9 +249,8 @@ |
|
|
|
{field: 'depositoryCode', width: 200, title: '仓库编码'}, |
|
|
|
{title: '所处库位', width: 200, templet: '#changePlace', align: "center"}, |
|
|
|
{field: 'warningCount', width: 200, title: '待过期数量', sort: true}, |
|
|
|
{field: 'price', title: '单价', width: 200, sort: true}, |
|
|
|
{field: 'amounts', title: '总金额', width: 200, sort: true}, |
|
|
|
{field: 'texture', width: 200, title: '材质',}, |
|
|
|
{field: 'iremark', width: 200, title: '备注',}, |
|
|
|
{title: '操作', minWidth: 250, toolbar: '#currentTableBar', align: "center"} |
|
|
|
] |
|
|
|
], |
|
|
|
@ -237,17 +260,21 @@ |
|
|
|
skin: 'line', |
|
|
|
done: function (res, curr, count) { |
|
|
|
bindTableToolbarFunction(); |
|
|
|
if (display !== "none") { |
|
|
|
if (flagForReload) { |
|
|
|
flagForReload = false; |
|
|
|
table.reload("currentTableId", {cols: [cols]}); |
|
|
|
} |
|
|
|
} |
|
|
|
$.each(res['data'], function (i, j) { |
|
|
|
let jElement = j['warningCount']; |
|
|
|
let placeCode = j['placeCode'].split(" "); |
|
|
|
let placeKingdeeCode = j['placeKingdeeCode'].split(" "); |
|
|
|
let depositoryId = j['depositoryId']; |
|
|
|
let unit = j['unit']; |
|
|
|
let mid = j['id']; |
|
|
|
if (jElement !== null && jElement !== undefined) { |
|
|
|
let flag = (Number(jElement) !== 0); |
|
|
|
if (flag) { |
|
|
|
// console.log(i + ' -458- ' + 'jdjg is null'); |
|
|
|
Layui_SetDataTableRowColor('table', i + 1, '#b1070a'); |
|
|
|
} |
|
|
|
|
|
|
|
@ -424,8 +451,7 @@ |
|
|
|
layer.full(index); |
|
|
|
}); |
|
|
|
return false; |
|
|
|
} |
|
|
|
else if (obj.event === 'applicationOut') { |
|
|
|
} else if (obj.event === 'applicationOut') { |
|
|
|
// 出库申请 |
|
|
|
var index = layer.open({ |
|
|
|
title: '出库申请', |
|
|
|
@ -440,8 +466,7 @@ |
|
|
|
layer.full(index); |
|
|
|
}); |
|
|
|
return false; |
|
|
|
} |
|
|
|
else if (obj.event === 'changeUnit') { |
|
|
|
} else if (obj.event === 'changeUnit') { |
|
|
|
let showQuantity = data.showQuantity; |
|
|
|
let btn = $("#btn_" + data.id); |
|
|
|
let clickNum = Number(btn.attr("click_num")); |
|
|
|
@ -538,17 +563,19 @@ |
|
|
|
re += show |
|
|
|
} |
|
|
|
for (let i = 0; i < res.data.dataList.length; i++) { |
|
|
|
var code = res.data.dataList[i]["code"] === null ? '' : res.data.dataList[i]["code"]; |
|
|
|
var mname = res.data.dataList[i]["mname"]; |
|
|
|
var version = res.data.dataList[i]["version"] === null ? '' : res.data.dataList[i]["version"]; |
|
|
|
var quantity = res.data.dataList[i]["quantity"]; |
|
|
|
var show = "<p style='color: #00FF00'>" + code + "， " + mname + "， " + version + "， 数量为" + quantity + "：通过" + "</p>"; |
|
|
|
let dataListElement = res.data.dataList[i]; |
|
|
|
var code = dataListElement["code"] === null ? '' : dataListElement["code"]; |
|
|
|
var mname = dataListElement["mname"]; |
|
|
|
var version = dataListElement["version"] === null ? '' : dataListElement["version"]; |
|
|
|
var quantity = dataListElement["quantity"]; |
|
|
|
var remark = dataListElement["remark"] === null ? "" : dataListElement["remark"]; |
|
|
|
var show = "<p style='color: #00FF00'>" + code + "， " + mname + "， " + version + "， 数量为:" + quantity + "备注：" + remark + "：通过" + "</p>"; |
|
|
|
re += show |
|
|
|
} |
|
|
|
|
|
|
|
if ("WebSocket" in window) { |
|
|
|
let number = $("#number").val(); |
|
|
|
socket = new WebSocket('ws://127.0.0.1:11111/webSocket/'+number); |
|
|
|
socket = new WebSocket('ws://127.0.0.1:11111/webSocket/' + number); |
|
|
|
switch (socket.readyState) { |
|
|
|
case WebSocket.CONNECTING: |
|
|
|
// 连接中 |
|
|
|
@ -571,8 +598,8 @@ |
|
|
|
} |
|
|
|
socket.addEventListener('message', function (event) { |
|
|
|
layer.close(newIndexShade); |
|
|
|
let shadeItem = '<div class="layui-layer-shade" id='+"layui-layer-shade-x"+newIndexShade+' times="753951" style="z-index:1231233; background-color: rgb(0, 0, 0); opacity: 0.8;"></div>'; |
|
|
|
if ($("#"+"layui-layer-shade-x"+newIndexShade).length <= 0) { |
|
|
|
let shadeItem = '<div class="layui-layer-shade" id=' + "layui-layer-shade-x" + newIndexShade + ' times="753951" style="z-index:1231233; background-color: rgb(0, 0, 0); opacity: 0.8;"></div>'; |
|
|
|
if ($("#" + "layui-layer-shade-x" + newIndexShade).length <= 0) { |
|
|
|
$('body').append(shadeItem); |
|
|
|
} |
|
|
|
let jsonObject = JSON.parse(event.data); |
|
|
|
@ -583,7 +610,8 @@ |
|
|
|
var mname = jsonObject[i]["mname"]; |
|
|
|
var version = jsonObject[i]["version"] === null ? '' : jsonObject[i]["version"]; |
|
|
|
var quantity = jsonObject[i]["quantity"]; |
|
|
|
var show = "<p style='color: #00FF00'>" + code + "， " + mname + "， " + version + "， 数量为" + quantity + "：通过" + "</p>"; |
|
|
|
var remark = jsonObject[i]["remark"]; |
|
|
|
var show = "<p style='color: #00FF00'>" + code + "， " + mname + "， " + version + "， 数量为:" + quantity + "备注：" + remark + "：通过" + "</p>"; |
|
|
|
re += show |
|
|
|
} |
|
|
|
$("#showDataContent").append(re); |
|
|
|
@ -606,20 +634,20 @@ |
|
|
|
, yes: function (index, layero) { |
|
|
|
//按钮【按钮一】的回调 |
|
|
|
$.ajax({ |
|
|
|
url:"/excel/realImportInventory", |
|
|
|
url: "/excel/realImportInventory", |
|
|
|
type: "post", |
|
|
|
data: JSON.stringify({"result":"yes"}), |
|
|
|
data: JSON.stringify({"result": "yes"}), |
|
|
|
dataType: "json", |
|
|
|
contentType: "application/json;charset=utf-8", |
|
|
|
success: function () { |
|
|
|
if (socket !== null) { |
|
|
|
socket.close(); |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
layer.close(index); |
|
|
|
} |
|
|
|
layer.alert("数据导入完成", { |
|
|
|
icon: 0 |
|
|
|
},function (indexForMsg,layero) { |
|
|
|
}, function (indexForMsg, layero) { |
|
|
|
layer.close(indexForMsg); |
|
|
|
closeShowDataMessage(); |
|
|
|
table.reload('currentTableId', { |
|
|
|
@ -637,9 +665,9 @@ |
|
|
|
, btn2: function (index, layero) { |
|
|
|
//按钮【按钮二】的回调 |
|
|
|
$.ajax({ |
|
|
|
url:"/excel/realImportInventory", |
|
|
|
url: "/excel/realImportInventory", |
|
|
|
type: "post", |
|
|
|
data: JSON.stringify({"result":"no"}), |
|
|
|
data: JSON.stringify({"result": "no"}), |
|
|
|
dataType: "json", |
|
|
|
contentType: "application/json;charset=utf-8", |
|
|
|
success: function () { |
|
|
|
@ -669,11 +697,8 @@ |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
closeShowDataMessage = function () { |
|
|
|
$("#layui-layer-shade-x"+newIndexShade).remove(); |
|
|
|
$("#layui-layer-shade-x" + newIndexShade).remove(); |
|
|
|
$("#showImportData").hide(); |
|
|
|
$("#showDataContent").empty(); |
|
|
|
if (socket !== null) { |
|
|
|
|
