From 876b06ab01092a406550c748b3eb5e61f8247d1f Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Mon, 25 Aug 2025 18:38:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=96=E9=83=A8=E4=BD=BF=E7=94=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/back/controller/BackApplyInfoController.java | 1 +
 .../bonus/material/ma/controller/MachineController.java   | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java
index 9623dfd5..73b35202 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java
@@ -234,6 +234,7 @@ public class BackApplyInfoController extends BaseController {
     public AjaxResult getMachine(BackApplyInfo dto){
         return backApplyInfoService.getMachine(dto);
     }
+
     /**
      * app根据设备编码去检索退料工程
      * @param dto
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java
index eea67988..569adaae 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java
@@ -289,6 +289,14 @@ public class MachineController extends BaseController {
         return machineService.getHisByQrcode(machine);
     }
 
+    /**
+     * 根据qrcode查询机具历史信息 -- 外部专用
+     */
+    @GetMapping("/getHisByQrcodeNetwork")
+    public AjaxResult getHisByQrcodeNetwork(Machine machine) {
+        return machineService.getHisByQrcode(machine);
+    }
+
     /**
      * 根据qrcode查询机具历史信息
      * @param machine