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
22d56691ae
commit
d41dd16590
9 changed files with 502 additions and 467 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. 85
      src/main/resources/templates/pages/application/application-in.html
  2. 86
      src/main/resources/templates/pages/application/application-in_scanQrCode.html
  3. 124
      src/main/resources/templates/pages/application/application-out.html
  4. 136
      src/main/resources/templates/pages/application/application-transfer.html
  5. 58
      src/main/resources/templates/pages/application/application-transfer_back.html
  6. 124
      src/main/resources/templates/pages/group/group-add_back.html
  7. 116
      src/main/resources/templates/pages/split/split_add.html
  8. 84
      src/main/resources/templates/pages/split/split_edit.html
  9. 156
      src/main/resources/templates/pages/stockTaking/stockTaking.html

85
src/main/resources/templates/pages/application/application-in.html
View File

@ -904,51 +904,54 @@
var materialId = materialName.parentNode.parentNode.childNodes[3]; var materialId = materialName.parentNode.parentNode.childNodes[3];
var req = {}; var req = {};
data = data.split(",")[0]; data = data.split(",")[0];
req.mname = data; if(data !== ""){
$.ajax({ req.mname = data;
url: "/material/findMaterialByCondition", $.ajax({
type: "post", url: "/material/findMaterialByCondition",
dataType: 'json', type: "post",
data: JSON.stringify(req), dataType: 'json',
contentType: "application/json;charset=utf-8", data: JSON.stringify(req),
success: function (d) { contentType: "application/json;charset=utf-8",
if (d.count > 1) { success: function (d) {
layer.msg("请点击右侧搜索确定物品"); if (d.count > 1) {
materialId.value = ""; layer.msg("请点击右侧搜索确定物品");
codeValue.value = ""; materialId.value = "";
return false; codeValue.value = "";
} else if (d.count === 0) { return false;
layer.msg("没有该物品，请确认输入是否正确"); } else if (d.count === 0) {
materialId.value = ""; layer.msg("没有该物品，请确认输入是否正确");
codeValue.value = ""; materialId.value = "";
materialName.value = ""; codeValue.value = "";
return false; materialName.value = "";
} else { return false;
var idNumber = materialId.name.split("mid")[1];
var material = d.data[0];
materialName.value = material.mname;
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 { } else {
$("#" + "producedDateItem" + idNumber).hide(); var idNumber = materialId.name.split("mid")[1];
var material = d.data[0];
materialName.value = material.mname;
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(); 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();
}
} }
} });
}); }
}; };
// 用于扫码入库 // 用于扫码入库
scanCodeInStorage = function (obj) { scanCodeInStorage = function (obj) {

86
src/main/resources/templates/pages/application/application-in_scanQrCode.html
View File

@ -806,51 +806,55 @@
var materialName = materialItem[1]; var materialName = materialItem[1];
var materialId = materialName.parentNode.parentNode.childNodes[3]; var materialId = materialName.parentNode.parentNode.childNodes[3];
var req = {}; var req = {};
req.mname = data; data = data.split(",")[0];
$.ajax({ if(data !== ""){
url: "/material/findMaterialByCondition", req.mname = data;
type: "post", $.ajax({
dataType: 'json', url: "/material/findMaterialByCondition",
data: JSON.stringify(req), type: "post",
contentType: "application/json;charset=utf-8", dataType: 'json',
success: function (d) { data: JSON.stringify(req),
if (d.count > 1) { contentType: "application/json;charset=utf-8",
layer.msg("请点击右侧搜索确定物品"); success: function (d) {
materialId.value = ""; if (d.count > 1) {
codeValue.value = ""; layer.msg("请点击右侧搜索确定物品");
return false; materialId.value = "";
} else if (d.count === 0) { codeValue.value = "";
layer.msg("没有该物品，请确认输入是否正确"); return false;
materialId.value = ""; } else if (d.count === 0) {
codeValue.value = ""; layer.msg("没有该物品，请确认输入是否正确");
materialName.value = ""; materialId.value = "";
return false; codeValue.value = "";
} else { materialName.value = "";
var idNumber = materialId.name.split("mid")[1]; return false;
var material = d.data[0];
materialName.value = material.mname;
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 { } else {
$("#" + "producedDateItem" + idNumber).hide(); var idNumber = materialId.name.split("mid")[1];
var material = d.data[0];
materialName.value = material.mname;
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(); 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();
}
} }
} });
}); }
}; };
scanBarCode = function (obj) { scanBarCode = function (obj) {

124
src/main/resources/templates/pages/application/application-out.html
View File

@ -1184,72 +1184,76 @@
// 条形码条码 // 条形码条码
var barCodeItem = barCodeChildren.childNodes[3]; var barCodeItem = barCodeChildren.childNodes[3];
var req = {}; var req = {};
req.mname = data; data = data.split(",")[0];
$.ajax({ if(data !== ""){
url: "/material/findInventoryByCondition", req.mname = data;
type: "post", $.ajax({
dataType: 'json', url: "/material/findInventoryByCondition",
data: JSON.stringify(req), type: "post",
contentType: "application/json;charset=utf-8", dataType: 'json',
success: function (d) { data: JSON.stringify(req),
if (d.count > 1) { contentType: "application/json;charset=utf-8",
layer.msg("请点击右侧搜索确定物品"); success: function (d) {
materialId.value = ""; if (d.count > 1) {
codeValue.value = ""; layer.msg("请点击右侧搜索确定物品");
return false; materialId.value = "";
} else if (d.count === 0) { codeValue.value = "";
layer.msg("没有该物品，请确认输入是否正确"); return false;
materialId.value = ""; } else if (d.count === 0) {
codeValue.value = ""; layer.msg("没有该物品，请确认输入是否正确");
materialName.value = ""; materialId.value = "";
return false; codeValue.value = "";
} else { materialName.value = "";
var idNumber = materialId.name.split("mid")[1]; return false;
var material = d.data[0]; } else {
var unit = $("#unit" + idNumber); var idNumber = materialId.name.split("mid")[1];
unit.empty(); var material = d.data[0];
$("#unit" + idNumber).append(new Option(material.unit, "-1")); var unit = $("#unit" + idNumber);
var unitList = material["splitInfoList"]; unit.empty();
if(unitList !== null && unitList != undefined){ $("#unit" + idNumber).append(new Option(material.unit, "-1"));
for (let i = 0; i < unitList.length; i++) { var unitList = material["splitInfoList"];
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); if(unitList !== null && unitList != undefined){
for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
} }
form.render(); var materialAndBarCodeList = material["materialAndBarCodeList"];
} if (materialAndBarCodeList.length > 0) {
var materialAndBarCodeList = material["materialAndBarCodeList"]; // 如果有对应的条形码
if (materialAndBarCodeList.length > 0) { var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
// 如果有对应的条形码 var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; var id = barCodeInput.id;
var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; $("#" + id).remove();
var id = barCodeInput.id; $("#barCode" + idNumber).empty();
$("#" + id).remove(); var barCode = $("#barCode" + idNumber);
$("#barCode" + idNumber).empty(); if (barCode.length > 0) {
var barCode = $("#barCode" + idNumber); barCode.empty();
if (barCode.length > 0) { } else {
barCode.empty(); var barCodeSelect = `
} else {
var barCodeSelect = `
<select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `> <select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
</select>`; </select>`;
$("#" + barCodeImg.id).before(barCodeSelect); $("#" + barCodeImg.id).before(barCodeSelect);
} }
form.render(); form.render();
$.each(materialAndBarCodeList, function (index, item) { $.each(materialAndBarCodeList, function (index, item) {
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
}); });
form.render(); form.render();
} else { } else {
var barCode = $("#barCode" + idNumber); var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) { if (barCode.length > 0) {
barCode.empty(); barCode.empty();
}
} }
materialName.value = material.mname;
materialId.value = material.id;
codeValue.value = material.code;
} }
materialName.value = material.mname;
materialId.value = material.id;
codeValue.value = material.code;
} }
} });
}); }
}; };
// 扫描物料条码 // 扫描物料条码

136
src/main/resources/templates/pages/application/application-transfer.html
View File

@ -801,80 +801,84 @@
// 条形码条码 // 条形码条码
var barCodeItem = barCodeChildren.childNodes[3]; var barCodeItem = barCodeChildren.childNodes[3];
var req = {}; var req = {};
req.mname = data; data = data.split(",")[0];
$.ajax({ if(data !== ""){
url: "/material/findInventoryByCondition", req.mname = data;
type: "post", $.ajax({
dataType: 'json', url: "/material/findInventoryByCondition",
data:JSON.stringify(req), type: "post",
contentType: "application/json;charset=utf-8", dataType: 'json',
success: function (d) { data:JSON.stringify(req),
if(d.count > 1){ contentType: "application/json;charset=utf-8",
layer.msg("请点击右侧搜索确定物品"); success: function (d) {
materialId.value = ""; if(d.count > 1){
codeValue.value = ""; layer.msg("请点击右侧搜索确定物品");
return false; materialId.value = "";
}else if(d.count === 0){ codeValue.value = "";
layer.msg("没有该物品，请确认输入是否正确"); return false;
materialId.value = ""; }else if(d.count === 0){
codeValue.value = ""; layer.msg("没有该物品，请确认输入是否正确");
materialName.value = ""; materialId.value = "";
return false; codeValue.value = "";
} materialName.value = "";
else{ return false;
var idNumber = materialId.name.split("mid")[1];
var material = d.data[0];
var unit = $("#unit" + idNumber);
unit.empty();
$("#unit" + idNumber).append(new Option(material.unit, "-1"));
var unitList = material["splitInfoList"];
if(unitList !== null && unitList != undefined){
for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
} }
var materialAndBarCodeList = material["materialAndBarCodeList"]; else{
if (materialAndBarCodeList.length > 0) { var idNumber = materialId.name.split("mid")[1];
// 如果有对应的条形码 var material = d.data[0];
var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; var unit = $("#unit" + idNumber);
var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; unit.empty();
var id = barCodeInput.id; $("#unit" + idNumber).append(new Option(material.unit, "-1"));
$("#" + id).remove(); var unitList = material["splitInfoList"];
$("#barCode" + idNumber).empty(); if(unitList !== null && unitList != undefined){
var barCode = $("#barCode" + idNumber); for (let i = 0; i < unitList.length; i++) {
if (barCode.length > 0) { $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
barCode.empty(); }
} else { form.render();
var barCodeSelect = ` }
var materialAndBarCodeList = material["materialAndBarCodeList"];
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 id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
</select>`; </select>`;
$("#" + barCodeImg.id).before(barCodeSelect); $("#" + barCodeImg.id).before(barCodeSelect);
}
form.render();
$.each(materialAndBarCodeList, function (index, item) {
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
});
form.render();
} }
form.render(); else {
$.each(materialAndBarCodeList, function (index, item) { var barCode = $("#barCode" + idNumber);
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 if (barCode.length > 0) {
barCode.empty();
}
}
$('#place' + idNumber).empty();
$.each(material.placePList, function (index, item) {
$('#place' + idNumber).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
}); });
form.render(); form.render();
materialName.value = material.mname;
materialId.value = material.id;
codeValue.value = material.code;
} }
else {
var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) {
barCode.empty();
}
}
$('#place' + idNumber).empty();
$.each(material.placePList, function (index, item) {
$('#place' + idNumber).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
});
form.render();
materialName.value = material.mname;
materialId.value = material.id;
codeValue.value = material.code;
} }
} });
}); }
}; };
// 用于打开仓库树形菜单 // 用于打开仓库树形菜单

