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 0509eab5..665af9d1 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java @@ -543,7 +543,7 @@ public class MaterialController { } try { // 二维码保存信息 - return RestResponse.CreateQrCode(qrCode); + return RestResponse.CreateBarCode(qrCode,material.getMname()); } catch (IOException e) { return new RestResponse("err: " + e.getMessage(), 678, new StatusInfo("失败", "请联系开发人员")); } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java index 2f51dda2..d9c0d9da 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java @@ -298,7 +298,12 @@ public class PlaceController { } try { // 二维码保存信息 - return RestResponse.CreateQrCode(qrCode); + + Place placeById = placeService.findPlaceById(pid); + + Depository depositoryById = depositoryService.findDepositoryById(placeById.getDid()); + + return RestResponse.CreateBarCode(qrCode,depositoryById.getDname() + "-" + placeById.getCode()); } catch (IOException e) { return new RestResponse("err: " + e.getMessage(), 678, new StatusInfo("失败", "请联系开发人员")); } diff --git a/src/main/resources/templates/pages/material/material-view.html b/src/main/resources/templates/pages/material/material-view.html index fdf26332..0c674843 100644 --- a/src/main/resources/templates/pages/material/material-view.html +++ b/src/main/resources/templates/pages/material/material-view.html @@ -123,7 +123,7 @@ @@ -279,7 +279,7 @@ success: function (d) { var data = d.data; layer.close(this.layerIndex); - //$("#qrCode").attr("src", data); + $("#barCode").attr("src", data.qrCode); $("#codeItem").show(); $("#createCode").hide(); } diff --git a/src/main/resources/templates/pages/place/place_edit.html b/src/main/resources/templates/pages/place/place_edit.html index 80426f5d..b7845691 100644 --- a/src/main/resources/templates/pages/place/place_edit.html +++ b/src/main/resources/templates/pages/place/place_edit.html @@ -62,7 +62,7 @@
@@ -156,7 +156,7 @@ success: function (d) { var data = d.data; layer.close(this.layerIndex); - //$("#qrCode").attr("src", data); + $("#barCode").attr("src", data.qrCode); $("#codeItem").show(); $("#createCode").hide(); }