|
|
|
@ -203,14 +203,16 @@ |
|
|
|
class="layui-input" lay-verify="required" |
|
|
|
style="border-style: none"> |
|
|
|
<img src="/static/images/search.ico" height="16" width="16" |
|
|
|
style="margin-top: 10px;display: none" onclick="scanCodeByOut(this)"> |
|
|
|
style="margin-top: 10px;display: none" |
|
|
|
onclick="scanCodeByOut(this)"> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="layui-form-item"> |
|
|
|
<label class="layui-form-label">组合数量:</label> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<input type="number" name="quantity" class="layui-input" id="quantityForGroup" onblur="groupQuantityIsTrue(this)" |
|
|
|
<input type="number" name="quantity" class="layui-input" |
|
|
|
id="quantityForGroup" onblur="groupQuantityIsTrue(this)" |
|
|
|
required lay-verify="number" placeholder="请填写组合数量"/> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
@ -229,7 +231,8 @@ |
|
|
|
<!--提交按钮--> |
|
|
|
<div class="layui-form-item" id="btn_sub2"> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<button class="layui-btn" lay-submit lay-filter="formStep2" type="button" |
|
|
|
<button class="layui-btn" lay-submit lay-filter="formStep2" |
|
|
|
type="button" |
|
|
|
style="margin-bottom: 30px;margin-left: 15%"> |
|
|
|
 提交  |
