From bcf22400b54648d53abb6dfd4f2da21ac777b32f Mon Sep 17 00:00:00 2001
From: zc <jingyun1127@outlook.com>
Date: Tue, 21 Apr 2026 14:15:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/MeterialInfoMapper.xml   | 10 +---------
 .../admin/controller/weighManage/ah/AHDZCConnect.java  |  4 ++--
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/wms-module-system/src/main/resources/mapper/MeterialInfoMapper.xml b/wms-module-system/src/main/resources/mapper/MeterialInfoMapper.xml
index 9477ffc..508a558 100644
--- a/wms-module-system/src/main/resources/mapper/MeterialInfoMapper.xml
+++ b/wms-module-system/src/main/resources/mapper/MeterialInfoMapper.xml
@@ -78,7 +78,7 @@
     </update>
 
    <update id="updateBatchNull">
-        UPDATE sys_material_info SET batch = null, mark = null
+        UPDATE sys_material_info SET batch = null
     </update>
 
     <update id="updateBatchByCode">
@@ -93,14 +93,6 @@
                     </foreach>
                     ELSE batch
                 END,
-                mark = CASE
-                    <foreach collection="list" item="item" separator="">
-                        <if test="item.mark != null and item.mark != ''">
-                            WHEN encoding = #{item.encoding} THEN #{item.mark}
-                        </if>
-                    </foreach>
-                    ELSE mark
-                END,
                 update_user = CASE
                     <foreach collection="list" item="item" separator="">
                         <if test="item.updateUser != null">
diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java b/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java
index 090c8f7..8f4e034 100644
--- a/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java
@@ -28,9 +28,9 @@ import java.util.regex.Pattern;
 public class AHDZCConnect {
 
     //老设备（只能跑jar包的）
-    private static final String PORT_NAME = "COM12";
+    //    private static final String PORT_NAME = "COM12";
     //新设备（环境齐全的）
-    //    private static final String PORT_NAME = "COM13";
+    private static final String PORT_NAME = "COM13";
     private static final int BAUD_RATE = 9600;
     private static final int DATA_BITS = 8;
     private static final int STOP_BITS = 1;