|
|
|
@ -28,15 +28,15 @@ |
|
|
|
.layui-input-block { |
|
|
|
margin-left: 80px; |
|
|
|
} |
|
|
|
.layui-form-select{ |
|
|
|
|
|
|
|
.layui-form-select { |
|
|
|
width: 100%; |
|
|
|
} |
|
|
|
.lay-step{ |
|
|
|
|
|
|
|
.lay-step { |
|
|
|
display: none; |
|
|
|
} |
|
|
|
.layui-form-select .layui-input{ |
|
|
|
border-style: none; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
</style> |
|
|
|
|
|
|
|
@ -51,7 +51,8 @@ |
|
|
|
<input th:value="${place}" style="display: none" id="scanValue_placeId"> |
|
|
|
<div carousel-item style="overflow: inherit"> |
|
|
|
<div> |
|
|
|
<form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;padding-top: 40px;"> |
|
|
|
<form class="layui-form layui-form-pane" |
|
|
|
style="margin: 0 auto;max-width: 460px;padding-top: 40px;"> |
|
|
|
<div class="layui-card" id="cardParent"> |
|
|
|
|
|
|
|
|
|
|
|
@ -117,6 +118,7 @@ |
|
|
|
function scanLocationByQrCode(obj) { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// 用于物料名称查询 |
|
|
|
function selectMaterialByName(obj) { |
|
|
|
} |
|
|
|
@ -161,11 +163,11 @@ |
|
|
|
form.render(); |
|
|
|
var materialAndBarCodeList = materialList[i]["materialAndBarCodeList"]; |
|
|
|
var num = i; |
|
|
|
if(num === 0){ |
|
|
|
if (num === 0) { |
|
|
|
num = ""; |
|
|
|
} |
|
|
|
$.each(materialAndBarCodeList, function (index, item) { |
|
|
|
$("#barCode"+num).append(new Option(item.bmcode, item.bmcode));//往下拉菜单里添加元素 |
|
|
|
$("#barCode" + num).append(new Option(item.bmcode, item.bmcode));//往下拉菜单里添加元素 |
|
|
|
}); |
|
|
|
form.render() |
|
|
|
} |
|
|
|
@ -251,6 +253,14 @@ |
|
|
|
</div>`; |
|
|
|
|
|
|
|
} |
|
|
|
var splitInfoList = obj.splitList; |
|
|
|
let splitInfoItem = ""; |
|
|
|
if (splitInfoList !== undefined) { |
|
|
|
for (let i = 0; i < splitInfoList.length; i++) { |
|
|
|
let optinItem = "<option value=" + splitInfoList[i].newUnit + ">" + splitInfoList[i].newUnit + "</option>"; |
|
|
|
splitInfoItem += optinItem; |
|
|
|
} |
|
|
|
} |
|
|
|
var firstItem = |
|
|
|
// 前半部分 |
|
|
|
` <div class="layui-card-body" style="padding-right: 0px" id=` + "cardItem" + NewIdNumber + `> |
|
|
|
@ -283,8 +293,8 @@ |
|
|
|
<label class="layui-form-label">条形编码:</label> |
|
|
|
<div class="layui-input-block" style="margin: 0px;"> |
|
|
|
<div class="inputdiv"> |
|
|
|
<select id=`+"barCode"+NewIdNumber+` name=`+"barCode"+NewIdNumber+`></select> |
|
|
|
<img id= `+"barCodeImg"+NewIdNumber+` name=`+"barCodeImg"+NewIdNumber+` src="/static/images/search.ico" height="16" width="16" style="margin-top: 10px" onclick="scanBarCode(this)" > |
|
|
|
<select id=` + "barCode" + NewIdNumber + ` name=` + "barCode" + NewIdNumber + `></select> |
|
|
|
<img id= ` + "barCodeImg" + NewIdNumber + ` name=` + "barCodeImg" + NewIdNumber + ` src="/static/images/search.ico" height="16" width="16" style="margin-top: 10px" onclick="scanBarCode(this)" > |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
@ -301,7 +311,17 @@ |
|
|
|
<input name=` + "quantity" + NewIdNumber + ` type="number" placeholder="请填写入物料数量" value="" |
|
|
|
class="layui-input" lay-verify="number"> |
|
|
|
</div> |
|
|
|
</div>`; |
|
|
|
</div> |
|
|
|
<div class="layui-form-item"> |
|
|
|
<label class="layui-form-label">计量单位:</label> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<select id=` + "unit" + NewIdNumber + ` name=` + "unit" + NewIdNumber + `> |
|
|
|
<option value="-1">${obj.unit}</option> |
|
|
|
` + splitInfoItem + ` |
|
|
|
</select> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
`; |
|
|
|
|
|
|
|
|
|
|
|
var lastItem = `<div class="layui-form-item"> |
|
|
|
@ -318,7 +338,7 @@ |
|
|
|
if (NewIdNumber !== "") { |
|
|
|
params.push(NewIdNumber) |
|
|
|
} |
|
|
|
$("#stepForm").css("height", height + 475 + 'px'); |
|
|
|
$("#stepForm").css("height", height + 495 + 'px'); |
|
|
|
var materialItem = firstItem + depositoryItem + lastItem; // 最终 |
|
|
|
$("#btn_sub").prepend(materialItem) |
|
|
|
}; |
|
|
|
@ -362,7 +382,7 @@ |
|
|
|
var success = d["success"]; |
|
|
|
var errMsg = ""; |
|
|
|
for (let i = 0; i < err.length; i++) { |
|
|
|
errMsg += "物料编码: " |
|
|
|
errMsg += "物料编码: "; |
|
|
|
errMsg += err[i]["code"]; |
|
|
|
} |
|
|
|
errMsg += "添加失败，请选择新仓库或库位"; |
|
|
|
@ -510,7 +530,7 @@ |
|
|
|
<input id="barcode" name=` + "barCode" + NewIdNumber + ` type="text" placeholder="请填写入条形编码" value="" |
|
|
|
class="layui-input" style="border-style: none"> |
|
|
|
<img src="/static/images/search.ico" height="16" |
|
|
|
id = `+"barCodeImg"+NewIdNumber+` |
|
|
|
id = ` + "barCodeImg" + NewIdNumber + ` |
|
|
|
width="16" style="margin-top: 10px" onclick="scanBarCode(this)" > |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
@ -528,7 +548,16 @@ |
|
|
|
<input name=` + "quantity" + NewIdNumber + ` type="number" placeholder="请填写入物料数量" value="" |
|
|
|
class="layui-input" lay-verify="number"> |
|
|
|
</div> |
|
|
|
</div>`; |
|
|
|
</div> |
|
|
|
<div class="layui-form-item"> |
|
|
|
<label class="layui-form-label">计量单位:</label> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<select id=` + "unit" + NewIdNumber + ` name=` + "unit" + NewIdNumber + ` style="border-style: solid;border-radius: 0 2px 2px 0"> |
|
|
|
|
|
|
|
</select> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
`; |
|
|
|
|
|
|
|
|
|
|
|
var lastItem = `<div class="layui-form-item"> |
|
|
|
@ -542,8 +571,8 @@ |
|
|
|
</div>`; |
|
|
|
// 获取当前高度 |
|
|
|
var height = parseInt(($("#stepForm").css('height')).split("px")[0]); |
|
|
|
params.push(NewIdNumber) |
|
|
|
$("#stepForm").css("height", height + 535 + 'px'); |
|
|
|
params.push(NewIdNumber); |
|
|
|
$("#stepForm").css("height", height + 555 + 'px'); |
|
|
|
var materialItem = firstItem + depositoryItem + lastItem; |
|
|
|
$("#" + parentId).after(materialItem); |
|
|
|
}; |
|
|
|
@ -557,7 +586,7 @@ |
|
|
|
// 获取祖父节点 |
|
|
|
var reparent = parent.parentNode; |
|
|
|
var height = parseInt(($("#stepForm").css('height')).split("px")[0]); |
|
|
|
$("#stepForm").css("height", height - 535 + 'px'); |
|
|
|
$("#stepForm").css("height", height - 555 + 'px'); |
|
|
|
params = remove(params, parentId); |
|
|
|
reparent.removeChild(parent); |
|
|
|
}; |
|
|
|
@ -581,7 +610,7 @@ |
|
|
|
// 输入code |
|
|
|
var code = obj.value; |
|
|
|
// 获取对应元素 |
|
|
|
var parent = obj.parentNode.parentNode.parentNode; |
|
|
|
var parent = obj.parentNode.parentNode.parentNode.parentNode; |
|
|
|
var materialChildren = parent.childNodes[5]; |
|
|
|
var priceChildren = parent.childNodes[11]; |
|
|
|
var barCodeChildren = parent.childNodes[9]; |
|
|
|
@ -621,6 +650,14 @@ |
|
|
|
priceValue.value = d.price; |
|
|
|
// 获取物料与条形码的对应关系 |
|
|
|
var materialAndBarCodeList = d["materialAndBarCodeList"]; |
|
|
|
var splitInfoList = d["splitInfoList"]; |
|
|
|
let unit = $("#unit" + idNumber); |
|
|
|
unit.empty(); |
|
|
|
unit.append(new Option(d.unit, "-1")); |
|
|
|
$.each(splitInfoList, function (index, item) { |
|
|
|
unit.append(new Option(item.newUnit, item.newUnit));//往下拉菜单里添加元素 |
|
|
|
}); |
|
|
|
form.render(); |
|
|
|
if (materialAndBarCodeList.length > 0) { |
|
|
|
// 如果有对应的条形码 |
|
|
|
var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; |
|
|
|
@ -643,8 +680,7 @@ |
|
|
|
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 |
|
|
|
}); |
|
|
|
form.render(); |
|
|
|
} |
|
|
|
else{ |
|
|
|
} else { |
|
|
|
var barCode = $("#barCode" + idNumber); |
|
|
|
if (barCode.length > 0) { |
|
|
|
barCode.empty(); |
|
|
|
@ -661,13 +697,22 @@ |
|
|
|
var parentId = parent.id; |
|
|
|
var codeChildren = parent.childNodes[7]; |
|
|
|
var materialChildren = parent.childNodes[5]; |
|
|
|
var priceChildren = parent.childNodes[11]; |
|
|
|
var codeItem = codeChildren.childNodes[3].childNodes; |
|
|
|
var codeValue = codeItem[1]; |
|
|
|
var codeValue = codeItem[1].childNodes[1]; |
|
|
|
var materialItem = materialChildren.childNodes[3].childNodes[1].childNodes; |
|
|
|
var materialName = materialItem[1]; |
|
|
|
var materialId = materialName.parentNode.parentNode.childNodes[3]; |
|
|
|
// 单价条目 |
|
|
|
var priceItem = priceChildren.childNodes[3].childNodes; |
|
|
|
var priceValue = priceItem[1]; |
|
|
|
var mname = materialName.value; |
|
|
|
mname = mname.split(",")[0]; |
|
|
|
// 条形码条码 |
|
|
|
// 条形码 |
|
|
|
var barCodeChildren = parent.childNodes[9]; |
|
|
|
var barCodeItem = barCodeChildren.childNodes[3]; |
|
|
|
var idNumber = materialId.id.split("mid")[1]; |
|
|
|
layer.open({ |
|
|
|
type: 2, |
|
|
|
title: '弹窗内容', |
|
|
|
@ -679,29 +724,69 @@ |
|
|
|
content: '/getMaterialAll?mname=' + mname + '&type=1&clickObj=' + parentId, |
|
|
|
move: '.layui-layer-title', |
|
|
|
fixed: false, |
|
|
|
success: function(layero, index){ |
|
|
|
success: function (layero, index) { |
|
|
|
var children = layero.children(); |
|
|
|
var content = $(children[1]); |
|
|
|
var iframeChildren = $(content.children()); |
|
|
|
content.css('height','100%'); |
|
|
|
iframeChildren.css('height','100%'); |
|
|
|
content.css('height', '100%'); |
|
|
|
iframeChildren.css('height', '100%'); |
|
|
|
}, |
|
|
|
end: function () { |
|
|
|
var mid = materialId.value; |
|
|
|
$.ajax({ |
|
|
|
url: "/material/findMatrialById?mid=" + mid, |
|
|
|
type: "get", |
|
|
|
dataType: 'json', |
|
|
|
contentType: "application/json;charset=utf-8", |
|
|
|
success: function (d) { |
|
|
|
var material = d.data.materialById; |
|
|
|
var code = material.code; |
|
|
|
if (code === undefined) { |
|
|
|
code = ""; |
|
|
|
if (mid !== '') { |
|
|
|
$.ajax({ |
|
|
|
url: "/material/findMatrialById?mid=" + mid, |
|
|
|
type: "get", |
|
|
|
dataType: 'json', |
|
|
|
contentType: "application/json;charset=utf-8", |
|
|
|
success: function (d) { |
|
|
|
var material = d.data.materialById; |
|
|
|
var code = material.code; |
|
|
|
if (code === undefined) { |
|
|
|
code = ""; |
|
|
|
} |
|
|
|
codeValue.value = code; |
|
|
|
priceValue.value = material.price; |
|
|
|
var materialAndBarCodeList = material["materialAndBarCodeList"]; |
|
|
|
var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; |
|
|
|
var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; |
|
|
|
var idNumber = materialId.name.split("mid")[1]; |
|
|
|
|
|
|
|
if (materialAndBarCodeList.length > 0) { |
|
|
|
// 如果有对应的条形码 |
|
|
|
var id = barCodeInput.id; |
|
|
|
$("#" + id).remove(); |
|
|
|
var barCodeSelect = ` |
|
|
|
<select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `> |
|
|
|
</select>`; |
|
|
|
|
|
|
|
$("#" + barCodeImg.id).before(barCodeSelect); |
|
|
|
form.render(); |
|
|
|
$.each(materialAndBarCodeList, function (index, item) { |
|
|
|
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 |
|
|
|
}); |
|
|
|
form.render(); |
|
|
|
} |
|
|
|
var shelfLife = material.shelfLife; |
|
|
|
if (shelfLife !== null && shelfLife !== undefined) { |
|
|
|
$("#" + "producedDateItem" + idNumber).show(); |
|
|
|
$("#" + "producedDate" + idNumber).attr("lay-verify", "required"); |
|
|
|
} else { |
|
|
|
$("#" + "producedDateItem" + idNumber).hide(); |
|
|
|
form.render(); |
|
|
|
} |
|
|
|
var unit = $("#unit" + idNumber); |
|
|
|
unit.empty(); |
|
|
|
$("#unit" + idNumber).append(new Option(material.unit, "-1")); |
|
|
|
var unitList = material["splitInfoList"]; |
|
|
|
for (let i = 0; i < unitList.length; i++) { |
|
|
|
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); |
|
|
|
} |
|
|
|
form.render(); |
|
|
|
} |
|
|
|
codeValue.value = code; |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
}); |
|
|
|
@ -741,10 +826,28 @@ |
|
|
|
materialName.value = ""; |
|
|
|
return false; |
|
|
|
} else { |
|
|
|
var idNumber = materialId.name.split("mid")[1]; |
|
|
|
var material = d.data[0]; |
|
|
|
materialName.value = material.mname; |
|
|
|
materialId.value = material.id; |
|
|
|
materialId.value = material.mid; |
|
|
|
codeValue.value = material.code; |
|
|
|
var shelfLife = material.shelfLife; |
|
|
|
if (shelfLife !== null && shelfLife !== undefined) { |
|
|
|
$("#" + "producedDateItem" + idNumber).show(); |
|
|
|
$("#" + "producedDate" + idNumber).attr("lay-verify", "required"); |
|
|
|
} else { |
|
|
|
$("#" + "producedDateItem" + idNumber).hide(); |
|
|
|
form.render(); |
|
|
|
} |
|
|
|
var unit = $("#unit" + idNumber); |
|
|
|
unit.empty(); |
|
|
|
$("#unit" + idNumber).append(new Option(material.unit, "-1")); |
|
|
|
var unitList = material["splitInfoList"]; |
|
|
|
for (let i = 0; i < unitList.length; i++) { |
|
|
|
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); |
|
|
|
} |
|
|
|
form.render(); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
@ -773,31 +876,49 @@ |
|
|
|
var codeChildren = parent.childNodes[7]; |
|
|
|
var priceChildren = parent.childNodes[11]; |
|
|
|
var materialChildren = parent.childNodes[5]; |
|
|
|
// 条形码 |
|
|
|
var barCodeChildren = parent.childNodes[9]; |
|
|
|
var codeItem = codeChildren.childNodes[3].childNodes[1]; |
|
|
|
var codeValue = codeItem.childNodes[1]; |
|
|
|
var materialItem = materialChildren.childNodes[3].childNodes[1].childNodes; |
|
|
|
var materialName = materialItem[1]; |
|
|
|
var materialId = materialName.parentNode.parentNode.childNodes[3]; |
|
|
|
var mname = materialName.value; |
|
|
|
// 单价条目 |
|
|
|
var priceItem = priceChildren.childNodes[3].childNodes; |
|
|
|
var priceValue = priceItem[1]; |
|
|
|
// 条形码条码 |
|
|
|
|
|
|
|
// 条形码 |
|
|
|
var barCodeChildren = parent.childNodes[9]; |
|
|
|
var barCodeItem = barCodeChildren.childNodes[3]; |
|
|
|
var code = material.mcode; |
|
|
|
if (code === undefined) { |
|
|
|
code = ""; |
|
|
|
} |
|
|
|
materialName.value = material.mname; |
|
|
|
materialId.value = material.mid; |
|
|
|
codeValue.value = code; |
|
|
|
priceValue.value = material.price; |
|
|
|
var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; |
|
|
|
barCodeInput.value = result; |
|
|
|
form.render(); |
|
|
|
if (material !== null) { |
|
|
|
// 如果发现对应关系 |
|
|
|
// 条形码条码 |
|
|
|
var code = material.mcode; |
|
|
|
if (code === undefined) { |
|
|
|
code = ""; |
|
|
|
} |
|
|
|
materialName.value = material.mname; |
|
|
|
materialId.value = material.mid; |
|
|
|
codeValue.value = code; |
|
|
|
priceValue.value = material.price; |
|
|
|
barCodeInput.value = result; |
|
|
|
var idNumber = materialId.name.split("mid")[1]; |
|
|
|
var shelfLife = material.shelfLife; |
|
|
|
if (shelfLife !== null && shelfLife !== undefined) { |
|
|
|
$("#" + "producedDateItem" + idNumber).show(); |
|
|
|
$("#" + "producedDate" + idNumber).attr("lay-verify", "required"); |
|
|
|
} else { |
|
|
|
$("#" + "producedDateItem" + idNumber).hide(); |
|
|
|
form.render(); |
|
|
|
} |
|
|
|
form.render(); |
|
|
|
var unit = $("#unit" + idNumber); |
|
|
|
unit.empty(); |
|
|
|
$("#unit" + idNumber).append(new Option(material.unit, "-1")); |
|
|
|
var unitList = material["splitInfoList"]; |
|
|
|
for (let i = 0; i < unitList.length; i++) { |
|
|
|
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); |
|
|
|
} |
|
|
|
form.render(); |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
|
|
|
|
@ -810,7 +931,7 @@ |
|
|
|
|
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
}; |
|
|
|
|
|
|
|
// 用于打开仓库树形菜单 |
|
|
|
openDepositoryTree = function (obj) { |
|
|
|
@ -826,15 +947,15 @@ |
|
|
|
move: '.layui-layer-title', |
|
|
|
fixed: false, |
|
|
|
content: '/selectDepositoryByCard?type=1&clickObj=' + parentId, |
|
|
|
success: function(layero, index){ |
|
|
|
success: function (layero, index) { |
|
|
|
var children = layero.children(); |
|
|
|
var content = $(children[1]); |
|
|
|
var iframeChildren = $(content.children()); |
|
|
|
content.css('height','100%'); |
|
|
|
iframeChildren.css('height','100%'); |
|
|
|
content.css('height', '100%'); |
|
|
|
iframeChildren.css('height', '100%'); |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
}; |
|
|
|
|
|
|
|
// 用于扫码入库 |
|
|
|
scanCodeInStorage = function (obj) { |
|
|
|
@ -906,6 +1027,14 @@ |
|
|
|
}); |
|
|
|
form.render(); |
|
|
|
} |
|
|
|
var unit = $("#unit" + idNumber); |
|
|
|
unit.empty(); |
|
|
|
unit.append(new Option(data.unit, "-1")); |
|
|
|
var unitList = data["splitInfoList"]; |
|
|
|
for (let i = 0; i < unitList.length; i++) { |
|
|
|
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); |
|
|
|
} |
|
|
|
form.render(); |
|
|
|
} |
|
|
|
}) |
|
|
|
} |
|
|
|
@ -936,17 +1065,17 @@ |
|
|
|
var depositoryName = parent.childNodes[1]; |
|
|
|
var depositoryId = parent.childNodes[3]; |
|
|
|
var placeId = parent.childNodes[5]; |
|
|
|
if(flag === 0){ |
|
|
|
if (flag === 0) { |
|
|
|
// 如果没有获取到位置 |
|
|
|
layer.msg("当前二维码错误，请重新扫描"); |
|
|
|
}else if(flag === 1){ |
|
|
|
} else if (flag === 1) { |
|
|
|
// 如果获取到的是库位 |
|
|
|
var place = data["place"]; |
|
|
|
placeId.value = place.id; |
|
|
|
depositoryId.value = place.did; |
|
|
|
depositoryName.value = place.depositoryName; |
|
|
|
|
|
|
|
}else if(flag === 2){ |
|
|
|
} else if (flag === 2) { |
|
|
|
// 如果获取到的是仓库 |
|
|
|
var depository = data["depository"]; |
|
|
|
placeId.value = "0"; |
|
|
|
|
