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 sys_material_info SET batch = null, mark = null
+ UPDATE sys_material_info SET batch = null
@@ -93,14 +93,6 @@
ELSE batch
END,
- mark = CASE
-
-
- WHEN encoding = #{item.encoding} THEN #{item.mark}
-
-
- ELSE mark
- END,
update_user = CASE
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;