pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

修改入库功能

lwx_dev
erdanergou 3 years ago
parent
50d7fcf4f6
commit
053c819338
3 changed files with 114 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 157
      src/main/resources/templates/pages/split/split_add.html
  2. 1
      target/classes/templates/pages/application/application-in.html
  3. 30
      target/classes/templates/pages/group/group-add_back.html

157
src/main/resources/templates/pages/split/split_add.html
View File

@ -236,6 +236,7 @@
data = data.split(",")[0]; data = data.split(",")[0];
if(data !== ""){ if(data !== ""){
req.mname = data; req.mname = data;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
let materialId = $("#mid"); let materialId = $("#mid");
let codeValue = $("#code"); let codeValue = $("#code");
let version = $("#version"); let version = $("#version");
@ -249,21 +250,27 @@
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
success: function (d) { success: function (d) {
if (d.count > 1) { if (d.count > 1) {
layer.msg("请点击右侧搜索确定物品"); layer.msg("请点击右侧搜索确定物品",{icon:0,time:500},function () {
materialId.val(""); materialId.val("");
codeValue.val(""); codeValue.val("");
version.val(""); version.val("");
typeName.val(""); typeName.val("");
unit.empty(); unit.empty();
layer.close(loading2);
});
return false; return false;
} else if (d.count === 0) { } else if (d.count === 0) {
layer.msg("没有该物品，请确认输入是否正确"); layer.msg("没有该物品，请确认输入是否正确",{icon:0,time:500},function () {
materialId.val(""); materialId.val("");
codeValue.val(""); codeValue.val("");
materialName.val(""); materialName.val("");
version.val(""); version.val("");
typeName.val(""); typeName.val("");
unit.empty(); unit.empty();
layer.close(loading2);
});
return false; return false;
} else { } else {
var material = d.data[0]; var material = d.data[0];
@ -292,6 +299,7 @@
} else { } else {
$("#barCode").empty(); $("#barCode").empty();
} }
layer.close(loading2);
} }
} }
}); });
@ -323,6 +331,7 @@
end: function () { end: function () {
var mid = $("#mid").val(); var mid = $("#mid").val();
if (mid !== '') { if (mid !== '') {
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({ $.ajax({
url: "/material/findMatrialById?mid=" + mid, url: "/material/findMatrialById?mid=" + mid,
type: "get", type: "get",
@ -349,7 +358,7 @@
if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) { if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) {
// 如果有对应的条形码 // 如果有对应的条形码
$("#barCode").empty() $("#barCode").empty();
$.each(materialAndBarCodeList, function (index, item) { $.each(materialAndBarCodeList, function (index, item) {
$("#barCode").append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 $("#barCode").append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
}); });
@ -358,6 +367,7 @@
$("#barCode").empty(); $("#barCode").empty();
} }
layer.close(loading2);
} }
}); });
} }
@ -385,6 +395,8 @@
var req = {}; var req = {};
req.qrCode = result; req.qrCode = result;
req.codeFlag = 2; req.codeFlag = 2;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({ $.ajax({
url: "/material/qywxApplicationInScanQrCode", url: "/material/qywxApplicationInScanQrCode",
type: "post", type: "post",
@ -406,6 +418,7 @@
$("#version").val(""); $("#version").val("");
$("#barCode").empty(); $("#barCode").empty();
$("#unit").empty(); $("#unit").empty();
layer.close(loading2);
}) })
} else { } else {
// 如果有对应关系 // 如果有对应关系
@ -441,6 +454,7 @@
unit.append(new Option(unitList[i].newUnit, unitList[i].newUnit)); unit.append(new Option(unitList[i].newUnit, unitList[i].newUnit));
} }
form.render(); form.render();
layer.close(loading2);
} }
} }
@ -470,6 +484,7 @@
let barCode = $("#barCode"); let barCode = $("#barCode");
barCode.empty(); barCode.empty();
barCode.append(new Option(result, result)); barCode.append(new Option(result, result));
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({ $.ajax({
url: "/material/qywxApplicationInScanBarCode", url: "/material/qywxApplicationInScanBarCode",
type: "post", type: "post",
@ -494,7 +509,7 @@
}); });
} }
form.render(); form.render();
layer.close(loading2);
} }
else { else {
@ -509,6 +524,7 @@
$("#version").val(""); $("#version").val("");
unit.empty(); unit.empty();
$("#barCode").empty(); $("#barCode").empty();
layer.close(loading2);
}) })
} }
@ -533,64 +549,71 @@
var req = {}; var req = {};
req.code = code; req.code = code;
req.type = "in"; req.type = "in";
$.ajax({ if(code !== ""){
url: "/material/findMatrialByCode", let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
type: "get", $.ajax({
dataType: 'json', url: "/material/findMatrialByCode",
data: req, type: "get",
contentType: "application/json;charset=utf-8", dataType: 'json',
success: function (d) { data: req,
var d = d.data; contentType: "application/json;charset=utf-8",
if (d == null) { success: function (d) {
layer.msg("没有该编码，请确认是否输入正确"); var d = d.data;
$("#mname").val(""); if (d == null) {
$("#mid").val(""); layer.msg("没有该编码，请确认是否输入正确",{icon:0,time:500},function () {
$("#code").val(""); $("#mname").val("");
$("#barCode").val(""); $("#mid").val("");
$("#version").val(""); $("#code").val("");
$("#unit").empty(); $("#barCode").val("");
$("#typeName").val(""); $("#version").val("");
form.render(); $("#unit").empty();
$("#typeName").val("");
} else { form.render();
$("#mname").val(d.mname); layer.close(loading2);
$("#mid").val(d.mid); });
$("#version").val(d.version);
$("#unit").empty();
$('#unit').append(new Option(d.unit, d.unit));
var splitInfoList = d["splitInfoList"];
$.each(splitInfoList, function (index, item) {
$("#unit").append(new Option(item.newUnit, item.newUnit));//往下拉菜单里添加元素
});
form.render();
$("#typeName").val(d.typeName);
// 获取物料与条形码的对应关系
var materialAndBarCodeList = d["materialAndBarCodeList"];
if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) {
// 如果有对应的条形码
$("#barCode").remove();
$(".layui-unselect").remove();
var barCodeSelect = `
<select id="barCode" name="barCode">
</select>`;
$("#barCodeImg").before(barCodeSelect);
form.render();
$.each(materialAndBarCodeList, function (index, item) { } else {
$("#barCode").append(new Option(item.bmcode, item.bmcode));//往下拉菜单里添加元素 $("#mname").val(d.mname);
$("#mid").val(d.mid);
$("#version").val(d.version);
$("#unit").empty();
$('#unit').append(new Option(d.unit, d.unit));
var splitInfoList = d["splitInfoList"];
$.each(splitInfoList, function (index, item) {
$("#unit").append(new Option(item.newUnit, item.newUnit));//往下拉菜单里添加元素
}); });
form.render(); form.render();
} else { $("#typeName").val(d.typeName);
let children = $("#barCode").parent().children(); // 获取物料与条形码的对应关系
if (children.length > 2) { var materialAndBarCodeList = d["materialAndBarCodeList"];
$("#barCode").empty(); if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) {
$(children[1]).empty(); // 如果有对应的条形码
$("#barCode").remove();
$(".layui-unselect").remove();
var barCodeSelect = `
<select id="barCode" name="barCode">
</select>`;
$("#barCodeImg").before(barCodeSelect);
form.render();
$.each(materialAndBarCodeList, function (index, item) {
$("#barCode").append(new Option(item.bmcode, item.bmcode));//往下拉菜单里添加元素
});
form.render();
} else {
let children = $("#barCode").parent().children();
if (children.length > 2) {
$("#barCode").empty();
$(children[1]).empty();
}
} }
layer.close(loading2);
} }
} }
} });
});
}
}; };

