优化

wms-webapi/src/main/java/top/wms/admin/controller/meterial/MaterialInfoController.java

@@ -1,6 +1,8 @@
 package top.wms.admin.controller.meterial;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotNull;
@@ -29,6 +31,8 @@ import top.wms.admin.material.model.resp.MaterialInfoResp;
 import top.wms.admin.material.service.MaterialInfoService;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 物料信息管理 API
@@ -44,10 +48,15 @@ import java.io.IOException;
 public class MaterialInfoController extends BaseController<MaterialInfoService, MaterialInfoResp, MaterialInfoResp, MaterialInfoQuery, MaterialInfoReq> {
 
     @GetMapping("/code/{code}")
-    public MaterialInfoDO getMaterialInfoByCode(@PathVariable String code) {
-        MaterialInfoDO materialInfoDO = baseService.getMaterialInfoByCode(code);
-        CheckUtils.throwIfEmpty(materialInfoDO, "未查询到相关物料信息");
-        return materialInfoDO;
+    public MaterialInfoResp getMaterialInfoByCode(@PathVariable String code) {
+        List<String> list = Arrays.asList(code.split(","));
+        if (CollUtil.isNotEmpty(list) && list.size() > 1) {
+            code = list.get(1);
+        }
+
+        MaterialInfoResp materialInfoResp = baseService.getMaterialInfoByCode(code);
+        CheckUtils.throwIfEmpty(materialInfoResp, "未查询到相关物料信息");
+        return materialInfoResp;
     }
 
     @Operation(summary = "下载导入模板", description = "下载导入模板")

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

@@ -21,6 +21,7 @@ import top.wms.admin.weighManage.model.resp.WorkOrderResp;
 import top.wms.admin.weighManage.service.WorkOrderService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 任务工单信息管理 API
@@ -71,12 +72,12 @@ public class WorkOrderController extends BaseController<WorkOrderService, WorkOr
         if (StrUtil.isBlank(req.getAhDeviceWeight())) {
             return R.fail("400", "电子称重量不能为空");
         }
-
-        int validateResult = baseService.validateWeighing(req);
-        if (validateResult != 200) {
-            return R.fail("500", "重量不匹配！");
+        if (req.getMaterialId() == null) {
+            return R.fail("400", "物料主键id不能为空");
         }
-        return R.ok();
+
+        Map<String, String> validateResult = baseService.validateWeighing(req);
+        return R.ok(validateResult);
     }
 
 }