diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java index 68efe7b8..4d6954cd 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java @@ -765,6 +765,9 @@ public class MaterialController { int codeFlag = ObjectFormatUtil.toInteger(map.get("codeFlag")); // 根据扫描的二维码获取对应的物料编码 String mcode = materialService.findMaterialCodeByQrCode(qrCode); + if(mcode == null){ + return new RestResponse(null); + } // 根据物料编码获取物料 Material material = materialService.findMaterialByCode(mcode); if (material != null) { @@ -802,7 +805,8 @@ public class MaterialController { mp.setSplitInfoList(splitInfoByMid); return new RestResponse(mp); } - } else { + } + else { return new RestResponse(null); } @@ -819,13 +823,17 @@ public class MaterialController { String qrCode = (String) map.get("qrCode"); // 根据扫描的二维码获取对应的物料编码 String mcode = materialService.findMaterialCodeByQrCode(qrCode); + InventoryP mp = null; + if(mcode == null){ + return new RestResponse(mp); + } // 根据物料编码获取物料 Material material = materialService.findMaterialByCode(mcode); Map param = new HashMap<>(); List placePList = new ArrayList<>(); param.put("mcode", mcode); param.put("codeFlag", 1); - InventoryP mp = null; + // 获取物料与条形码的对应关系 List materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param); Boolean flag = false; @@ -866,18 +874,23 @@ public class MaterialController { String qrCode = (String) map.get("qrCode"); // 根据扫描的二维码获取对应的物料编码 String mcode = materialService.findMaterialCodeByQrCode(qrCode); + + InventoryP mp = null; + + if(mcode == null){ + return new RestResponse(mp); + } // 根据物料编码获取物料 Material material = materialService.findMaterialByCode(mcode); Map param = new HashMap<>(); List placePList = new ArrayList<>(); param.put("mcode", mcode); param.put("codeFlag", 1); - InventoryP mp = null; + // 获取物料与条形码的对应关系 List materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param); - Boolean flag = false; - for (int j = 0; j < depositoryByAdminorg.size(); j++) { - Depository depository = depositoryByAdminorg.get(j); + boolean flag = false; + for (Depository depository : depositoryByAdminorg) { param.put("mcode", material.getCode()); param.put("depositoryId", depository.getId()); // 获取当前仓库下是否有当前物料的库存 @@ -976,6 +989,9 @@ public class MaterialController { String qrCode = (String) map.get("qrCode"); // 根据扫描的二维码获取对应的物料编码 String mcode = materialService.findMaterialCodeByQrCode(qrCode); + if(mcode == null){ + return new RestResponse(null); + } // 根据物料编码获取物料 Material material = materialService.findMaterialByCode(mcode); // 用于标识是否成功获取 diff --git a/src/main/resources/templates/pages/application/application-in.html b/src/main/resources/templates/pages/application/application-in.html index 1db4de84..9c8dcea7 100644 --- a/src/main/resources/templates/pages/application/application-in.html +++ b/src/main/resources/templates/pages/application/application-in.html @@ -1500,7 +1500,7 @@ parent.wx.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 + scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 success: function (res) { // 回调 var result = res.resultStr;//当needResult为1时返回处理结果 diff --git a/src/main/resources/templates/pages/application/application-in_scanQrCode.html b/src/main/resources/templates/pages/application/application-in_scanQrCode.html index 9b25cc1b..6a6504cb 100644 --- a/src/main/resources/templates/pages/application/application-in_scanQrCode.html +++ b/src/main/resources/templates/pages/application/application-in_scanQrCode.html @@ -919,6 +919,13 @@ } form.render(); } + else{ + layer.msg("对于编码：" + result + ",并未发现对应的物料", { + icon: 0, + time: 1000 //0.5秒关闭（如果不配置，默认是3秒） + }, function () { + }) + } } }) @@ -962,7 +969,7 @@ parent.parent.wx.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 + scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 success: function (res) { // 回调 var result = res.resultStr;//当needResult为1时返回处理结果 @@ -994,47 +1001,57 @@ var priceValue = priceItem[1]; // 条形码条码 var barCodeItem = barCodeChildren.childNodes[3]; - var code = data.code; - if (code === undefined) { - code = ""; - } - materialName.value = data.mname; - materialId.value = data.id; - codeValue.value = code; - priceValue.value = data.price; - var materialAndBarCodeList = data["materialAndBarCodeList"]; - var idNumber = materialId.name.split("mid")[1]; - 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 = ` + if (data === null) { + // 如果没有对应关系 + layer.msg("对于编码：" + result + ",并未发现对应的物料", { + icon: 0, + time: 1000 //0.5秒关闭（如果不配置，默认是3秒） + }, function () { + }) + } else { + + var code = data.code; + if (code === undefined) { + code = ""; + } + materialName.value = data.mname; + materialId.value = data.id; + codeValue.value = code; + priceValue.value = data.price; + var materialAndBarCodeList = data["materialAndBarCodeList"]; + var idNumber = materialId.name.split("mid")[1]; + 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 = ` `; - $("#" + barCodeImg.id).before(barCodeSelect); - } - form.render(); + $("#" + barCodeImg.id).before(barCodeSelect); + } + form.render(); - $.each(materialAndBarCodeList, function (index, item) { - $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 - }); + $.each(materialAndBarCodeList, function (index, item) { + $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + }); + 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(); } - 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(); } }) } @@ -1046,7 +1063,7 @@ parent.parent.wx.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 + scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 success: function (res) { // 回调 var result = res.resultStr;//当needResult为1时返回处理结果 @@ -1067,7 +1084,10 @@ var placeId = parent.childNodes[5]; if (flag === 0) { // 如果没有获取到位置 - layer.msg("当前二维码错误，请重新扫描"); + layer.msg("并未查询到对应位置，请重新扫描",{ + icon:0, + time:1000 + }); } else if (flag === 1) { // 如果获取到的是库位 var place = data["place"]; diff --git a/src/main/resources/templates/pages/application/application-out.html b/src/main/resources/templates/pages/application/application-out.html index 45f3c558..1f1c6fb4 100644 --- a/src/main/resources/templates/pages/application/application-out.html +++ b/src/main/resources/templates/pages/application/application-out.html @@ -1307,7 +1307,7 @@ form.render(); } else { // 如果没有对应关系 - layer.msg("对于编码：" + result + ",并未发现对应的物料", { + layer.msg("对于编码：" + result + ",并未发现仓库中存在对应的物料", { icon: 0, time: 1000 //0.5秒关闭（如果不配置，默认是3秒） }, function () { @@ -1340,66 +1340,76 @@ contentType: "application/json;charset=utf-8", success: function (d) { var data = d.data; - // 获取对应元素 - var parent = obj.parentNode.parentNode.parentNode.parentNode; - var MaterialChildren = parent.childNodes[5]; - var materialItem = MaterialChildren.childNodes[3].childNodes[1].childNodes; + if (data === null) { + layer.msg("对于编码：" + result + ",并未发现仓库中存在对应的物料", { + icon: 0, + time: 1000 //0.5秒关闭（如果不配置，默认是3秒） + }, function () { + }) + } else { + // 获取对应元素 + var parent = obj.parentNode.parentNode.parentNode.parentNode; + var MaterialChildren = parent.childNodes[5]; + var materialItem = MaterialChildren.childNodes[3].childNodes[1].childNodes; - var barCodeChildren = parent.childNodes[9]; + var barCodeChildren = parent.childNodes[9]; - var materialName = materialItem[1]; - var materialId = materialName.parentNode.parentNode.childNodes[3]; - // 条形码条码 - var barCodeItem = barCodeChildren.childNodes[3]; - // 物料编码 - var materialCodeItem = parent.childNodes[7].childNodes[3].childNodes[1].childNodes; + var materialName = materialItem[1]; + var materialId = materialName.parentNode.parentNode.childNodes[3]; + // 条形码条码 + var barCodeItem = barCodeChildren.childNodes[3]; + // 物料编码 + var materialCodeItem = parent.childNodes[7].childNodes[3].childNodes[1].childNodes; - var materialCode = materialCodeItem[1]; + var materialCode = materialCodeItem[1]; - var idNumber = materialId.name.split("mid")[1]; - // 获取物料与条形码的对应关系 - var materialAndBarCodeList = data["materialAndBarCodeList"]; - var barCode = $("#barCode" + idNumber); - if (barCode.length > 0) { - barCode.empty(); - } + var idNumber = materialId.name.split("mid")[1]; - 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 materialAndBarCodeList = data["materialAndBarCodeList"]; var barCode = $("#barCode" + idNumber); if (barCode.length > 0) { barCode.empty(); - } else { - var barCodeSelect = ` + } + + 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 = ` `; - $("#" + barCodeImg.id).before(barCodeSelect); - } - form.render(); + $("#" + barCodeImg.id).before(barCodeSelect); + } + form.render(); - $.each(materialAndBarCodeList, function (index, item) { - $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + $.each(materialAndBarCodeList, function (index, item) { + $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + }); + form.render(); + } + $('#place' + idNumber).empty(); + $.each(data.placePList, function (index, item) { + $('#place' + idNumber).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素 + }); + $("#unit" + idNumber).empty(); + $("#unit" + idNumber).append(new Option(data.unit, "-1")); + $.each(data.splitInfoList, function (index, item) { + $("#unit" + idNumber).append(new Option(item.newUnit, item.newUnit)); }); form.render(); + materialName.value = data.mname; + materialId.value = data.id; + materialCode.value = data.code; } - $('#place' + idNumber).empty(); - $.each(data.placePList, function (index, item) { - $('#place' + idNumber).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素 - }); - $("#unit"+idNumber).empty(); - $("#unit"+idNumber).append(new Option(data.unit,"-1")); - $.each(data.splitInfoList,function (index,item) { - $("#unit"+idNumber).append(new Option(item.newUnit,item.newUnit)); - }); - form.render(); - materialName.value = data.mname; - materialId.value = data.id; - materialCode.value = data.code; } }) } diff --git a/src/main/resources/templates/pages/application/application-transfer.html b/src/main/resources/templates/pages/application/application-transfer.html index ff666880..7deba19e 100644 --- a/src/main/resources/templates/pages/application/application-transfer.html +++ b/src/main/resources/templates/pages/application/application-transfer.html @@ -502,7 +502,7 @@ parent.wx.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 + scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 success: function (res) { // 回调 var result = res.resultStr;//当needResult为1时返回处理结果 @@ -517,62 +517,73 @@ contentType: "application/json;charset=utf-8", success: function (d) { var data = d.data; - // 获取对应元素 - var parent = obj.parentNode.parentNode.parentNode.parentNode; - var barCodeChildren = parent.childNodes[9]; - var children = parent.childNodes[5]; - var materialItem = children.childNodes[3].childNodes[1]; - var materialName = materialItem.childNodes[1]; - var materialId = materialName.parentNode.parentNode.childNodes[3]; - // 条形码条码 - var barCodeItem = barCodeChildren.childNodes[3]; - // 物料编码 - var materialCodeItem = parent.childNodes[7].childNodes[3].childNodes[1]; - var materialCode = materialCodeItem.childNodes[1]; - var idNumber = materialId.name.split("mid")[1]; - // 获取物料与条形码的对应关系 - var materialAndBarCodeList = data["materialAndBarCodeList"]; - var barCode = $("#barCode" + idNumber); - if (barCode.length > 0) { - barCode.empty(); - } - $("#unit"+idNumber).empty(); - $("#unit"+idNumber).append(new Option(data.unit,"-1")); - $.each(data.splitInfoList,function (index,item) { - $("#unit"+idNumber).append(new Option(item.newUnit,item.newUnit)); - }); - 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(); + if (data === null) { + layer.msg("对于编码：" + result + ",并未在仓库中发现对应的物料", { + icon: 0, + time: 1000 //0.5秒关闭（如果不配置，默认是3秒） + }, function () { + }) + } else { + + + // 获取对应元素 + var parent = obj.parentNode.parentNode.parentNode.parentNode; + var barCodeChildren = parent.childNodes[9]; + var children = parent.childNodes[5]; + var materialItem = children.childNodes[3].childNodes[1]; + var materialName = materialItem.childNodes[1]; + var materialId = materialName.parentNode.parentNode.childNodes[3]; + // 条形码条码 + var barCodeItem = barCodeChildren.childNodes[3]; + // 物料编码 + var materialCodeItem = parent.childNodes[7].childNodes[3].childNodes[1]; + + var materialCode = materialCodeItem.childNodes[1]; + var idNumber = materialId.name.split("mid")[1]; + // 获取物料与条形码的对应关系 + var materialAndBarCodeList = data["materialAndBarCodeList"]; var barCode = $("#barCode" + idNumber); if (barCode.length > 0) { barCode.empty(); - } else { - var barCodeSelect = ` + } + $("#unit" + idNumber).empty(); + $("#unit" + idNumber).append(new Option(data.unit, "-1")); + $.each(data.splitInfoList, function (index, item) { + $("#unit" + idNumber).append(new Option(item.newUnit, item.newUnit)); + }); + 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 = ` `; - $("#" + barCodeImg.id).before(barCodeSelect); - } - form.render(); + $("#" + barCodeImg.id).before(barCodeSelect); + } + form.render(); - $.each(materialAndBarCodeList, function (index, item) { - $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + $.each(materialAndBarCodeList, function (index, item) { + $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + }); + form.render(); + } + $('#place' + idNumber).empty(); + $.each(data.placePList, function (index, item) { + $('#place' + idNumber).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素 }); form.render(); + materialName.value = data.mname; + materialId.value = data.id; + materialCode.value = data.code; } - $('#place' + idNumber).empty(); - $.each(data.placePList, function (index, item) { - $('#place' + idNumber).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素 - }); - form.render(); - materialName.value = data.mname; - materialId.value = data.id; - materialCode.value = data.code; } }) } @@ -894,7 +905,7 @@ parent.wx.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 + scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 success: function (res) { // 回调 var result = res.resultStr;//当needResult为1时返回处理结果 diff --git a/src/main/resources/templates/pages/stockTaking/stockTaking.html b/src/main/resources/templates/pages/stockTaking/stockTaking.html index 0b053491..7d609f2a 100644 --- a/src/main/resources/templates/pages/stockTaking/stockTaking.html +++ b/src/main/resources/templates/pages/stockTaking/stockTaking.html @@ -82,16 +82,17 @@
- - - -
+ + + +
@@ -354,23 +355,22 @@ let tagData = []; let tempData = $("#departmentManager").val().split(","); $.each(tempData, function (index, item) { - if(item !== ""){ + if (item !== "") { tagData.push(item) } }); $("#departmentManager").val(""); - - let tagLabel= inputTag.render({ + let tagLabel = inputTag.render({ elem: '#departmentManager', data: tagData,//初始值 removeKeyNum: 8,//删除按键编号 默认，BackSpace 键 createKeyNum: 13,//创建按键编号 默认，Enter 键 - onChange: function (data, value, type,index) { - if(type === "remove"){ + onChange: function (data, value, type, index) { + if (type === "remove") { let split = departmentManagerId.split(","); - split.splice(index,1); + split.splice(index, 1); departmentManagerId = split.toString(); $("#departmentManagerId").val(departmentManagerId); } @@ -647,7 +647,7 @@ parent.wx.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 + scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 success: function (res) { // 回调 var result = res.resultStr;//当needResult为1时返回处理结果 @@ -665,7 +665,10 @@ var flag = data["flag"]; if (flag === 0) { // 如果没有获取到位置 - layer.msg("当前二维码错误，请重新扫描"); + layer.msg("并未查询到对应位置，请重新扫描", { + icon: 0, + time: 1000 + }); } else if (flag === 1) { // 如果获取到的是库位 var place = data["place"]; @@ -1247,90 +1250,99 @@ contentType: "application/json;charset=utf-8", success: function (d) { var data = d.data; - var parent = obj.parentNode.parentNode.parentNode.parentNode; - var parentId = parent.id; - // 物料编码父级 - var codeChildren = parent.childNodes[7]; - // 物料名称父级 - var materialChildren = parent.childNodes[5]; - - // 物料类型父级 - var typeChildren = parent.childNodes[11]; - // 材质父级 - var textureChildren = parent.childNodes[13]; - // 规格型号父级 - var versionChildren = parent.childNodes[15]; - // 计量单位父级 - var unitChildren = parent.childNodes[17]; - // 库存数量父级 - var inventoryChildren = parent.childNodes[21]; - - // 条形码父级 - var barCodeChildren = parent.childNodes[9]; - // 编码条目 - var codeItem = codeChildren.childNodes[3].childNodes[1]; - // 具体条码 - var codeValue = codeItem.childNodes[1]; - - // 物料条目 - var materialItem = materialChildren.childNodes[3].childNodes; - // 物料名称 - var materialName = materialItem[1].childNodes[1]; - // 物料编码 - var materialId = materialItem[3]; - // 物料种类条目 - var materialTypeItem = typeChildren.childNodes[3].childNodes; - - // 条形码条目 - var barCodeItem = barCodeChildren.childNodes[3]; - - materialName.value = data.mname; - materialId.value = data.id; - - materialTypeItem[1].value = data.typeName; - materialTypeItem[3].value = data.typeId; - codeValue.value = data.code; - textureChildren.childNodes[3].childNodes[1].value = data.texture === null || data.texture === undefined ? '' : data.texture; - versionChildren.childNodes[3].childNodes[1].value = data.version === null || data.version === undefined ? '' : data.version; - unitChildren.childNodes[3].childNodes[1].value = data.unit === null || data.unit === undefined ? '' : data.unit; - inventoryChildren.childNodes[3].childNodes[1].value = data.quantity; - // 获取物料与条形码的对应关系 - var materialAndBarCodeList = data["materialAndBarCodeList"]; - var idNumber = materialId.name.split("mid")[1]; - $("#barCode" + idNumber).empty(); - if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) { - var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; - var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; - var id = barCodeInput.id; - form.render(); - $.each(materialAndBarCodeList, function (index, item) { - $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 - }); - form.render(); - } - var unitItem = $("#unit" + idNumber); - unitItem.empty(); - unitItem.append(new Option(data.unit, "-1")); - let splitInfoList = data.splitInfoList; - if (splitInfoList.length > 0) { - $.each(splitInfoList, function (index, item) { - unitItem.append(new Option(item.newUnit, item.newUnit)); + if (data == null) { + layer.msg("对于编码：" + result + ",并未发现对应的物料", { + icon: 0, + time: 1000 //0.5秒关闭（如果不配置，默认是3秒） + }, function () { }) - } - form.render(); - var shelfLife = data.shelfLife; - if (shelfLife !== null && shelfLife !== undefined) { - $("#" + "producedDateItem" + idNumber).show(); - var producedDateList = data['producedDateList']; - if (producedDateList !== null && producedDateList !== undefined && producedDateList.length > 0) { - $.each(producedDateList, function (index, item) { - $("#" + "producedDate" + idNumber).append(new Option(item, item)); + } else { + + var parent = obj.parentNode.parentNode.parentNode.parentNode; + var parentId = parent.id; + // 物料编码父级 + var codeChildren = parent.childNodes[7]; + // 物料名称父级 + var materialChildren = parent.childNodes[5]; + + // 物料类型父级 + var typeChildren = parent.childNodes[11]; + // 材质父级 + var textureChildren = parent.childNodes[13]; + // 规格型号父级 + var versionChildren = parent.childNodes[15]; + // 计量单位父级 + var unitChildren = parent.childNodes[17]; + // 库存数量父级 + var inventoryChildren = parent.childNodes[21]; + + // 条形码父级 + var barCodeChildren = parent.childNodes[9]; + // 编码条目 + var codeItem = codeChildren.childNodes[3].childNodes[1]; + // 具体条码 + var codeValue = codeItem.childNodes[1]; + + // 物料条目 + var materialItem = materialChildren.childNodes[3].childNodes; + // 物料名称 + var materialName = materialItem[1].childNodes[1]; + // 物料编码 + var materialId = materialItem[3]; + // 物料种类条目 + var materialTypeItem = typeChildren.childNodes[3].childNodes; + + // 条形码条目 + var barCodeItem = barCodeChildren.childNodes[3]; + + materialName.value = data.mname; + materialId.value = data.id; + + materialTypeItem[1].value = data.typeName; + materialTypeItem[3].value = data.typeId; + codeValue.value = data.code; + textureChildren.childNodes[3].childNodes[1].value = data.texture === null || data.texture === undefined ? '' : data.texture; + versionChildren.childNodes[3].childNodes[1].value = data.version === null || data.version === undefined ? '' : data.version; + unitChildren.childNodes[3].childNodes[1].value = data.unit === null || data.unit === undefined ? '' : data.unit; + inventoryChildren.childNodes[3].childNodes[1].value = data.quantity; + // 获取物料与条形码的对应关系 + var materialAndBarCodeList = data["materialAndBarCodeList"]; + var idNumber = materialId.name.split("mid")[1]; + $("#barCode" + idNumber).empty(); + if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) { + var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; + var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; + var id = barCodeInput.id; + form.render(); + $.each(materialAndBarCodeList, function (index, item) { + $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + }); + form.render(); + } + var unitItem = $("#unit" + idNumber); + unitItem.empty(); + unitItem.append(new Option(data.unit, "-1")); + let splitInfoList = data.splitInfoList; + if (splitInfoList.length > 0) { + $.each(splitInfoList, function (index, item) { + unitItem.append(new Option(item.newUnit, item.newUnit)); }) } form.render(); - } else { - $("#" + "producedDateItem" + idNumber).hide(); - form.render(); + var shelfLife = data.shelfLife; + if (shelfLife !== null && shelfLife !== undefined) { + $("#" + "producedDateItem" + idNumber).show(); + var producedDateList = data['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(); + } } } }) diff --git a/target/classes/templates/pages/application/application-in_scanQrCode.html b/target/classes/templates/pages/application/application-in_scanQrCode.html index 9b25cc1b..b9f99193 100644 --- a/target/classes/templates/pages/application/application-in_scanQrCode.html +++ b/target/classes/templates/pages/application/application-in_scanQrCode.html @@ -919,6 +919,13 @@ } form.render(); } + else{ + layer.msg("对于编码：" + result + ",并未发现对应的物料", { + icon: 0, + time: 1000 //0.5秒关闭（如果不配置，默认是3秒） + }, function () { + }) + } } }) @@ -962,7 +969,7 @@ parent.parent.wx.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 + scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 success: function (res) { // 回调 var result = res.resultStr;//当needResult为1时返回处理结果 @@ -994,47 +1001,57 @@ var priceValue = priceItem[1]; // 条形码条码 var barCodeItem = barCodeChildren.childNodes[3]; - var code = data.code; - if (code === undefined) { - code = ""; - } - materialName.value = data.mname; - materialId.value = data.id; - codeValue.value = code; - priceValue.value = data.price; - var materialAndBarCodeList = data["materialAndBarCodeList"]; - var idNumber = materialId.name.split("mid")[1]; - 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 = ` + if (data === null) { + // 如果没有对应关系 + layer.msg("对于编码：" + result + ",并未发现对应的物料", { + icon: 0, + time: 1000 //0.5秒关闭（如果不配置，默认是3秒） + }, function () { + }) + } else { + + var code = data.code; + if (code === undefined) { + code = ""; + } + materialName.value = data.mname; + materialId.value = data.id; + codeValue.value = code; + priceValue.value = data.price; + var materialAndBarCodeList = data["materialAndBarCodeList"]; + var idNumber = materialId.name.split("mid")[1]; + 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 = ` `; - $("#" + barCodeImg.id).before(barCodeSelect); - } - form.render(); + $("#" + barCodeImg.id).before(barCodeSelect); + } + form.render(); - $.each(materialAndBarCodeList, function (index, item) { - $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 - }); + $.each(materialAndBarCodeList, function (index, item) { + $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + }); + 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(); } - 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(); } }) } @@ -1067,7 +1084,10 @@ var placeId = parent.childNodes[5]; if (flag === 0) { // 如果没有获取到位置 - layer.msg("当前二维码错误，请重新扫描"); + layer.msg("并未查询到对应位置，请重新扫描",{ + icon:0, + time:1000 + }); } else if (flag === 1) { // 如果获取到的是库位 var place = data["place"]; diff --git a/target/classes/templates/pages/application/application-out.html b/target/classes/templates/pages/application/application-out.html index 45f3c558..1f1c6fb4 100644 --- a/target/classes/templates/pages/application/application-out.html +++ b/target/classes/templates/pages/application/application-out.html @@ -1307,7 +1307,7 @@ form.render(); } else { // 如果没有对应关系 - layer.msg("对于编码：" + result + ",并未发现对应的物料", { + layer.msg("对于编码：" + result + ",并未发现仓库中存在对应的物料", { icon: 0, time: 1000 //0.5秒关闭（如果不配置，默认是3秒） }, function () { @@ -1340,66 +1340,76 @@ contentType: "application/json;charset=utf-8", success: function (d) { var data = d.data; - // 获取对应元素 - var parent = obj.parentNode.parentNode.parentNode.parentNode; - var MaterialChildren = parent.childNodes[5]; - var materialItem = MaterialChildren.childNodes[3].childNodes[1].childNodes; + if (data === null) { + layer.msg("对于编码：" + result + ",并未发现仓库中存在对应的物料", { + icon: 0, + time: 1000 //0.5秒关闭（如果不配置，默认是3秒） + }, function () { + }) + } else { + // 获取对应元素 + var parent = obj.parentNode.parentNode.parentNode.parentNode; + var MaterialChildren = parent.childNodes[5]; + var materialItem = MaterialChildren.childNodes[3].childNodes[1].childNodes; - var barCodeChildren = parent.childNodes[9]; + var barCodeChildren = parent.childNodes[9]; - var materialName = materialItem[1]; - var materialId = materialName.parentNode.parentNode.childNodes[3]; - // 条形码条码 - var barCodeItem = barCodeChildren.childNodes[3]; - // 物料编码 - var materialCodeItem = parent.childNodes[7].childNodes[3].childNodes[1].childNodes; + var materialName = materialItem[1]; + var materialId = materialName.parentNode.parentNode.childNodes[3]; + // 条形码条码 + var barCodeItem = barCodeChildren.childNodes[3]; + // 物料编码 + var materialCodeItem = parent.childNodes[7].childNodes[3].childNodes[1].childNodes; - var materialCode = materialCodeItem[1]; + var materialCode = materialCodeItem[1]; - var idNumber = materialId.name.split("mid")[1]; - // 获取物料与条形码的对应关系 - var materialAndBarCodeList = data["materialAndBarCodeList"]; - var barCode = $("#barCode" + idNumber); - if (barCode.length > 0) { - barCode.empty(); - } + var idNumber = materialId.name.split("mid")[1]; - 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 materialAndBarCodeList = data["materialAndBarCodeList"]; var barCode = $("#barCode" + idNumber); if (barCode.length > 0) { barCode.empty(); - } else { - var barCodeSelect = ` + } + + 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 = ` `; - $("#" + barCodeImg.id).before(barCodeSelect); - } - form.render(); + $("#" + barCodeImg.id).before(barCodeSelect); + } + form.render(); - $.each(materialAndBarCodeList, function (index, item) { - $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + $.each(materialAndBarCodeList, function (index, item) { + $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + }); + form.render(); + } + $('#place' + idNumber).empty(); + $.each(data.placePList, function (index, item) { + $('#place' + idNumber).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素 + }); + $("#unit" + idNumber).empty(); + $("#unit" + idNumber).append(new Option(data.unit, "-1")); + $.each(data.splitInfoList, function (index, item) { + $("#unit" + idNumber).append(new Option(item.newUnit, item.newUnit)); }); form.render(); + materialName.value = data.mname; + materialId.value = data.id; + materialCode.value = data.code; } - $('#place' + idNumber).empty(); - $.each(data.placePList, function (index, item) { - $('#place' + idNumber).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素 - }); - $("#unit"+idNumber).empty(); - $("#unit"+idNumber).append(new Option(data.unit,"-1")); - $.each(data.splitInfoList,function (index,item) { - $("#unit"+idNumber).append(new Option(item.newUnit,item.newUnit)); - }); - form.render(); - materialName.value = data.mname; - materialId.value = data.id; - materialCode.value = data.code; } }) } diff --git a/target/classes/templates/pages/application/application-transfer.html b/target/classes/templates/pages/application/application-transfer.html index ff666880..88f04f2f 100644 --- a/target/classes/templates/pages/application/application-transfer.html +++ b/target/classes/templates/pages/application/application-transfer.html @@ -517,62 +517,73 @@ contentType: "application/json;charset=utf-8", success: function (d) { var data = d.data; - // 获取对应元素 - var parent = obj.parentNode.parentNode.parentNode.parentNode; - var barCodeChildren = parent.childNodes[9]; - var children = parent.childNodes[5]; - var materialItem = children.childNodes[3].childNodes[1]; - var materialName = materialItem.childNodes[1]; - var materialId = materialName.parentNode.parentNode.childNodes[3]; - // 条形码条码 - var barCodeItem = barCodeChildren.childNodes[3]; - // 物料编码 - var materialCodeItem = parent.childNodes[7].childNodes[3].childNodes[1]; - var materialCode = materialCodeItem.childNodes[1]; - var idNumber = materialId.name.split("mid")[1]; - // 获取物料与条形码的对应关系 - var materialAndBarCodeList = data["materialAndBarCodeList"]; - var barCode = $("#barCode" + idNumber); - if (barCode.length > 0) { - barCode.empty(); - } - $("#unit"+idNumber).empty(); - $("#unit"+idNumber).append(new Option(data.unit,"-1")); - $.each(data.splitInfoList,function (index,item) { - $("#unit"+idNumber).append(new Option(item.newUnit,item.newUnit)); - }); - 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(); + if (data === null) { + layer.msg("对于编码：" + result + ",并未在仓库中发现对应的物料", { + icon: 0, + time: 1000 //0.5秒关闭（如果不配置，默认是3秒） + }, function () { + }) + } else { + + + // 获取对应元素 + var parent = obj.parentNode.parentNode.parentNode.parentNode; + var barCodeChildren = parent.childNodes[9]; + var children = parent.childNodes[5]; + var materialItem = children.childNodes[3].childNodes[1]; + var materialName = materialItem.childNodes[1]; + var materialId = materialName.parentNode.parentNode.childNodes[3]; + // 条形码条码 + var barCodeItem = barCodeChildren.childNodes[3]; + // 物料编码 + var materialCodeItem = parent.childNodes[7].childNodes[3].childNodes[1]; + + var materialCode = materialCodeItem.childNodes[1]; + var idNumber = materialId.name.split("mid")[1]; + // 获取物料与条形码的对应关系 + var materialAndBarCodeList = data["materialAndBarCodeList"]; var barCode = $("#barCode" + idNumber); if (barCode.length > 0) { barCode.empty(); - } else { - var barCodeSelect = ` + } + $("#unit" + idNumber).empty(); + $("#unit" + idNumber).append(new Option(data.unit, "-1")); + $.each(data.splitInfoList, function (index, item) { + $("#unit" + idNumber).append(new Option(item.newUnit, item.newUnit)); + }); + 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 = ` `; - $("#" + barCodeImg.id).before(barCodeSelect); - } - form.render(); + $("#" + barCodeImg.id).before(barCodeSelect); + } + form.render(); - $.each(materialAndBarCodeList, function (index, item) { - $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + $.each(materialAndBarCodeList, function (index, item) { + $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + }); + form.render(); + } + $('#place' + idNumber).empty(); + $.each(data.placePList, function (index, item) { + $('#place' + idNumber).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素 }); form.render(); + materialName.value = data.mname; + materialId.value = data.id; + materialCode.value = data.code; } - $('#place' + idNumber).empty(); - $.each(data.placePList, function (index, item) { - $('#place' + idNumber).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素 - }); - form.render(); - materialName.value = data.mname; - materialId.value = data.id; - materialCode.value = data.code; } }) } diff --git a/target/classes/templates/pages/stockTaking/stockTaking.html b/target/classes/templates/pages/stockTaking/stockTaking.html index 9a91c99c..7d609f2a 100644 --- a/target/classes/templates/pages/stockTaking/stockTaking.html +++ b/target/classes/templates/pages/stockTaking/stockTaking.html @@ -82,16 +82,17 @@
- - - -
+ + + +
@@ -354,23 +355,22 @@ let tagData = []; let tempData = $("#departmentManager").val().split(","); $.each(tempData, function (index, item) { - if(item !== ""){ + if (item !== "") { tagData.push(item) } }); $("#departmentManager").val(""); - - let tagLabel= inputTag.render({ + let tagLabel = inputTag.render({ elem: '#departmentManager', data: tagData,//初始值 removeKeyNum: 8,//删除按键编号 默认，BackSpace 键 createKeyNum: 13,//创建按键编号 默认，Enter 键 - onChange: function (data, value, type,index) { - if(type === "remove"){ + onChange: function (data, value, type, index) { + if (type === "remove") { let split = departmentManagerId.split(","); - split.splice(index,1); + split.splice(index, 1); departmentManagerId = split.toString(); $("#departmentManagerId").val(departmentManagerId); } @@ -647,7 +647,7 @@ parent.wx.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 + scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 success: function (res) { // 回调 var result = res.resultStr;//当needResult为1时返回处理结果 @@ -665,7 +665,10 @@ var flag = data["flag"]; if (flag === 0) { // 如果没有获取到位置 - layer.msg("当前二维码错误，请重新扫描"); + layer.msg("并未查询到对应位置，请重新扫描", { + icon: 0, + time: 1000 + }); } else if (flag === 1) { // 如果获取到的是库位 var place = data["place"]; @@ -1247,90 +1250,99 @@ contentType: "application/json;charset=utf-8", success: function (d) { var data = d.data; - var parent = obj.parentNode.parentNode.parentNode.parentNode; - var parentId = parent.id; - // 物料编码父级 - var codeChildren = parent.childNodes[7]; - // 物料名称父级 - var materialChildren = parent.childNodes[5]; - - // 物料类型父级 - var typeChildren = parent.childNodes[11]; - // 材质父级 - var textureChildren = parent.childNodes[13]; - // 规格型号父级 - var versionChildren = parent.childNodes[15]; - // 计量单位父级 - var unitChildren = parent.childNodes[17]; - // 库存数量父级 - var inventoryChildren = parent.childNodes[21]; - - // 条形码父级 - var barCodeChildren = parent.childNodes[9]; - // 编码条目 - var codeItem = codeChildren.childNodes[3].childNodes[1]; - // 具体条码 - var codeValue = codeItem.childNodes[1]; - - // 物料条目 - var materialItem = materialChildren.childNodes[3].childNodes; - // 物料名称 - var materialName = materialItem[1].childNodes[1]; - // 物料编码 - var materialId = materialItem[3]; - // 物料种类条目 - var materialTypeItem = typeChildren.childNodes[3].childNodes; - - // 条形码条目 - var barCodeItem = barCodeChildren.childNodes[3]; - - materialName.value = data.mname; - materialId.value = data.id; - - materialTypeItem[1].value = data.typeName; - materialTypeItem[3].value = data.typeId; - codeValue.value = data.code; - textureChildren.childNodes[3].childNodes[1].value = data.texture === null || data.texture === undefined ? '' : data.texture; - versionChildren.childNodes[3].childNodes[1].value = data.version === null || data.version === undefined ? '' : data.version; - unitChildren.childNodes[3].childNodes[1].value = data.unit === null || data.unit === undefined ? '' : data.unit; - inventoryChildren.childNodes[3].childNodes[1].value = data.quantity; - // 获取物料与条形码的对应关系 - var materialAndBarCodeList = data["materialAndBarCodeList"]; - var idNumber = materialId.name.split("mid")[1]; - $("#barCode" + idNumber).empty(); - if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) { - var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; - var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; - var id = barCodeInput.id; - form.render(); - $.each(materialAndBarCodeList, function (index, item) { - $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 - }); - form.render(); - } - var unitItem = $("#unit" + idNumber); - unitItem.empty(); - unitItem.append(new Option(data.unit, "-1")); - let splitInfoList = data.splitInfoList; - if (splitInfoList.length > 0) { - $.each(splitInfoList, function (index, item) { - unitItem.append(new Option(item.newUnit, item.newUnit)); + if (data == null) { + layer.msg("对于编码：" + result + ",并未发现对应的物料", { + icon: 0, + time: 1000 //0.5秒关闭（如果不配置，默认是3秒） + }, function () { }) - } - form.render(); - var shelfLife = data.shelfLife; - if (shelfLife !== null && shelfLife !== undefined) { - $("#" + "producedDateItem" + idNumber).show(); - var producedDateList = data['producedDateList']; - if (producedDateList !== null && producedDateList !== undefined && producedDateList.length > 0) { - $.each(producedDateList, function (index, item) { - $("#" + "producedDate" + idNumber).append(new Option(item, item)); + } else { + + var parent = obj.parentNode.parentNode.parentNode.parentNode; + var parentId = parent.id; + // 物料编码父级 + var codeChildren = parent.childNodes[7]; + // 物料名称父级 + var materialChildren = parent.childNodes[5]; + + // 物料类型父级 + var typeChildren = parent.childNodes[11]; + // 材质父级 + var textureChildren = parent.childNodes[13]; + // 规格型号父级 + var versionChildren = parent.childNodes[15]; + // 计量单位父级 + var unitChildren = parent.childNodes[17]; + // 库存数量父级 + var inventoryChildren = parent.childNodes[21]; + + // 条形码父级 + var barCodeChildren = parent.childNodes[9]; + // 编码条目 + var codeItem = codeChildren.childNodes[3].childNodes[1]; + // 具体条码 + var codeValue = codeItem.childNodes[1]; + + // 物料条目 + var materialItem = materialChildren.childNodes[3].childNodes; + // 物料名称 + var materialName = materialItem[1].childNodes[1]; + // 物料编码 + var materialId = materialItem[3]; + // 物料种类条目 + var materialTypeItem = typeChildren.childNodes[3].childNodes; + + // 条形码条目 + var barCodeItem = barCodeChildren.childNodes[3]; + + materialName.value = data.mname; + materialId.value = data.id; + + materialTypeItem[1].value = data.typeName; + materialTypeItem[3].value = data.typeId; + codeValue.value = data.code; + textureChildren.childNodes[3].childNodes[1].value = data.texture === null || data.texture === undefined ? '' : data.texture; + versionChildren.childNodes[3].childNodes[1].value = data.version === null || data.version === undefined ? '' : data.version; + unitChildren.childNodes[3].childNodes[1].value = data.unit === null || data.unit === undefined ? '' : data.unit; + inventoryChildren.childNodes[3].childNodes[1].value = data.quantity; + // 获取物料与条形码的对应关系 + var materialAndBarCodeList = data["materialAndBarCodeList"]; + var idNumber = materialId.name.split("mid")[1]; + $("#barCode" + idNumber).empty(); + if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) { + var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; + var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; + var id = barCodeInput.id; + form.render(); + $.each(materialAndBarCodeList, function (index, item) { + $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + }); + form.render(); + } + var unitItem = $("#unit" + idNumber); + unitItem.empty(); + unitItem.append(new Option(data.unit, "-1")); + let splitInfoList = data.splitInfoList; + if (splitInfoList.length > 0) { + $.each(splitInfoList, function (index, item) { + unitItem.append(new Option(item.newUnit, item.newUnit)); }) } form.render(); - } else { - $("#" + "producedDateItem" + idNumber).hide(); - form.render(); + var shelfLife = data.shelfLife; + if (shelfLife !== null && shelfLife !== undefined) { + $("#" + "producedDateItem" + idNumber).show(); + var producedDateList = data['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(); + } } } })