1
target/classes/templates/pages/application/application-in.html
View File

@ -1550,7 +1550,6 @@
childNodes[i].remove() childNodes[i].remove()
} }
} }
layer.close(loading2)
} }
}; };

30
target/classes/templates/pages/group/group-add_back.html
View File

@ -413,6 +413,7 @@
var req = {}; var req = {};
req.qrCode = result; req.qrCode = result;
req.codeFlag = 1; req.codeFlag = 1;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({ $.ajax({
url: "/material/qywxApplicationInScanBarCode", url: "/material/qywxApplicationInScanBarCode",
type: "post", type: "post",
@ -454,12 +455,14 @@
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
} }
form.render(); form.render();
layer.close(loading2);
} else { } else {
// 如果没有对应关系 // 如果没有对应关系
layer.msg("对于编码：" + result + ",并未发现对应的物料", { layer.msg("对于编码：" + result + ",并未发现对应的物料", {
icon: 0, icon: 0,
time: 1000 //0.5秒关闭（如果不配置，默认是3秒） time: 1000 //0.5秒关闭（如果不配置，默认是3秒）
}, function () { }, function () {
layer.close(loading2);
}) })
} }
@ -490,6 +493,7 @@
var req = {}; var req = {};
req.qrCode = result; req.qrCode = result;
req.codeFlag = 2; req.codeFlag = 2;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({ $.ajax({
url: "/material/qywxApplicationInScanQrCode", url: "/material/qywxApplicationInScanQrCode",
type: "post", type: "post",
@ -558,6 +562,7 @@
materialName.value = data.mname; materialName.value = data.mname;
materialId.value = data.mid; materialId.value = data.mid;
materialCode.value = data.code; materialCode.value = data.code;
layer.close(loading2);
} }
}) })
} }
@ -601,6 +606,7 @@
}, },
end: function () { end: function () {
var mid = materialId.value; var mid = materialId.value;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
if (mid !== '') { if (mid !== '') {
$.ajax({ $.ajax({
url: "/material/findMatrialById?mid=" + mid, url: "/material/findMatrialById?mid=" + mid,
@ -652,6 +658,7 @@
} }
} }
form.render(); form.render();
layer.close(loading2);
} }
}); });
} }
@ -678,6 +685,7 @@
req.code = code; req.code = code;
req.type = "in"; req.type = "in";
if (code !== "") { if (code !== "") {
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({ $.ajax({
url: "/material/findMatrialByCode", url: "/material/findMatrialByCode",
type: "get", type: "get",
@ -687,11 +695,13 @@
success: function (d) { success: function (d) {
var d = d.data; var d = d.data;
if (d == null) { if (d == null) {
layer.msg("仓库中暂无该物料"); layer.msg("仓库中暂无该物料",{icon:0,time:500},function () {
layer.close(loading2);
materialName.value = ""; materialName.value = "";
materialId.value = ""; materialId.value = "";
obj.value = ""; obj.value = "";
$('#place' + objId).empty(); $('#place' + objId).empty();
});
} else { } else {
materialName.value = d.mname; materialName.value = d.mname;
@ -734,6 +744,7 @@
barCode.empty(); barCode.empty();
} }
} }
layer.close(loading2);
} }
} }
}); });
@ -759,6 +770,7 @@
data = data.split(",")[0]; data = data.split(",")[0];
if (data !== "") { if (data !== "") {
req.mname = data; req.mname = data;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({ $.ajax({
url: "/material/findMaterialByCondition", url: "/material/findMaterialByCondition",
type: "post", type: "post",
@ -767,15 +779,20 @@
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
success: function (d) { success: function (d) {
if (d.count > 1) { if (d.count > 1) {
layer.msg("请点击右侧搜索确定物品"); layer.msg("请点击右侧搜索确定物品",{icon:0,time:500},function () {
materialId.value = ""; materialId.value = "";
codeValue.value = ""; codeValue.value = "";
layer.close(loading2);
});
return false; return false;
} else if (d.count === 0) { } else if (d.count === 0) {
layer.msg("没有该物品，请确认输入是否正确"); layer.msg("没有该物品，请确认输入是否正确",{icon:5,time:500},function () {
materialId.value = ""; materialId.value = "";
codeValue.value = ""; codeValue.value = "";
materialName.value = ""; materialName.value = "";
layer.close(loading2);
});
return false; return false;
} else { } else {
var idNumber = materialId.name.split("mid")[1]; var idNumber = materialId.name.split("mid")[1];
@ -821,6 +838,7 @@
materialName.value = material.mname; materialName.value = material.mname;
materialId.value = material.id; materialId.value = material.id;
codeValue.value = material.code; codeValue.value = material.code;
layer.close(loading2);
} }
} }
}); });

Write Preview
Loading…
Cancel
Save