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 二维码列表