diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
index 2c4feac..79ccb1f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
@@ -1,65 +1,51 @@
 package com.ruoyi.common.utils.file;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.ArrayUtils;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.ArrayUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 
 /**
  * 文件处理工具类
- * 
+ *
  * @author ruoyi
  */
-public class FileUtils
-{
+public class FileUtils {
     public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";
 
     /**
      * 输出指定文件的byte数组
-     * 
+     *
      * @param filePath 文件路径
-     * @param os 输出流
+     * @param os       输出流
      * @return
      */
-    public static void writeBytes(String filePath, OutputStream os) throws IOException
-    {
+    public static void writeBytes(String filePath, OutputStream os) throws IOException {
         FileInputStream fis = null;
-        try
-        {
+        try {
             File file = new File(filePath);
-            if (!file.exists())
-            {
+            if (!file.exists()) {
                 throw new FileNotFoundException(filePath);
             }
             fis = new FileInputStream(file);
             byte[] b = new byte[1024];
             int length;
-            while ((length = fis.read(b)) > 0)
-            {
+            while ((length = fis.read(b)) > 0) {
                 os.write(b, 0, length);
             }
-        }
-        catch (IOException e)
-        {
+        } catch (IOException e) {
             throw e;
-        }
-        finally
-        {
+        } finally {
             IOUtils.close(os);
             IOUtils.close(fis);
         }
@@ -72,33 +58,28 @@ public class FileUtils
      * @return 目标文件
      * @throws IOException IO异常
      */
-    public static String writeImportBytes(byte[] data) throws IOException
-    {
+    public static String writeImportBytes(byte[] data) throws IOException {
         return writeBytes(data, RuoYiConfig.getImportPath());
     }
 
     /**
      * 写数据到文件中
      *
-     * @param data 数据
+     * @param data      数据
      * @param uploadDir 目标文件
      * @return 目标文件
      * @throws IOException IO异常
      */
-    public static String writeBytes(byte[] data, String uploadDir) throws IOException
-    {
+    public static String writeBytes(byte[] data, String uploadDir) throws IOException {
         FileOutputStream fos = null;
         String pathName = "";
-        try
-        {
+        try {
             String extension = getFileExtendName(data);
             pathName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;
             File file = FileUploadUtils.getAbsoluteFile(uploadDir, pathName);
             fos = new FileOutputStream(file);
             fos.write(data);
-        }
-        finally
-        {
+        } finally {
             IOUtils.close(fos);
         }
         return FileUploadUtils.getPathFileName(uploadDir, pathName);
@@ -106,28 +87,25 @@ public class FileUtils
 
     /**
      * 移除路径中的请求前缀片段
-     * 
+     *
      * @param filePath 文件路径
      * @return 移除后的文件路径
      */
-    public static String stripPrefix(String filePath)
-    {
+    public static String stripPrefix(String filePath) {
         return StringUtils.substringAfter(filePath, Constants.RESOURCE_PREFIX);
     }
 
     /**
      * 删除文件
-     * 
+     *
      * @param filePath 文件
      * @return
      */
-    public static boolean deleteFile(String filePath)
-    {
+    public static boolean deleteFile(String filePath) {
         boolean flag = false;
         File file = new File(filePath);
         // 路径为文件且不为空则进行删除
-        if (file.isFile() && file.exists())
-        {
+        if (file.isFile() && file.exists()) {
             flag = file.delete();
         }
         return flag;
@@ -135,32 +113,28 @@ public class FileUtils
 
     /**
      * 文件名称验证
-     * 
+     *
      * @param filename 文件名称
      * @return true 正常 false 非法
      */
-    public static boolean isValidFilename(String filename)
-    {
+    public static boolean isValidFilename(String filename) {
         return filename.matches(FILENAME_PATTERN);
     }
 
     /**
      * 检查文件是否可下载
-     * 
+     *
      * @param resource 需要下载的文件
      * @return true 正常 false 非法
      */
-    public static boolean checkAllowDownload(String resource)
-    {
+    public static boolean checkAllowDownload(String resource) {
         // 禁止目录上跳级别
-        if (StringUtils.contains(resource, ".."))
-        {
+        if (StringUtils.contains(resource, "..")) {
             return false;
         }
 
         // 检查允许下载的文件规则
-        if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource)))
-        {
+        if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource))) {
             return true;
         }
 
@@ -170,33 +144,25 @@ public class FileUtils
 
     /**
      * 下载文件名重新编码
-     * 
-     * @param request 请求对象
+     *
+     * @param request  请求对象
      * @param fileName 文件名
      * @return 编码后的文件名
      */
-    public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException
-    {
+    public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException {
         final String agent = request.getHeader("USER-AGENT");
         String filename = fileName;
-        if (agent.contains("MSIE"))
-        {
+        if (agent.contains("MSIE")) {
             // IE浏览器
             filename = URLEncoder.encode(filename, "utf-8");
             filename = filename.replace("+", " ");
-        }
-        else if (agent.contains("Firefox"))
-        {
+        } else if (agent.contains("Firefox")) {
             // 火狐浏览器
             filename = new String(fileName.getBytes(), "ISO8859-1");
-        }
-        else if (agent.contains("Chrome"))
-        {
+        } else if (agent.contains("Chrome")) {
             // google浏览器
             filename = URLEncoder.encode(filename, "utf-8");
-        }
-        else
-        {
+        } else {
             // 其它浏览器
             filename = URLEncoder.encode(filename, "utf-8");
         }
@@ -206,12 +172,11 @@ public class FileUtils
     /**
      * 下载文件名重新编码
      *
-     * @param response 响应对象
+     * @param response     响应对象
      * @param realFileName 真实文件名
      * @return
      */
-    public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException
-    {
+    public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException {
         String percentEncodedFileName = percentEncode(realFileName);
 
         StringBuilder contentDispositionValue = new StringBuilder();
@@ -231,36 +196,27 @@ public class FileUtils
      * @param s 需要百分号编码的字符串
      * @return 百分号编码后的字符串
      */
-    public static String percentEncode(String s) throws UnsupportedEncodingException
-    {
+    public static String percentEncode(String s) throws UnsupportedEncodingException {
         String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString());
         return encode.replaceAll("\\+", "%20");
     }
 
     /**
      * 获取图像后缀
-     * 
+     *
      * @param photoByte 图像数据
      * @return 后缀名
      */
-    public static String getFileExtendName(byte[] photoByte)
-    {
+    public static String getFileExtendName(byte[] photoByte) {
         String strFileExtendName = "jpg";
         if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56)
-                && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97))
-        {
+                && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97)) {
             strFileExtendName = "gif";
-        }
-        else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70))
-        {
+        } else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70)) {
             strFileExtendName = "jpg";
-        }
-        else if ((photoByte[0] == 66) && (photoByte[1] == 77))
-        {
+        } else if ((photoByte[0] == 66) && (photoByte[1] == 77)) {
             strFileExtendName = "bmp";
-        }
-        else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71))
-        {
+        } else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71)) {
             strFileExtendName = "png";
         }
         return strFileExtendName;
@@ -268,14 +224,12 @@ public class FileUtils
 
     /**
      * 获取文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi.png
-     * 
+     *
      * @param fileName 路径名称
      * @return 没有文件路径的名称
      */
-    public static String getName(String fileName)
-    {
-        if (fileName == null)
-        {
+    public static String getName(String fileName) {
+        if (fileName == null) {
             return null;
         }
         int lastUnixPos = fileName.lastIndexOf('/');
@@ -286,14 +240,12 @@ public class FileUtils
 
     /**
      * 获取不带后缀文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi
-     * 
+     *
      * @param fileName 路径名称
      * @return 没有文件路径和后缀的名称
      */
-    public static String getNameNotSuffix(String fileName)
-    {
-        if (fileName == null)
-        {
+    public static String getNameNotSuffix(String fileName) {
+        if (fileName == null) {
             return null;
         }
         String baseName = FilenameUtils.getBaseName(fileName);
diff --git a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java
index 95dc19e..74fec16 100644
--- a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java
+++ b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java
@@ -554,14 +554,14 @@ public class ApiController extends BaseController {
     // 更换RFID提交，记录添加
     @PostMapping("/changeBasketEpc")
     public AjaxResult changeBasketEpc(@RequestBody BaseBasketInfo baseBasketInfo) {
-        // int tagCount = baseBasketInfoService.selectCountBasketByEpc(baseBasketInfo.getBasketEpc());
-        // if (tagCount > 0) {
-        //     return AjaxResult.error("RFID标签1已绑定");
-        // }
-        // tagCount = baseBasketInfoService.selectCountBasketByEpc(baseBasketInfo.getBasketEpc2());
-        // if (tagCount > 0) {
-        //     return AjaxResult.error("RFID标签2已绑定");
-        // }
+        int tagCount = baseBasketInfoService.selectCountBasketByEpc(baseBasketInfo.getBasketEpc());
+        if (tagCount > 0) {
+            return AjaxResult.error("RFID标签1已绑定");
+        }
+        tagCount = baseBasketInfoService.selectCountBasketByEpc(baseBasketInfo.getBasketEpc2());
+        if (tagCount > 0) {
+            return AjaxResult.error("RFID标签2已绑定");
+        }
 
 
         int i = baseBasketInfoService.updateBaseBasketInfo(baseBasketInfo);
diff --git a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/utils/Md5Utils.java b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/utils/Md5Utils.java
index 40d6dd4..ef4e524 100644
--- a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/utils/Md5Utils.java
+++ b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/utils/Md5Utils.java
@@ -21,6 +21,7 @@ import org.apache.commons.lang3.StringUtils;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.lang.reflect.Method;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
 import java.security.MessageDigest;
@@ -43,16 +44,26 @@ public final class Md5Utils {
             return "";
         }
         FileInputStream in = null;
+        FileChannel channel = null;
         try {
             in = new FileInputStream(file);
-            FileChannel channel = in.getChannel();
+            channel = in.getChannel();
             MappedByteBuffer buffer = channel.map(FileChannel.MapMode.READ_ONLY, 0, file.length());
             MessageDigest md = MessageDigest.getInstance("MD5");
             md.update(buffer);
+            // Windows下 MappedByteBuffer 会锁住文件，必须显式释放才能删除
+            // cleanMappedBuffer(buffer);
             return bytes2Hex(md.digest());
         } catch (NoSuchAlgorithmException | IOException e) {
             e.printStackTrace();
         } finally {
+            // 先关 channel，再关 stream
+            if (channel != null) {
+                try {
+                    channel.close();
+                } catch (IOException ignored) {
+                }
+            }
             if (in != null) {
                 try {
                     in.close();
@@ -63,6 +74,19 @@ public final class Md5Utils {
         return "";
     }
 
+    /** 释放 MappedByteBuffer 持有的文件句柄（Windows 必需） */
+    private static void cleanMappedBuffer(MappedByteBuffer buffer) {
+        try {
+            Method cleanerMethod = buffer.getClass().getMethod("cleaner");
+            cleanerMethod.setAccessible(true);
+            Object cleaner = cleanerMethod.invoke(buffer);
+            Method cleanMethod = cleaner.getClass().getMethod("clean");
+            cleanMethod.setAccessible(true);
+            cleanMethod.invoke(cleaner);
+        } catch (Exception ignored) {
+        }
+    }
+
     /**
      * 验证文件是否有效【通过MD5值比较】
      *
diff --git a/ruoyi-webapi/src/main/resources/templates/pda/pda_version/add.html b/ruoyi-webapi/src/main/resources/templates/pda/pda_version/add.html
index 9e20d4d..7634b2b 100644
--- a/ruoyi-webapi/src/main/resources/templates/pda/pda_version/add.html
+++ b/ruoyi-webapi/src/main/resources/templates/pda/pda_version/add.html
@@ -30,11 +30,10 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">位置：</label>
                 <div class="col-sm-8">
-<!--                    <input type="hidden" name="downloadUrl">-->
-<!--                    <div class="file-loading">-->
-<!--                        <input class="form-control file-upload" id="downloadUrl" name="file" type="file">-->
-                        <input id="filePath" name="filePath" class="form-control" type="file">
-<!--                    </div>-->
+                    <input type="hidden" id="downloadUrl" name="downloadUrl">
+                    <div class="file-loading">
+                        <input id="apkFile" name="file" type="file">
+                    </div>
                 </div>
             </div>
         </form>
@@ -49,30 +48,17 @@
         });
 
         function submitHandler() {
-            // if ($.validate.form()) {
-            //     $.operate.save(prefix + "/add", $('#form-pda_version-add').serialize());
-            // }
-            var formData = new FormData();
-            if ($('#filePath')[0].files[0] == null) {
-                $.modal.alertWarning("请先选择文件路径");
+            if ($("#downloadUrl").val() === '') {
+                $.modal.alertWarning("请先上传APK文件");
                 return false;
             }
-            formData.append('versionCode', $("input[name='versionCode']").val());
-            formData.append('versionName', $("input[name='versionName']").val());
-            formData.append('modifyContent', $("input[name='modifyContent']").val());
-            formData.append('file', $('#filePath')[0].files[0]);
-            $.ajax({
-                url: prefix + "/add",
-                type: 'post',
-                cache: false,
-                data: formData,
-                processData: false,
-                contentType: false,
-                dataType: "json",
-                success: function(result) {
-                    $.operate.successCallback(result);
-                }
-            });
+            var data = {
+                versionCode: $("input[name='versionCode']").val(),
+                versionName: $("input[name='versionName']").val(),
+                modifyContent: $("input[name='modifyContent']").val(),
+                downloadUrl: $("#downloadUrl").val()
+            };
+            $.operate.save(prefix + "/add", data);
         }
 
        // $(".file-upload").fileinput({
@@ -86,6 +72,18 @@
        //  })
 
         $(function() {
+            // APK文件上传
+            $("#apkFile").fileinput({
+                uploadUrl: ctx + 'common/upload',
+                maxFileCount: 1,
+                autoReplace: true,
+                uploadExtraData: { fileType: "apk" }
+            }).on('fileuploaded', function (event, data) {
+                // 上传成功，将服务器返回的相对路径写入隐藏字段
+                $("#downloadUrl").val(data.response.url);
+            }).on('fileremoved', function () {
+                $("#downloadUrl").val('');
+            });
             $('.summernote').summernote({
                 lang: 'zh-CN',
                 dialogsInBody: true,