diff --git a/src/main/resources/mapper/app/InventoryStock.xml b/src/main/resources/mapper/app/InventoryStock.xml index d3b72b2..0e72067 100644 --- a/src/main/resources/mapper/app/InventoryStock.xml +++ b/src/main/resources/mapper/app/InventoryStock.xml @@ -118,7 +118,8 @@ seq_no, batch_no, location_id, - warehouse_id + warehouse_id, + status from print_label_record diff --git a/src/main/resources/static/js/pda/changeLocation2.js b/src/main/resources/static/js/pda/changeLocation2.js index 6e25c48..2ea26f3 100644 --- a/src/main/resources/static/js/pda/changeLocation2.js +++ b/src/main/resources/static/js/pda/changeLocation2.js @@ -142,7 +142,8 @@ async function queryPart(){ wareHouseId : '', batchNo: '', locationId : '', - printLabelId : '' + printLabelId : '', + status : '', } if(strList.length < 5){ layer.msg("袋贴标签格式错误!"); @@ -162,6 +163,10 @@ async function queryPart(){ } //查询标签信息 await queryPrintLabelRecord() + if (partNoData.status == '未入库') { + layer.msg("该标签未入库,不能进行移库操作!"); + return false + } var flag = false; for (let i = 0; i < tableList.length; i++) { if(tableList[i].printLabelId == partNoData.printLabelId){ @@ -200,6 +205,7 @@ function queryPrintLabelRecord(){ partNoData.batchNo = data.row.batchNo; partNoData.locationId = data.row.locationId; partNoData.wareHouseId = data.row.warehouseId; + partNoData.status = data.row.status; resolve(data); } else { layer.msg(data.msg);