58
src/main/resources/templates/pages/application/application-transfer_back.html
View File

@ -439,34 +439,38 @@
var materialName = materialItem[1]; var materialName = materialItem[1];
var materialId = materialName.parentNode.parentNode.childNodes[3]; var materialId = materialName.parentNode.parentNode.childNodes[3];
var req = {}; var req = {};
req.mname = data; data = data.split(",")[0];
$.ajax({ if(data !== ""){
url: "/material/findMaterialByCondition", req.mname = data;
type: "post", $.ajax({
dataType: 'json', url: "/material/findMaterialByCondition",
data:JSON.stringify(req), type: "post",
contentType: "application/json;charset=utf-8", dataType: 'json',
success: function (d) { data:JSON.stringify(req),
if(d.count > 1){ contentType: "application/json;charset=utf-8",
layer.msg("请点击右侧搜索确定物品"); success: function (d) {
materialId.value = ""; if(d.count > 1){
codeValue.value = ""; layer.msg("请点击右侧搜索确定物品");
return false; materialId.value = "";
}else if(d.count === 0){ codeValue.value = "";
layer.msg("没有该物品，请确认输入是否正确"); return false;
materialId.value = ""; }else if(d.count === 0){
codeValue.value = ""; layer.msg("没有该物品，请确认输入是否正确");
materialName.value = ""; materialId.value = "";
return false; codeValue.value = "";
} materialName.value = "";
else{ return false;
var material = d.data[0]; }
materialName.value = material.mname; else{
materialId.value = material.id; var material = d.data[0];
codeValue.value = material.code; materialName.value = material.mname;
materialId.value = material.id;
codeValue.value = material.code;
}
} }
} });
}); }
}; };
// 用于打开仓库树形菜单 // 用于打开仓库树形菜单

