From f967831b87cda525db4bf6f99c5caf3f2cbdef43 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 25 三月 2025 09:07:48 +0800
Subject: [PATCH] 修改 # 1. 添加物料分组绑定接口
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java | 3 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java | 3 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 28 ++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java | 16 ++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/MatnrToGroupParams.java | 23 +++++++++++
5 files changed, 72 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
index 1a763ae..ad4c485 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
@@ -14,6 +14,7 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
+import com.vincent.rsf.server.manager.controller.params.MatnrToGroupParams;
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.excel.MatnrsTemplate;
import com.vincent.rsf.server.manager.service.MatnrService;
@@ -154,6 +155,21 @@
return R.ok(new PageResult().setRecords(matnrPage.getRecords()).setTotal(matnrPage.getTotal()));
}
+
+ @PreAuthorize("hasAuthority('manager:matnr:list')")
+ @ApiOperation("缁戝畾鐗╂枡鍒嗙粍")
+ @PostMapping("/matnr/group/bind")
+ public R bindMatnrToGroup(@RequestBody MatnrToGroupParams params) {
+ if (Objects.isNull(params)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (matnrService.bindMatnrs(params)) {
+ return R.ok();
+ } else {
+ return R.error("鎿嶄綔澶辫触锛侊紒");
+ }
+ }
+
@PreAuthorize("hasAuthority('manager:matnr:list')")
@ApiOperation("瀵煎嚭鐗╂枡淇℃伅")
@PostMapping("/matnr/export")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/MatnrToGroupParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/MatnrToGroupParams.java
new file mode 100644
index 0000000..f2ef317
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/MatnrToGroupParams.java
@@ -0,0 +1,23 @@
+package com.vincent.rsf.server.manager.controller.params;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 缁戝畾鐗╂枡鍒嗙粍璇锋眰鍙傛暟
+ */
+@Data
+@Accessors(chain = true)
+public class MatnrToGroupParams implements Serializable {
+
+ @ApiModelProperty("鐗╂枡ID")
+ private List<Long> ids;
+
+ @ApiModelProperty("鍒嗙粍ID")
+ private Long groupId;
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java
index 7849783..c765aa6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java
@@ -5,6 +5,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.controller.params.MatnrToGroupParams;
import com.vincent.rsf.server.manager.entity.Matnr;
import org.springframework.web.multipart.MultipartFile;
@@ -19,4 +20,6 @@
PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam);
Matnr selectMatnrById(Long id);
+
+ boolean bindMatnrs(MatnrToGroupParams params);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
index 95d8391..23f5eb2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
@@ -6,6 +6,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
@@ -14,6 +15,7 @@
import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.utils.FieldsUtils;
+import com.vincent.rsf.server.manager.controller.params.MatnrToGroupParams;
import com.vincent.rsf.server.manager.entity.MatnrGroup;
import com.vincent.rsf.server.manager.entity.excel.MatnrsTemplate;
import com.vincent.rsf.server.manager.mapper.MatnrMapper;
@@ -137,6 +139,32 @@
}
/**
+ * 鐗╂枡缁戝畾
+ * @param params
+ * @return
+ */
+ @Override
+ public boolean bindMatnrs(MatnrToGroupParams params) {
+ if (Objects.isNull(params) && params.getIds().isEmpty()) {
+ throw new CoolException("鐗╂枡涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getGroupId())) {
+ throw new CoolException("鍒嗙粍涓嶈兘涓虹┖锛侊紒");
+ }
+ MatnrGroup groups = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getId, params.getGroupId()));
+ if (Objects.isNull(groups)) {
+ throw new CoolException("鐗╂枡鍒嗙粍涓嶅瓨鍦紒锛�");
+ }
+ if (!this.update(new LambdaUpdateWrapper<Matnr>()
+ .in(Matnr::getId, params.getIds())
+ .set(Matnr::getGroupId, groups.getId())
+ .set(Matnr::getGroupCode, groups.getCode()))) {
+ throw new CoolException("缁戝畾澶辫触锛侊紒");
+ }
+ return true;
+ }
+
+ /**
* @desc 鏇存柊鎵╁睍鐗╂枡鎵╁睍瀛楁鍊�
* @param matnr
* @return
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
index adc1257..8551b63 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
@@ -64,7 +64,8 @@
public R login(@RequestBody LoginParam param, HttpServletRequest request) {
String username = param.getUsername();
User user = userService.getByUsername(username
- , configProperties.getSystemMode().equals(SystemModeType.OFFLINE) ? param.getTenantId() : null
+ , configProperties.getSystemMode()
+ .equals(SystemModeType.OFFLINE) ? param.getTenantId() : null
);
if (user == null) {
return R.parse(BusinessRes.USERNAME_NOT_EXIST);
--
Gitblit v1.9.1