|
|
|
</button> |
|
|
|
@ -335,6 +338,10 @@ |
|
|
|
// 用于暂存卡片个数 |
|
|
|
var params = []; |
|
|
|
|
|
|
|
// 用于标志当前表单是否第一次提交 |
|
|
|
let flagForForm = false; |
|
|
|
let GroupflagForForm = false; |
|
|
|
|
|
|
|
// 用于暂存卡片个数(组合) |
|
|
|
var params2 = []; |
|
|
|
// 用于卡片编号 |
|
|
|
@ -373,6 +380,8 @@ |
|
|
|
|
|
|
|
// 提交（物料出库） |
|
|
|
form.on('submit(formStep)', function (data) { |
|
|
|
if(!flagForForm){ |
|
|
|
flagForForm = true; |
|
|
|
data = data.field; |
|
|
|
data.params = params; |
|
|
|
if (data.mid === undefined) { |
|
|
|
@ -426,11 +435,14 @@ |
|
|
|
layer.close(this.layerIndex); |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
return false; |
|
|
|
}); |
|
|
|
|
|
|
|
// 提交（组合出库） |
|
|
|
form.on('submit(formStep2)', function (data) { |
|
|
|
if(!GroupflagForForm){ |
|
|
|
GroupflagForForm = true; |
|
|
|
data = data.field; |
|
|
|
data.params = params2; |
|
|
|
if (data.gid === undefined) { |
|
|
|
@ -483,6 +495,9 @@ |
|
|
|
layer.close(this.layerIndex); |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
return false; |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
$('.pre').click(function () { |
|
|
|
@ -554,7 +569,7 @@ |
|
|
|
<div class="layui-form-item"> |
|
|
|
<label class="layui-form-label">计量单位:</label> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<select id=`+"unit"+NewIdNumber+` name=`+"unit"+NewIdNumber+`> |
|
|
|
<select id=` + "unit" + NewIdNumber + ` name=` + "unit" + NewIdNumber + `> |
|
|
|
|
|
|
|
</select> |
|
|
|
</div> |
|
|
|
@ -590,13 +605,13 @@ |
|
|
|
<div class="inputdiv"> |
|
|
|
<input type="text" placeholder="请选择组合" class="layui-input" |
|
|
|
style="border-style: none" |
|
|
|
id=`+"openGroupList"+NewIdNumber+` onblur="selectGroupByName(this)" |
|
|
|
id=` + "openGroupList" + NewIdNumber + ` onblur="selectGroupByName(this)" |
|
|
|
lay-verify="required"/> |
|
|
|
<i class="layui-icon layui-icon-search" |
|
|
|
style="display: inline" |
|
|
|
id=`+"selectGroup"+NewIdNumber+` onclick="selectGroup(this)"></i> |
|
|
|
id=` + "selectGroup" + NewIdNumber + ` onclick="selectGroup(this)"></i> |
|
|
|
</div> |
|
|
|
<input type="text" name=`+"gid"+NewIdNumber+` class="layui-input" id=`+"gid"+NewIdNumber+` |
|
|
|
<input type="text" name=` + "gid" + NewIdNumber + ` class="layui-input" id=` + "gid" + NewIdNumber + ` |
|
|
|
style="display: none" lay-verify="required"/> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
@ -616,14 +631,14 @@ |
|
|
|
<div class="layui-form-item"> |
|
|
|
<label class="layui-form-label">组合数量:</label> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<input type="number" name=`+"quantity"+NewIdNumber+` class="layui-input" id=`+"quantityForGroup"+NewIdNumber+` |
|
|
|
<input type="number" name=` + "quantity" + NewIdNumber + ` class="layui-input" id=` + "quantityForGroup" + NewIdNumber + ` |
|
|
|
required lay-verify="number" onblur="groupQuantityIsTrue(this)" placeholder="请填写组合数量"/> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="layui-form-item"> |
|
|
|
<label class="layui-form-label">备注说明:</label> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<input name=`+"applyRemark"+NewIdNumber+` placeholder="请填写相关原因及申请原因" value="" |
|
|
|
<input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value="" |
|
|
|
class="layui-input"/> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
@ -762,7 +777,7 @@ |
|
|
|
var req = {}; |
|
|
|
req.code = code; |
|
|
|
req.type = "out"; |
|
|
|
if(code !== ""){ |
|
|
|
if (code !== "") { |
|
|
|
$.ajax({ |
|
|
|
url: "/material/findMatrialByCode", |
|
|
|
type: "get", |
|
|
|
@ -843,7 +858,7 @@ |
|
|
|
let gnameItem = gnameParent.childNodes[1].childNodes[1]; |
|
|
|
let req = {}; |
|
|
|
req.code = code; |
|
|
|
if(code !== ""){ |
|
|
|
if (code !== "") { |
|
|
|
$.ajax({ |
|
|
|
url: "/group/findGroupByCode", |
|
|
|
type: "post", |
|
|
|
@ -856,7 +871,7 @@ |
|
|
|
layer.msg(d.statusInfo.detail, { |
|
|
|
icon: 0, |
|
|
|
time: 1500 |
|
|
|
},function () { |
|
|
|
}, function () { |
|
|
|
obj.value = ''; |
|
|
|
gidItem.value = ''; |
|
|
|
gnameItem.value = ''; |
|
|
|
@ -928,9 +943,9 @@ |
|
|
|
}, |
|
|
|
end: function () { |
|
|
|
var mid = materialId.value; |
|
|
|
if(mid !== '') { |
|
|
|
if (mid !== '') { |
|
|
|
$.ajax({ |
|
|
|
url: "/material/findMatrialById?mid=" + mid+"&type=out", |
|
|
|
url: "/material/findMatrialById?mid=" + mid + "&type=out", |
|
|
|
type: "get", |
|
|
|
dataType: 'json', |
|
|
|
contentType: "application/json;charset=utf-8", |
|
|
|
@ -987,7 +1002,7 @@ |
|
|
|
}; |
|
|
|
|
|
|
|
// 用于实现点击搜索按钮（组合） |
|
|
|
selectGroup = function(obj){ |
|
|
|
selectGroup = function (obj) { |
|
|
|
var parent = obj.parentNode.parentNode.parentNode.parentNode; |
|
|
|
var parentId = parent.id; |
|
|
|
|
|
|
|
@ -1025,9 +1040,9 @@ |
|
|
|
content.css('height', '100%'); |
|
|
|
iframeChildren.css('height', '100%'); |
|
|
|
}, |
|
|
|
end:function () { |
|
|
|
end: function () { |
|
|
|
let gid = gidItem.value; |
|
|
|
if(gid !== ''){ |
|
|
|
if (gid !== '') { |
|
|
|
let req = {}; |
|
|
|
req.gid = gid; |
|
|
|
$.ajax({ |
|
|
|
@ -1042,7 +1057,7 @@ |
|
|
|
layer.msg(d.statusInfo.detail, { |
|
|
|
icon: 0, |
|
|
|
time: 1500 |
|
|
|
},function () { |
|
|
|
}, function () { |
|
|
|
obj.value = ''; |
|
|
|
gidItem.value = ''; |
|
|
|
gnameItem.value = ''; |
|
|
|
@ -1078,7 +1093,7 @@ |
|
|
|
}; |
|
|
|
|
|
|
|
// 用于实现组合名称搜索 |
|
|
|
selectGroupByName = function(obj){ |
|
|
|
selectGroupByName = function (obj) { |
|
|
|
let gname = obj.value; |
|
|
|
var parent = obj.parentNode.parentNode.parentNode.parentNode; |
|
|
|
// 获取对应元素 |
|
|
|
@ -1094,7 +1109,7 @@ |
|
|
|
// gid |
|
|
|
let gidItem = gnameParent.childNodes[3]; |
|
|
|
|
|
|
|
if(gname !== ''){ |
|
|
|
if (gname !== '') { |
|
|
|
|
|
|
|
|
|
|
|
var req = {}; |
|
|
|
@ -1106,12 +1121,12 @@ |
|
|
|
data: JSON.stringify(req), |
|
|
|
contentType: "application/json;charset=utf-8", |
|
|
|
success: function (d) { |
|
|
|
if(d.count === -1){ |
|
|
|
if (d.count === -1) { |
|
|
|
// 如果当前组合名称的数量不止一个 |
|
|
|
layer.msg("请点击右侧搜索确定物品", { |
|
|
|
icon: 0, |
|
|
|
time: 1500 |
|
|
|
},function () { |
|
|
|
}, function () { |
|
|
|
obj.value = ''; |
|
|
|
gidItem.value = ''; |
|
|
|
gcodeItem.value = ''; |
|
|
|
@ -1122,12 +1137,12 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}else if(d.count === 0){ |
|
|
|
} else if (d.count === 0) { |
|
|
|
// 如果当前组合名称不存在 |
|
|
|
layer.msg("没有该组合，请确认输入是否正确", { |
|
|
|
icon: 0, |
|
|
|
time: 1500 |
|
|
|
},function () { |
|
|
|
}, function () { |
|
|
|
obj.value = ''; |
|
|
|
gidItem.value = ''; |
|
|
|
gcodeItem.value = ''; |
|
|
|
@ -1138,7 +1153,7 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
// 正常 |
|
|
|
let data = d.data; |
|
|
|
let childNodes = parent.childNodes; |
|
|
|
@ -1160,8 +1175,7 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
} |
|
|
|
else{ |
|
|
|
} else { |
|
|
|
gcodeItem.value = ''; |
|
|
|
gidItem.value = ''; |
|
|
|
let childNodes = parent.childNodes; |
|
|
|
@ -1191,7 +1205,7 @@ |
|
|
|
var barCodeItem = barCodeChildren.childNodes[3]; |
|
|
|
var req = {}; |
|
|
|
data = data.split(",")[0]; |
|
|
|
if(data !== ""){ |
|
|
|
if (data !== "") { |
|
|
|
req.mname = data; |
|
|
|
$.ajax({ |
|
|
|
url: "/material/findInventoryByCondition", |
|
|
|
@ -1218,7 +1232,7 @@ |
|
|
|
unit.empty(); |
|
|
|
$("#unit" + idNumber).append(new Option(material.baseUnit, "-1")); |
|
|
|
var unitList = material["splitInfoList"]; |
|
|
|
if(unitList !== null && unitList != undefined){ |
|
|
|
if (unitList !== null && unitList != undefined) { |
|
|
|
for (let i = 0; i < unitList.length; i++) { |
|
|
|
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); |
|
|
|
} |
|
|
|
@ -1266,10 +1280,9 @@ |
|
|
|
scanBarCode = function (obj) { |
|
|
|
let wxScan = parent; |
|
|
|
|
|
|
|
if(wxScan.wx === undefined){ |
|
|
|
if (wxScan.wx === undefined) { |
|
|
|
wxScan = wxScan.parent.wx; |
|
|
|
} |
|
|
|
else{ |
|
|
|
} else { |
|
|
|
wxScan = wxScan.wx; |
|
|
|
} |
|
|
|
wxScan.scanQRCode({ |
|
|
|
@ -1342,16 +1355,15 @@ |
|
|
|
scanCodeByOut = function (obj) { |
|
|
|
let wxScan = parent; |
|
|
|
|
|
|
|
if(wxScan.wx === undefined){ |
|
|
|
if (wxScan.wx === undefined) { |
|
|
|
wxScan = wxScan.parent.wx; |
|
|
|
} |
|
|
|
else{ |
|
|
|
} else { |
|
|
|
wxScan = wxScan.wx; |
|
|
|
} |
|
|
|
wxScan.scanQRCode({ |
|
|
|
desc: 'scanQRCode desc', |
|
|
|
needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， |
|
|
|
scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 |
|
|
|
scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 |
|
|
|
success: function (res) { |
|
|
|
// 回调 |
|
|
|
var result = res.resultStr;//当needResult为1时返回处理结果 |
|
|
|
@ -1446,7 +1458,7 @@ |
|
|
|
MaterialQuantityIsTrue = function (obj) { |
|
|
|
var id = obj.id.split("quantity")[1]; |
|
|
|
var mcode = $("#code" + id).val(); // 获取到当前输入的物料编码 |
|
|
|
var unit = $("#unit"+id).val(); |
|
|
|
var unit = $("#unit" + id).val(); |
|
|
|
if (mcode === "" || mcode === undefined || mcode === null) { |
|
|
|
layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () { |
|
|
|
$("#quantity" + id).val("") |
|
|
|
@ -1459,6 +1471,7 @@ |
|
|
|
req.quantity = val; |
|
|
|
req.unit = unit; |
|
|
|
req.placeId = -1; |
|
|
|
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); |
|
|
|
$.ajax({ |
|
|
|
url: "/material/MaterialQuantityIsTrue", |
|
|
|
type: "post", |
|
|
|
@ -1470,8 +1483,10 @@ |
|
|
|
if (!flag) { // 如果当前数目不合适 |
|
|
|
layer.msg("当前单个仓库中物料数量不足", {icon: 0, time: 500}, function () { |
|
|
|
$("#quantity" + id).val(""); |
|
|
|
layer.close(loading2); |
|
|
|
}); |
|
|
|
|
|
|
|
} else { |
|
|
|
layer.close(loading2); |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
@ -1503,7 +1518,10 @@ |
|
|
|
|
|
|
|
var flag = res.data; |
|
|
|
if (!flag) { // 如果当前数目不合适 |
|
|
|
layer.msg("当前组合中"+res.statusInfo.message+"的库存数量不足", {icon: 0, time: 1000}, function () { |
|
|
|
layer.msg("当前组合中" + res.statusInfo.message + "的库存数量不足", { |
|
|
|
icon: 0, |
|
|
|
time: 1000 |
|
|
|
}, function () { |
|
|
|
$("#quantityForGroup" + id).val(""); |
|
|
|
}); |
|
|
|
|
|
|
|
|
