From 2191824072549f0da35d73686a075e59b0196321 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 25 九月 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatFieldController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatFieldController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatFieldController.java
index cb680b4..18960d8 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatFieldController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatFieldController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.service.LocDetlFieldService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -40,7 +41,14 @@
@PreAuthorize("hasAuthority('asrs:matField:list')")
@PostMapping("/matField/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(matFieldService.list());
+ List<MatField> list = matFieldService.list();
+ if (map.containsKey("unique")) {
+ list = matFieldService.list(new LambdaQueryWrapper<MatField>().eq(MatField::getUnique, map.get("unique")));
+ }
+ if (map.containsKey("fieldType")) {
+ list = matFieldService.list(new LambdaQueryWrapper<MatField>().eq(MatField::getFieldType, map.get("fieldType")));
+ }
+ return R.ok().add(list);
}
@PreAuthorize("hasAuthority('asrs:matField:list')")
@@ -56,6 +64,8 @@
if (!matFieldService.save(matField)) {
return R.error("娣诲姞澶辫触");
}
+
+ matFieldService.createView();//鏇存柊瑙嗗浘
return R.ok("娣诲姞鎴愬姛");
}
@@ -66,6 +76,8 @@
if (!matFieldService.updateById(matField)) {
return R.error("淇敼澶辫触");
}
+
+ matFieldService.createView();//鏇存柊瑙嗗浘
return R.ok("淇敼鎴愬姛");
}
@@ -76,6 +88,8 @@
if (!matFieldService.removeByIds(Arrays.asList(ids))) {
return R.error("鍒犻櫎澶辫触");
}
+
+ matFieldService.createView();//鏇存柊瑙嗗浘
return R.ok("鍒犻櫎鎴愬姛");
}
--
Gitblit v1.9.1