124
src/main/resources/templates/pages/group/group-add_back.html
View File

@ -727,72 +727,76 @@
// 条形码条码 // 条形码条码
var barCodeItem = barCodeChildren.childNodes[3]; var barCodeItem = barCodeChildren.childNodes[3];
var req = {}; var req = {};
req.mname = data; data = data.split(",")[0];
$.ajax({ if(data !== ""){
url: "/material/findMaterialByCondition", req.mname = data;
type: "post", $.ajax({
dataType: 'json', url: "/material/findMaterialByCondition",
data: JSON.stringify(req), type: "post",
contentType: "application/json;charset=utf-8", dataType: 'json',
success: function (d) { data: JSON.stringify(req),
if (d.count > 1) { contentType: "application/json;charset=utf-8",
layer.msg("请点击右侧搜索确定物品"); success: function (d) {
materialId.value = ""; if (d.count > 1) {
codeValue.value = ""; layer.msg("请点击右侧搜索确定物品");
return false; materialId.value = "";
} else if (d.count === 0) { codeValue.value = "";
layer.msg("没有该物品，请确认输入是否正确"); return false;
materialId.value = ""; } else if (d.count === 0) {
codeValue.value = ""; layer.msg("没有该物品，请确认输入是否正确");
materialName.value = ""; materialId.value = "";
return false; codeValue.value = "";
} else { materialName.value = "";
var idNumber = materialId.name.split("mid")[1]; return false;
var material = d.data[0]; } else {
var unit = $("#unit" + idNumber); var idNumber = materialId.name.split("mid")[1];
unit.empty(); var material = d.data[0];
$("#unit" + idNumber).append(new Option(material.unit, "-1")); var unit = $("#unit" + idNumber);
var unitList = material["splitInfoList"]; unit.empty();
if (unitList !== null && unitList != undefined) { $("#unit" + idNumber).append(new Option(material.unit, "-1"));
for (let i = 0; i < unitList.length; i++) { var unitList = material["splitInfoList"];
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); if (unitList !== null && unitList != undefined) {
for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
} }
form.render(); var materialAndBarCodeList = material["materialAndBarCodeList"];
} if (materialAndBarCodeList.length > 0) {
var materialAndBarCodeList = material["materialAndBarCodeList"]; // 如果有对应的条形码
if (materialAndBarCodeList.length > 0) { var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
// 如果有对应的条形码 var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; var id = barCodeInput.id;
var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; $("#" + id).remove();
var id = barCodeInput.id; $("#barCode" + idNumber).empty();
$("#" + id).remove(); var barCode = $("#barCode" + idNumber);
$("#barCode" + idNumber).empty(); if (barCode.length > 0) {
var barCode = $("#barCode" + idNumber); barCode.empty();
if (barCode.length > 0) { } else {
barCode.empty(); var barCodeSelect = `
} else {
var barCodeSelect = `
<select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `> <select id=` + "barCode" + idNumber + ` name=` + "barCode" + idNumber + `>
</select>`; </select>`;
$("#" + barCodeImg.id).before(barCodeSelect); $("#" + barCodeImg.id).before(barCodeSelect);
} }
form.render(); form.render();
$.each(materialAndBarCodeList, function (index, item) { $.each(materialAndBarCodeList, function (index, item) {
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
}); });
form.render(); form.render();
} else { } else {
var barCode = $("#barCode" + idNumber); var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) { if (barCode.length > 0) {
barCode.empty(); barCode.empty();
}
} }
materialName.value = material.mname;
materialId.value = material.id;
codeValue.value = material.code;
} }
materialName.value = material.mname;
materialId.value = material.id;
codeValue.value = material.code;
} }
} });
}); }
}; };

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

@ -226,66 +226,70 @@
let materialName = $("#mname"); let materialName = $("#mname");
var data = materialName.val().split(",")[0]; var data = materialName.val().split(",")[0];
var req = {}; var req = {};
req.mname = data; data = data.split(",")[0];
let materialId = $("#mid"); if(data !== ""){
let codeValue = $("#code"); req.mname = data;
let version = $("#version"); let materialId = $("#mid");
let typeName = $("#typeName"); let codeValue = $("#code");
let unit = $("#unit"); let version = $("#version");
$.ajax({ let typeName = $("#typeName");
url: "/material/findMaterialByCondition", let unit = $("#unit");
type: "post", $.ajax({
dataType: 'json', url: "/material/findMaterialByCondition",
data: JSON.stringify(req), type: "post",
contentType: "application/json;charset=utf-8", dataType: 'json',
success: function (d) { data: JSON.stringify(req),
if (d.count > 1) { contentType: "application/json;charset=utf-8",
layer.msg("请点击右侧搜索确定物品"); success: function (d) {
materialId.val(""); if (d.count > 1) {
codeValue.val(""); layer.msg("请点击右侧搜索确定物品");
version.val(""); materialId.val("");
typeName.val(""); codeValue.val("");
unit.empty(); version.val("");
return false; typeName.val("");
} else if (d.count === 0) { unit.empty();
layer.msg("没有该物品，请确认输入是否正确"); return false;
materialId.val(""); } else if (d.count === 0) {
codeValue.val(""); layer.msg("没有该物品，请确认输入是否正确");
materialName.val(""); materialId.val("");
version.val(""); codeValue.val("");
typeName.val(""); materialName.val("");
unit.empty(); version.val("");
return false; typeName.val("");
} else { unit.empty();
var material = d.data[0]; return false;
materialName.val(material.mname); } else {
materialId.val(material.mid); var material = d.data[0];
codeValue.val(material.code); materialName.val(material.mname);
version.val(material.version); materialId.val(material.mid);
typeName.val(material.typeName); codeValue.val(material.code);
unit.empty(); version.val(material.version);
unit.append(new Option(material.unit, material.unit)); typeName.val(material.typeName);
var splitInfoList = material["splitInfoList"]; unit.empty();
$.each(splitInfoList, function (index, item) { unit.append(new Option(material.unit, material.unit));
$("#unit").append(new Option(item.newUnit, item.newUnit));//往下拉菜单里添加元素 var splitInfoList = material["splitInfoList"];
}); $.each(splitInfoList, function (index, item) {
form.render(); $("#unit").append(new Option(item.newUnit, item.newUnit));//往下拉菜单里添加元素
var materialAndBarCodeList = material["materialAndBarCodeList"];
if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) {
// 如果有对应的条形码
$("#barCode").empty();
$.each(materialAndBarCodeList, function (index, item) {
$("#barCode").append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
}); });
form.render(); form.render();
} else {
$("#barCode").empty(); var materialAndBarCodeList = material["materialAndBarCodeList"];
if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) {
// 如果有对应的条形码
$("#barCode").empty();
$.each(materialAndBarCodeList, function (index, item) {
$("#barCode").append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
});
form.render();
} else {
$("#barCode").empty();
}
} }
} }
} });
}); }
}; };
// 打开物料选择树 // 打开物料选择树

84
src/main/resources/templates/pages/split/split_edit.html
View File

@ -223,47 +223,51 @@
let materialName = $("#mname"); let materialName = $("#mname");
var data = materialName.val(); var data = materialName.val();
var req = {}; var req = {};
req.mname = data; data = data.split(",")[0];
let materialId = $("#mid"); if(data !== ""){
let codeValue = $("#code"); req.mname = data;
let version = $("#version"); let materialId = $("#mid");
let typeName = $("#typeName"); let codeValue = $("#code");
let unit = $("#unit"); let version = $("#version");
$.ajax({ let typeName = $("#typeName");
url: "/material/findMaterialByCondition", let unit = $("#unit");
type: "post", $.ajax({
dataType: 'json', url: "/material/findMaterialByCondition",
data: JSON.stringify(req), type: "post",
contentType: "application/json;charset=utf-8", dataType: 'json',
success: function (d) { data: JSON.stringify(req),
if (d.count > 1) { contentType: "application/json;charset=utf-8",
layer.msg("请点击右侧搜索确定物品"); success: function (d) {
materialId.val(""); if (d.count > 1) {
codeValue.val(""); layer.msg("请点击右侧搜索确定物品");
version.val(""); materialId.val("");
typeName.val(""); codeValue.val("");
unit.val(""); version.val("");
return false; typeName.val("");
} else if (d.count === 0) { unit.val("");
layer.msg("没有该物品，请确认输入是否正确"); return false;
materialId.val(""); } else if (d.count === 0) {
codeValue.val(""); layer.msg("没有该物品，请确认输入是否正确");
materialName.val(""); materialId.val("");
version.val(""); codeValue.val("");
typeName.val(""); materialName.val("");
unit.val(""); version.val("");
return false; typeName.val("");
} else { unit.val("");
var material = d.data[0]; return false;
materialName.val(material.mname); } else {
materialId.val(material.mid); var material = d.data[0];
codeValue.val(material.code); materialName.val(material.mname);
version.val(material.version); materialId.val(material.mid);
typeName.val(material.typeName); codeValue.val(material.code);
unit.val(material.unit); version.val(material.version);
typeName.val(material.typeName);
unit.val(material.unit);
}
} }
} });
}); }
}; };
// 打开物料选择树 // 打开物料选择树

156
src/main/resources/templates/pages/stockTaking/stockTaking.html
View File

@ -1000,86 +1000,90 @@
var barCodeItem = barCodeChildren.childNodes[3]; var barCodeItem = barCodeChildren.childNodes[3];
var req = {}; var req = {};
req.mname = data; data = data.split(",")[0];
req.depositoryId = depositoryId; if(data !== ""){
req.placeId = placeId; req.mname = data;
$.ajax({ req.depositoryId = depositoryId;
url: "/material/findMaterialForTaking", req.placeId = placeId;
type: "post", $.ajax({
dataType: 'json', url: "/material/findMaterialForTaking",
data: JSON.stringify(req), type: "post",
contentType: "application/json;charset=utf-8", dataType: 'json',
success: function (d) { data: JSON.stringify(req),
if (d.count > 1) { contentType: "application/json;charset=utf-8",
layer.msg("请点击右侧搜索确定物品"); success: function (d) {
materialId.value = ""; if (d.count > 1) {
codeValue.value = ""; layer.msg("请点击右侧搜索确定物品");
textureChildren.childNodes[3].childNodes[1].value = ""; materialId.value = "";
versionChildren.childNodes[3].childNodes[1].value = ""; codeValue.value = "";
unitChildren.childNodes[3].childNodes[1].value = ""; textureChildren.childNodes[3].childNodes[1].value = "";
inventoryChildren.childNodes[3].childNodes[1].value = ""; versionChildren.childNodes[3].childNodes[1].value = "";
return false; unitChildren.childNodes[3].childNodes[1].value = "";
} else if (d.count === 0) { inventoryChildren.childNodes[3].childNodes[1].value = "";
layer.msg("没有该物品，请确认输入是否正确"); return false;
materialId.value = ""; } else if (d.count === 0) {
codeValue.value = ""; layer.msg("没有该物品，请确认输入是否正确");
materialName.value = ""; materialId.value = "";
materialTypeItem[1].value = ''; codeValue.value = "";
materialTypeItem[3].value = ""; materialName.value = "";
textureChildren.childNodes[3].childNodes[1].value = ""; materialTypeItem[1].value = '';
versionChildren.childNodes[3].childNodes[1].value = ""; materialTypeItem[3].value = "";
unitChildren.childNodes[3].childNodes[1].value = ""; textureChildren.childNodes[3].childNodes[1].value = "";
inventoryChildren.childNodes[3].childNodes[1].value = ""; versionChildren.childNodes[3].childNodes[1].value = "";
return false; unitChildren.childNodes[3].childNodes[1].value = "";
} else { inventoryChildren.childNodes[3].childNodes[1].value = "";
var material = d.data; return false;
materialName.value = material.mname; } else {
materialId.value = material.id; var material = d.data;
codeValue.value = material.code; materialName.value = material.mname;
materialTypeItem[1].value = material.typeName; materialId.value = material.id;
materialTypeItem[3].value = material.typeId; codeValue.value = material.code;
textureChildren.childNodes[3].childNodes[1].value = material.texture === null || material.texture === undefined ? '' : material.texture; materialTypeItem[1].value = material.typeName;
versionChildren.childNodes[3].childNodes[1].value = material.version === null || material.version === undefined ? '' : material.version; materialTypeItem[3].value = material.typeId;
inventoryChildren.childNodes[3].childNodes[1].value = material.quantity; textureChildren.childNodes[3].childNodes[1].value = material.texture === null || material.texture === undefined ? '' : material.texture;
var idNumber = materialId.name.split("mid")[1]; versionChildren.childNodes[3].childNodes[1].value = material.version === null || material.version === undefined ? '' : material.version;
// 获取物料与条形码的对应关系 inventoryChildren.childNodes[3].childNodes[1].value = material.quantity;
var materialAndBarCodeList = material["materialAndBarCodeList"]; var idNumber = materialId.name.split("mid")[1];
if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) { // 获取物料与条形码的对应关系
var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; var materialAndBarCodeList = material["materialAndBarCodeList"];
var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) {
var id = barCodeInput.id; var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
form.render(); var barCodeImg = barCodeItem.childNodes[1].childNodes[3];
$.each(materialAndBarCodeList, function (index, item) { var id = barCodeInput.id;
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 form.render();
}); $.each(materialAndBarCodeList, function (index, item) {
form.render(); $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
} });
let unitItem = $("#unit" + idNumber); form.render();
unitItem.empty(); }
unitItem.append(new Option(material.unit, "-1")); let unitItem = $("#unit" + idNumber);
let splitInfoList = material.splitInfoList; unitItem.empty();
if (splitInfoList.length > 0) { unitItem.append(new Option(material.unit, "-1"));
$.each(splitInfoList, function (index, item) { let splitInfoList = material.splitInfoList;
unitItem.append(new Option(item.newUnit, item.newUnit)); if (splitInfoList.length > 0) {
}) $.each(splitInfoList, function (index, item) {
} unitItem.append(new Option(item.newUnit, item.newUnit));
var shelfLife = d.shelfLife;
if (shelfLife !== null && shelfLife !== undefined) {
$("#" + "producedDateItem" + idNumber).show();
var producedDateList = d['producedDateList'];
if (producedDateList !== null && producedDateList !== undefined && producedDateList.length > 0) {
$.each(producedDateList, function (index, item) {
$("#" + "producedDate" + idNumber).append(new Option(item, item));
}) })
} }
form.render(); var shelfLife = d.shelfLife;
} else { if (shelfLife !== null && shelfLife !== undefined) {
$("#" + "producedDateItem" + idNumber).hide(); $("#" + "producedDateItem" + idNumber).show();
form.render(); var producedDateList = d['producedDateList'];
if (producedDateList !== null && producedDateList !== undefined && producedDateList.length > 0) {
$.each(producedDateList, function (index, item) {
$("#" + "producedDate" + idNumber).append(new Option(item, item));
})
}
form.render();
} else {
$("#" + "producedDateItem" + idNumber).hide();
form.render();
}
} }
} }
} });
}); }
} else { } else {
layer.msg("请先选择盘点位置或负责人", { layer.msg("请先选择盘点位置或负责人", {
icon: 0, icon: 0,

Write Preview
Loading…
Cancel
Save