From f6b78c3106779bdcc4bbe48a6476b9b16648d298 Mon Sep 17 00:00:00 2001
From: yf001217 <834502597@qq.com>
Date: Wed, 1 Apr 2026 19:02:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8D=A2=E7=AE=B1pda?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/QrCodeMasterController.java    | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java
index 202b778d..41475637 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java
@@ -415,6 +415,35 @@ public class QrCodeMasterController extends BaseController {
         return ApiResult.success(qrCodeVO);
     }
 
+    /**
+     * 换空箱扫码接口
+     *
+     * @param request
+     *  @return
+     *  @author
+     *      */
+    @PostMapping("pda/changeScan")
+    @ApiMark(moduleName = "空箱换箱扫码", apiName = "扫码获取新箱子扫码信息")
+    public ApiResult<QrCodeVO> changeScan(@Valid @RequestBody QRCodeSearchQO request) {
+        WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.lambdaQuery()
+                .eq(WmsQrCodeMaster::getBarcodeCode, request.getPackageCode())
+                .in(WmsQrCodeMaster::getProcessStage, request.getProcessStage())
+                .one();
+        //判断是否为有效码
+        VUtil.trueThrowBusinessError(ObjectUtil.isNull(qrCodeMaster)).throwMessage("无效码");
+        QrCodeVO qrCodeVO = Convert.convert(QrCodeVO.class, qrCodeMaster);
+        if (qrCodeMaster.getPackagingType() == 1) {
+            // 查询子条形码并累加其数量
+            List<WmsQrCodeMaster> qrCodeMasters = qrCodeMasterService.lambdaQuery()
+                    .eq(WmsQrCodeMaster::getParentBarcodeId, qrCodeMaster.getId())
+                    .in(WmsQrCodeMaster::getProcessStage, request.getProcessStage())
+                    .list();
+            VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(qrCodeMasters))
+                    .throwMessage("此箱[" + request.getPackageCode() + "]不为空箱");
+        }
+        return ApiResult.success(qrCodeVO);
+    }
+
     /**
      * 导出标签图片为ZIP
      * @param datas 二维码列表