From a0de9971c2de222a7684c60bd4285f855a2ce63e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 22 三月 2025 14:42:50 +0800
Subject: [PATCH] #修改 1. 添加库位逻辑分区
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java | 221 ++++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java | 135 +++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocAreaMatRelaMapper.java | 12 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java | 110 +++++++++++
rsf-server/src/main/resources/mapper/manager/LocAreaMatRelaMapper.xml | 5
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java | 2
rsf-server/src/main/java/locAreaMatRela.sql | 27 ++
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocAreaMatsParam.java | 35 +++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocAreaMatRelaService.java | 11 +
10 files changed, 560 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
index ee4f1a5..25a2013 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
@@ -22,8 +22,8 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="man_loc_area_rela";
- generator.tableDesc="loc areas rela";
+ generator.table="man_loc_area_mat_rela";
+ generator.tableDesc="loc areas mats rela";
generator.packagePath="com.vincent.rsf.server.manager";
generator.build();
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java
new file mode 100644
index 0000000..be23646
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java
@@ -0,0 +1,135 @@
+package com.vincent.rsf.server.manager.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.common.annotation.OperationLog;
+import com.vincent.rsf.server.common.domain.BaseParam;
+import com.vincent.rsf.server.common.domain.KeyValVo;
+import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.controller.params.LocAreaMatsParam;
+import com.vincent.rsf.server.manager.entity.LocAreaMatRela;
+import com.vincent.rsf.server.manager.service.LocAreaMatRelaService;
+import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
+@Api(tags = "搴撳尯鐗╂枡鍏崇郴缁戝畾")
+@RestController
+public class LocAreaMatRelaController extends BaseController {
+
+ @Autowired
+ private LocAreaMatRelaService locAreaMatRelaService;
+
+ @PreAuthorize("hasAuthority('manager:locAreaMatRela:list')")
+ @PostMapping("/locAreaMatRela/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<LocAreaMatRela, BaseParam> pageParam = new PageParam<>(baseParam, LocAreaMatRela.class);
+ return R.ok().add(locAreaMatRelaService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMatRela:list')")
+ @PostMapping("/locAreaMatRela/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(locAreaMatRelaService.list());
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMatRela:list')")
+ @PostMapping({"/locAreaMatRela/many/{ids}", "/locAreaMatRelas/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(locAreaMatRelaService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMatRela:list')")
+ @GetMapping("/locAreaMatRela/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(locAreaMatRelaService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMatRela:save')")
+ @OperationLog("Create loc areas mats rela")
+ @PostMapping("/locAreaMatRela/save")
+ public R save(@RequestBody LocAreaMatRela locAreaMatRela) {
+ locAreaMatRela.setCreateBy(getLoginUserId());
+ locAreaMatRela.setCreateTime(new Date());
+ locAreaMatRela.setUpdateBy(getLoginUserId());
+ locAreaMatRela.setUpdateTime(new Date());
+ if (!locAreaMatRelaService.save(locAreaMatRela)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(locAreaMatRela);
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMatRela:update')")
+ @OperationLog("Update loc areas mats rela")
+ @PostMapping("/locAreaMatRela/update")
+ public R update(@RequestBody LocAreaMatRela locAreaMatRela) {
+ locAreaMatRela.setUpdateBy(getLoginUserId());
+ locAreaMatRela.setUpdateTime(new Date());
+ if (!locAreaMatRelaService.updateById(locAreaMatRela)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(locAreaMatRela);
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMatRela:remove')")
+ @OperationLog("Delete loc areas mats rela")
+ @PostMapping("/locAreaMatRela/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!locAreaMatRelaService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMatRela:list')")
+ @PostMapping("/locAreaMatRela/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<LocAreaMatRela> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(LocAreaMatRela::getAreaId, condition);
+ }
+ locAreaMatRelaService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getAreaId()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMatRela:list')")
+ @PostMapping("/locAreaMatRela/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(locAreaMatRelaService.list(), LocAreaMatRela.class), response);
+ }
+
+ @PreAuthorize("hasAuthority('manager:locAreaMatRela:update')")
+ @PostMapping("/locAreaMatRela/matnr/bind")
+ @ApiOperation("鐗╂枡缁戝畾搴撳尯")
+ public R matnrBindArea(@RequestBody LocAreaMatsParam param) {
+ if (Objects.isNull(param)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(param.getAreaId())) {
+ throw new CoolException("搴撳尯涓嶈兘涓虹┖锛侊紒");
+ }
+ if (param.getLocId().isEmpty() || param.getTypeId().isEmpty()) {
+ throw new CoolException("搴撲綅绫诲瀷鎴栧簱浣嶄笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getGroupId()) || param.getMatnrId().isEmpty()) {
+ throw new CoolException("鐗╂枡鎴栫墿鏂欏垎绫讳笉鑳戒负绌猴紒锛�");
+ }
+ return locAreaMatRelaService.binMatnrs(param);
+ }
+
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java
index 49f2ff4..b273c77 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java
@@ -14,6 +14,7 @@
import com.vincent.rsf.server.manager.entity.MatnrGroup;
import com.vincent.rsf.server.manager.service.LocTypeService;
import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
@@ -22,6 +23,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+@Api(tags = "搴撲綅绫诲瀷")
@RestController
public class LocTypeController extends BaseController {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocAreaMatsParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocAreaMatsParam.java
new file mode 100644
index 0000000..514452a
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocAreaMatsParam.java
@@ -0,0 +1,35 @@
+package com.vincent.rsf.server.manager.controller.params;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Ryan
+ * @version 1.0
+ * @title LocAreaMatsParam
+ * @description
+ * @create 2025/3/22 10:58
+ */
+@Data
+@ApiModel(value = "LocAreaMatsParam", description = "搴撳尯鐗╂枡鍏崇郴缁戝畾")
+public class LocAreaMatsParam {
+
+ @ApiModelProperty("鐗╂枡ID")
+ private List<Long> matnrId;
+
+ @ApiModelProperty("鐗╂枡鍒嗙粍ID")
+ private Long groupId;
+
+ @ApiModelProperty("搴撳尯ID")
+ private Long areaId;
+
+ @ApiModelProperty("搴撲綅绫诲瀷")
+ private List<Long> typeId;
+
+ @ApiModelProperty("搴撲綅ID")
+ private List<Long> locId;
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java
new file mode 100644
index 0000000..5007896
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java
@@ -0,0 +1,221 @@
+package com.vincent.rsf.server.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.system.service.UserService;
+import com.vincent.rsf.server.system.entity.User;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+@TableName("man_loc_area_mat_rela")
+public class LocAreaMatRela implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鐗╂枡ID
+ */
+ @ApiModelProperty(value= "鐗╂枡ID")
+ private Long areaId;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ private String code;
+
+ /**
+ * 鐗╂枡ID
+ */
+ @ApiModelProperty(value= "鐗╂枡ID")
+ private Long matnrId;
+
+ /**
+ * 鐗╂枡鍒嗙粍ID
+ */
+ @ApiModelProperty(value= "鐗╂枡鍒嗙粍ID")
+ private Long groupId;
+
+ /**
+ * 搴撲綅绫诲瀷ID
+ */
+ @ApiModelProperty(value= "搴撲綅绫诲瀷ID")
+ private Long locTypeId;
+
+ /**
+ * 搴撲綅ID
+ */
+ @ApiModelProperty(value= "搴撲綅ID")
+ private Long locId;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 绉熸埛
+ */
+ @ApiModelProperty(value= "绉熸埛")
+ private Integer tenantId;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public LocAreaMatRela() {}
+
+ public LocAreaMatRela(Long areaId,String code,Long matnrId,Long groupId,Long locTypeId,Long locId,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.areaId = areaId;
+ this.code = code;
+ this.matnrId = matnrId;
+ this.groupId = groupId;
+ this.locTypeId = locTypeId;
+ this.locId = locId;
+ this.status = status;
+ this.deleted = deleted;
+ this.tenantId = tenantId;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// LocAreaMatRela locAreaMatRela = new LocAreaMatRela(
+// null, // 鐗╂枡ID
+// null, // 缂栧彿
+// null, // 鐗╂枡ID
+// null, // 鐗╂枡鍒嗙粍ID
+// null, // 搴撲綅绫诲瀷ID
+// null, // 搴撲綅ID
+// null, // 鐘舵�乕闈炵┖]
+// null, // 鏄惁鍒犻櫎[闈炵┖]
+// null, // 绉熸埛
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿[闈炵┖]
+// null // 澶囨敞
+// );
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "鍐荤粨";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+
+ public Boolean getStatusBool(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return true;
+ case 0:
+ return false;
+ default:
+ return null;
+ }
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocAreaMatRelaMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocAreaMatRelaMapper.java
new file mode 100644
index 0000000..793f1fc
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocAreaMatRelaMapper.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.mapper;
+
+import com.vincent.rsf.server.manager.entity.LocAreaMatRela;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface LocAreaMatRelaMapper extends BaseMapper<LocAreaMatRela> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocAreaMatRelaService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocAreaMatRelaService.java
new file mode 100644
index 0000000..a8d0b3c
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocAreaMatRelaService.java
@@ -0,0 +1,11 @@
+package com.vincent.rsf.server.manager.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.manager.controller.params.LocAreaMatsParam;
+import com.vincent.rsf.server.manager.entity.LocAreaMatRela;
+
+public interface LocAreaMatRelaService extends IService<LocAreaMatRela> {
+
+ R binMatnrs(LocAreaMatsParam param);
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java
new file mode 100644
index 0000000..f4d140a
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java
@@ -0,0 +1,110 @@
+package com.vincent.rsf.server.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.manager.controller.params.LocAreaMatsParam;
+import com.vincent.rsf.server.manager.entity.LocTypeRela;
+import com.vincent.rsf.server.manager.entity.Matnr;
+import com.vincent.rsf.server.manager.mapper.LocAreaMatRelaMapper;
+import com.vincent.rsf.server.manager.entity.LocAreaMatRela;
+import com.vincent.rsf.server.manager.service.LocAreaMatRelaService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vincent.rsf.server.manager.service.LocService;
+import com.vincent.rsf.server.manager.service.LocTypeRelaService;
+import com.vincent.rsf.server.manager.service.MatnrService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Service("locAreaMatRelaService")
+public class LocAreaMatRelaServiceImpl extends ServiceImpl<LocAreaMatRelaMapper, LocAreaMatRela> implements LocAreaMatRelaService {
+
+ @Autowired
+ private MatnrService matnrService;
+
+ @Autowired
+ private LocService locService;
+
+ @Autowired
+ private LocTypeRelaService locTypeRelaService;
+
+
+ /**
+ * @author Ryan
+ * @description 搴撳尯缁戝畾鐗╂枡
+ * @param
+ * @return
+ * @time 2025/3/22 11:32
+ */
+ @Override
+ public R binMatnrs(LocAreaMatsParam param) {
+ List<Matnr> matnrIds = new ArrayList<>();
+ if (!Objects.isNull(param.getGroupId())) {
+ List<Matnr> list = matnrService.list(new LambdaQueryWrapper<Matnr>().eq(Matnr::getGroupId, param.getGroupId()).select(Matnr::getId, Matnr::getGroupId));
+ if (list.isEmpty()) {
+ throw new CoolException("鐗╂枡鍒嗙粍娌℃湁鐗╂枡");
+ }
+ matnrIds.addAll(list);
+ }
+ if (!param.getMatnrId().isEmpty()) {
+ List<Matnr> matnrs = matnrService.list(new LambdaQueryWrapper<Matnr>()
+ .select(Matnr::getId, Matnr::getGroupId)
+ .in(Matnr::getId, param.getMatnrId()));
+ if (matnrs.isEmpty()) {
+ throw new CoolException("鐗╂枡涓嶅瓨鍦紒锛�");
+ }
+ matnrIds.addAll(matnrs);
+ }
+ List<LocAreaMatRela> locAreaMatRelas = new ArrayList<>();
+ if (!param.getTypeId().isEmpty()) {
+ for (Long typeId : param.getTypeId()) {
+ List<LocTypeRela> list = locTypeRelaService.list(new LambdaQueryWrapper<LocTypeRela>()
+ .select(LocTypeRela::getLocId).eq(LocTypeRela::getTypeId, typeId));
+ if (list.isEmpty()) {
+ continue;
+ }
+ List<Long> longs = list.stream().map(LocTypeRela::getLocId).collect(Collectors.toList());
+ for (Long locId : longs) {
+ for (Matnr matnrId : matnrIds) {
+ LocAreaMatRela locAreaMatRela = new LocAreaMatRela();
+ locAreaMatRela
+ .setAreaId(param.getAreaId())
+ .setLocId(locId)
+ .setLocTypeId(typeId)
+ .setMatnrId(matnrId.getId())
+ .setGroupId(matnrId.getGroupId());
+ locAreaMatRelas.add(locAreaMatRela);
+ }
+ }
+ }
+ }
+
+ if (!param.getLocId().isEmpty()) {
+ List<LocTypeRela> list = locTypeRelaService.list(new LambdaQueryWrapper<LocTypeRela>().in(LocTypeRela::getLocId, param.getTypeId()).select(LocTypeRela::getTypeId, LocTypeRela::getLocId));
+ if (list.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒锛氬簱浣嶆湭缁戝畾搴撲綅绫诲瀷锛侊紒");
+ }
+ for (LocTypeRela locTypeRela : list) {
+ for (Matnr matnr : matnrIds) {
+ LocAreaMatRela locAreaMatRela = new LocAreaMatRela();
+ locAreaMatRela
+ .setAreaId(param.getAreaId())
+ .setLocId(locTypeRela.getLocId())
+ .setLocTypeId(locTypeRela.getTypeId())
+ .setMatnrId(matnr.getId())
+ .setGroupId(matnr.getGroupId());
+ locAreaMatRelas.add(locAreaMatRela);
+ }
+ }
+ }
+ if (!this.saveBatch(locAreaMatRelas)) {
+ throw new CoolException("鐗╂枡搴撲綅绫诲瀷缁戝畾澶辫触锛侊紒");
+ }
+ return R.ok("缁戝畾鎴愬姛锛侊紒");
+ }
+}
diff --git a/rsf-server/src/main/java/locAreaMatRela.sql b/rsf-server/src/main/java/locAreaMatRela.sql
new file mode 100644
index 0000000..5c5e032
--- /dev/null
+++ b/rsf-server/src/main/java/locAreaMatRela.sql
@@ -0,0 +1,27 @@
+-- save locAreaMatRela record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.locAreaMatRela', '0', '/manager/locAreaMatRela', 'locAreaMatRela', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query loc areas mats rela', '', '1', 'manager:locAreaMatRela:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create loc areas mats rela', '', '1', 'manager:locAreaMatRela:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update loc areas mats rela', '', '1', 'manager:locAreaMatRela:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete loc areas mats rela', '', '1', 'manager:locAreaMatRela:remove', '3', '1', '1');
+
+-- locale menu name
+locAreaMatRela: 'LocAreaMatRela',
+
+-- locale field
+locAreaMatRela: {
+ areaId: "areaId",
+ code: "code",
+ matnrId: "matnrId",
+ groupId: "groupId",
+ locTypeId: "locTypeId",
+ locId: "locId",
+},
+
+-- ResourceContent
+import locAreaMatRela from './locAreaMatRela';
+
+case 'locAreaMatRela':
+ return locAreaMatRela;
diff --git a/rsf-server/src/main/resources/mapper/manager/LocAreaMatRelaMapper.xml b/rsf-server/src/main/resources/mapper/manager/LocAreaMatRelaMapper.xml
new file mode 100644
index 0000000..7d22dd0
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/manager/LocAreaMatRelaMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.vincent.rsf.server.manager.mapper.LocAreaMatRelaMapper">
+
+</mapper>
--
Gitblit v1.9.1