|
|
@ -70,7 +70,7 @@ |
|
|
</div> |
|
|
</div> |
|
|
|
|
|
|
|
|
<div class="layui-card" id="cardParent" style="box-shadow:none"> |
|
|
<div class="layui-card" id="cardParent" style="box-shadow:none"> |
|
|
<fieldset class="table-search-fieldset"> |
|
|
<fieldset style="color: rgb(107, 107, 107); border-style: solid; border-color: rgb(230, 230, 230);border-image: initial;" > |
|
|
<legend>组合明细</legend> |
|
|
<legend>组合明细</legend> |
|
|
<div class="layui-card-body" id="cardItem"> |
|
|
<div class="layui-card-body" id="cardItem"> |
|
|
<hr> |
|
|
<hr> |
|
|
@ -353,7 +353,7 @@ |
|
|
// 获取当前高度 |
|
|
// 获取当前高度 |
|
|
var height = parseInt(($("#stepForm").css('height')).split("px")[0]); |
|
|
var height = parseInt(($("#stepForm").css('height')).split("px")[0]); |
|
|
params.push(NewIdNumber); |
|
|
params.push(NewIdNumber); |
|
|
$("#stepForm").css("height", height + 384 + 'px'); |
|
|
$("#stepForm").css("height", height + 339 + 'px'); |
|
|
$("#" + parentId).after(materialItem); |
|
|
$("#" + parentId).after(materialItem); |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
@ -366,7 +366,7 @@ |
|
|
// 获取祖父节点 |
|
|
// 获取祖父节点 |
|
|
var reparent = parent.parentNode; |
|
|
var reparent = parent.parentNode; |
|
|
var height = parseInt(($("#stepForm").css('height')).split("px")[0]); |
|
|
var height = parseInt(($("#stepForm").css('height')).split("px")[0]); |
|
|
$("#stepForm").css("height", height - 384 + 'px'); |
|
|
$("#stepForm").css("height", height - 339 + 'px'); |
|
|
params = remove(params, parentId); |
|
|
params = remove(params, parentId); |
|
|
reparent.removeChild(parent); |
|
|
reparent.removeChild(parent); |
|
|
}; |
|
|
}; |
|
|
@ -667,65 +667,67 @@ |
|
|
var req = {}; |
|
|
var req = {}; |
|
|
req.code = code; |
|
|
req.code = code; |
|
|
req.type = "in"; |
|
|
req.type = "in"; |
|
|
$.ajax({ |
|
|
if(code !== "") { |
|
|
url: "/material/findMatrialByCode", |
|
|
$.ajax({ |
|
|
type: "get", |
|
|
url: "/material/findMatrialByCode", |
|
|
dataType: 'json', |
|
|
type: "get", |
|
|
data: (req), |
|
|
dataType: 'json', |
|
|
contentType: "application/json;charset=utf-8", |
|
|
data: (req), |
|
|
success: function (d) { |
|
|
contentType: "application/json;charset=utf-8", |
|
|
var d = d.data; |
|
|
success: function (d) { |
|
|
if (d == null) { |
|
|
var d = d.data; |
|
|
layer.msg("仓库中暂无该物料"); |
|
|
if (d == null) { |
|
|
materialName.value = ""; |
|
|
layer.msg("仓库中暂无该物料"); |
|
|
materialId.value = ""; |
|
|
materialName.value = ""; |
|
|
obj.value = ""; |
|
|
materialId.value = ""; |
|
|
$('#place' + objId).empty(); |
|
|
obj.value = ""; |
|
|
|
|
|
$('#place' + objId).empty(); |
|
|
|
|
|
|
|
|
} else { |
|
|
} else { |
|
|
materialName.value = d.mname; |
|
|
materialName.value = d.mname; |
|
|
materialId.value = d.mid; |
|
|
materialId.value = d.mid; |
|
|
var idNumber = materialId.name.split("mid")[1]; |
|
|
var idNumber = materialId.name.split("mid")[1]; |
|
|
// 获取物料与条形码的对应关系 |
|
|
// 获取物料与条形码的对应关系 |
|
|
var materialAndBarCodeList = d["materialAndBarCodeList"]; |
|
|
var materialAndBarCodeList = d["materialAndBarCodeList"]; |
|
|
var unit = $("#unit" + idNumber); |
|
|
var unit = $("#unit" + idNumber); |
|
|
unit.empty(); |
|
|
unit.empty(); |
|
|
$("#unit" + idNumber).append(new Option(d.baseUnit, "-1")); |
|
|
$("#unit" + idNumber).append(new Option(d.baseUnit, "-1")); |
|
|
var unitList = d["splitInfoList"]; |
|
|
var unitList = d["splitInfoList"]; |
|
|
for (let i = 0; i < unitList.length; i++) { |
|
|
for (let i = 0; i < unitList.length; i++) { |
|
|
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); |
|
|
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); |
|
|
} |
|
|
|
|
|
form.render(); |
|
|
|
|
|
if (materialAndBarCodeList.length > 0) { |
|
|
|
|
|
// 如果有对应的条形码 |
|
|
|
|
|
var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; |
|
|
|
|
|
var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; |
|
|
|
|
|
var id = barCodeInput.id; |
|
|
|
|
|
$("#" + id).remove(); |
|
|
|
|
|
$("#barCode" + idNumber).empty(); |
|
|
|
|
|
var barCode = $("#barCode" + idNumber); |
|
|
|
|
|
if (barCode.length > 0) { |
|
|
|
|
|
barCode.empty(); |
|
|
|
|
|
} else { |
|
|
|
|
|
var barCodeSelect = ` |
|
|
|
|
|
<select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `> |
|
|
|
|
|
</select>`; |
|
|
|
|
|
$("#" + barCodeImg.id).before(barCodeSelect); |
|
|
|
|
|
} |
|
|
} |
|
|
form.render(); |
|
|
form.render(); |
|
|
$.each(materialAndBarCodeList, function (index, item) { |
|
|
if (materialAndBarCodeList.length > 0) { |
|
|
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 |
|
|
// 如果有对应的条形码 |
|
|
}); |
|
|
var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; |
|
|
form.render(); |
|
|
var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; |
|
|
} else { |
|
|
var id = barCodeInput.id; |
|
|
var barCode = $("#barCode" + idNumber); |
|
|
$("#" + id).remove(); |
|
|
if (barCode.length > 0) { |
|
|
$("#barCode" + idNumber).empty(); |
|
|
barCode.empty(); |
|
|
var barCode = $("#barCode" + idNumber); |
|
|
|
|
|
if (barCode.length > 0) { |
|
|
|
|
|
barCode.empty(); |
|
|
|
|
|
} else { |
|
|
|
|
|
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(); |
|
|
|
|
|
} else { |
|
|
|
|
|
var barCode = $("#barCode" + idNumber); |
|
|
|
|
|
if (barCode.length > 0) { |
|
|
|
|
|
barCode.empty(); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
} |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
//用于实现物料名称搜索 |
|
|
//用于实现物料名称搜索 |
|
|
|
