diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Count.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Count.cshtml index 1a88190..1ea194b 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Count.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Count.cshtml @@ -70,7 +70,7 @@ var app = new Vue({ app.tableData = json.Data; }, error: function (json) { - console.log("加载失败"); + alert("加载失败"); } }); this.$nextTick(() => { diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml index 31c642d..1230e73 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipOut/Index.cshtml @@ -26,7 +26,8 @@ - @@ -39,7 +40,7 @@ - + @@ -90,7 +91,7 @@ taskType: [ { label: "散料站台", value: "slbox" }, { label: "料塔周转箱", value: "lt" }, - { label: "唯一码", value: "uniqueCode" }, + // { label: "唯一码", value: "uniqueCode" }, ], invTable:[], showTable: false, @@ -106,6 +107,41 @@ this.form.batch = data.Batch; this.form.qty = data.Qty; }, + // 扫描二维码 + scanUnique(data) { + if (this.invTable.length == 0) { + this.$message({ + message: "待拣物料列表为空!", + type: "error", + duration: "10000", + }); + this.form.uniqueCode = ""; + return; + } + var _this = this; + + var t = _this.invTable.findIndex(function (value, index, arr) { + return value.UniqueCode == data; + }); + + if (t == -1) { + _this.$message({ + message: "扫描失败 " + data + " 不存在!", + type: "error", + duration: "10000", + }); + } else { + var value = _this.invTable[t]; + _this.form.uniqueCode = value.UniqueCode; + _this.form.materialCode = value.MaterialCode; + _this.form.materialSpec = value.MaterialSpec; + _this.form.batch = value.Batch; + _this.form.qty = value.Qty; + + _this.onSubmit(); + } + }, + select(data) { this.form.code = ""; this.form.type = data; diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Analyse.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Analyse.cshtml index 4d16f35..e15a319 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Analyse.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Analyse.cshtml @@ -62,7 +62,7 @@ app.tableData = json.Data; }, error: function (json) { - console.log("加载失败"); + alert.log("加载失败"); } }); }, diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/ShelfInv.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/ShelfInv.cshtml index a4c9c02..57d792b 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/ShelfInv.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/ShelfInv.cshtml @@ -45,7 +45,7 @@ app.tableData = json.Data; }, error: function (json) { - console.log("加载失败"); + alert.log("加载失败"); } }); },