Merge branch 'refs/heads/master' into master_lz

wms-webapi/src/main/java/top/wms/admin/controller/weighManage/WorkOrderController.java

@@ -1,6 +1,7 @@
 package top.wms.admin.controller.weighManage;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.validation.annotation.Validated;
 import top.continew.starter.extension.crud.enums.Api;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -41,7 +42,7 @@ public class WorkOrderController extends BaseController<WorkOrderService, WorkOr
 
     @SaCheckPermission("workOrder:record:add")
     @PostMapping
-    public WorkOrderResp addWorKerOrder(@RequestBody WorkOrderReq req) {
+    public WorkOrderResp addWorKerOrder(@Validated @RequestBody WorkOrderReq req) {
         return baseService.addWorKerOrder(req);
     }
 

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

@@ -52,8 +52,10 @@ public class AHDZCConnect {
     @PostConstruct
     public void init() {
         // 项目启动时初始化并启动服务
-        ScaleService();
-        start();
+        if (false) {
+            ScaleService();
+            start();
+        }
     }
 
     @PreDestroy
@@ -191,8 +193,8 @@ public class AHDZCConnect {
 
                         // 解析数据，提取数字和重量单位
                         String weightStr = data.trim();
-                        // 使用正则表达式提取数字和重量单位
-                        Pattern pattern = java.util.regex.Pattern.compile("[-+]?\\d*\\.?\\d+\\s*[a-zA-Z]*");
+                        // 使用正则表达式提取数字（包括小数点）
+                        Pattern pattern = java.util.regex.Pattern.compile("[-+]?\\d*\\.?\\d+");
                         Matcher matcher = pattern.matcher(weightStr);
 
                         if (matcher.find()) {

wms-webapi/src/main/resources/config/application-dev.yml

@@ -48,12 +48,12 @@ spring.data:
   ## Redis 配置（单机模式）
   redis:
     # 地址
-    host: ${REDIS_HOST:192.168.2.30}
-#    host: ${REDIS_HOST:127.0.0.1}
+#    host: ${REDIS_HOST:192.168.2.30}
+    host: ${REDIS_HOST:127.0.0.1}
     # 端口（默认 6379）
     port: ${REDIS_PORT:6379}
     # 密码（未设置密码时请注释掉）
-    password: ${REDIS_PWD:redis2025}
+#    password: ${REDIS_PWD:redis2025}
     # 数据库索引
     database: ${REDIS_DB:1}
     # 连接超时时间