代码优化

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 cn.hutool.core.util.StrUtil;
 import org.springframework.validation.annotation.Validated;
 import top.continew.starter.extension.crud.enums.Api;
 
@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.*;
 import lombok.RequiredArgsConstructor;
 import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
 import top.continew.starter.log.annotation.Log;
+import top.continew.starter.web.model.R;
 import top.wms.admin.common.controller.BaseController;
 import top.wms.admin.weighManage.model.query.WorkOrderQuery;
 import top.wms.admin.weighManage.model.req.WorkOrderReq;
@@ -34,11 +36,17 @@ public class WorkOrderController extends BaseController<WorkOrderService, WorkOr
 
     @Log(ignore = true)
     @SaCheckPermission("workOrder:record:detail")
-    @GetMapping(value = "/{id}")
-    public List<WorkOrderInfoResp> getDetail(@PathVariable("id") Long id) {
-        return baseService.getDetail(id);
+    @GetMapping(value = "/info/{id}")
+    public List<WorkOrderInfoResp> getWorkOrderInfos(@PathVariable("id") Long id) {
+        return baseService.getWorkOrderInfos(id);
     }
 
+    @Log(ignore = true)
+    @SaCheckPermission("workOrder:record:detail")
+    @GetMapping(value = "/{id}")
+    public WorkOrderResp getDetail(@PathVariable("id") Long id) {
+        return baseService.getDetail(id);
+    }
 
     @SaCheckPermission("workOrder:record:add")
     @PostMapping
@@ -46,4 +54,23 @@ public class WorkOrderController extends BaseController<WorkOrderService, WorkOr
         return baseService.addWorKerOrder(req);
     }
 
+    @PostMapping("/validateWeighing")
+    public R validateWeighing(@RequestBody WorkOrderReq req) {
+        if (null == req.getMaterialId()) {
+            return R.fail("400", "物料主键id不能为空");
+        }
+        if (StrUtil.isBlank(req.getInputQuantity())) {
+            return R.fail("400", "输入数量不能为空");
+        }
+        if (StrUtil.isBlank(req.getAhDeviceWeight())) {
+            return R.fail("400", "电子称重量不能为空");
+        }
+
+        int validateResult = baseService.validateWeighing(req);
+        if (validateResult != 200) {
+            return R.fail("500", "重量不匹配！");
+        }
+        return R.ok();
+    }
+
 }

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}
     # 连接超时时间