WMS/wms-admin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
zc
2026-04-21 14:15:58 +08:00
parent 2b6c4ff7f3
commit bcf22400b5
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wms-module-system/src/main/resources/mapper/MeterialInfoMapper.xml
View File

@@ -78,7 +78,7 @@
</update> </update>
<update id="updateBatchNull"> <update id="updateBatchNull">
UPDATE sys_material_info SET batch = null, mark = null UPDATE sys_material_info SET batch = null
</update> </update>
<update id="updateBatchByCode"> <update id="updateBatchByCode">
@@ -93,14 +93,6 @@
</foreach> </foreach>
ELSE batch ELSE batch
END, 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 update_user = CASE
<foreach collection="list" item="item" separator=""> <foreach collection="list" item="item" separator="">
<if test="item.updateUser != null"> <if test="item.updateUser != null">

4
wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java
View File

@@ -28,9 +28,9 @@ import java.util.regex.Pattern;
public class AHDZCConnect { public class AHDZCConnect {
//老设备（只能跑jar包的） //老设备（只能跑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 BAUD_RATE = 9600;
private static final int DATA_BITS = 8; private static final int DATA_BITS = 8;
private static final int STOP_BITS = 1; private static final int STOP_BITS = 1;