From 5c533fff987c6750e762ecffa807200a24ef366e Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 3 Apr 2024 13:41:50 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E4=BB=93=E5=BA=93=E3=80=81?= =?UTF-8?q?=E5=BA=93=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StIvtBsrealstorattrController.java | 35 +- .../controller/StIvtSectattrController.java | 53 ++- .../database/dto/SectQuery.java | 36 ++ .../database/mapper/StIvtSectattrMapper.java | 13 + .../mapper/xml/StIvtBsrealstorattrMapper.xml | 3 +- .../mapper/xml/StIvtSectattrMapper.xml | 23 ++ .../service/IStIvtBsrealstorattrService.java | 25 ++ .../service/IStIvtSectattrService.java | 33 ++ .../impl/StIvtBsrealstorattrServiceImpl.java | 85 +++++ .../impl/StIvtSectattrServiceImpl.java | 117 +++++++ .../src/views/wms/basedata/st/sect/index.vue | 324 ++++++++++++++++++ .../views/wms/basedata/st/sect/sectattr.js | 43 +++ .../src/views/wms/basedata/st/stor/index.vue | 40 ++- 13 files changed, 813 insertions(+), 17 deletions(-) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dto/SectQuery.java create mode 100644 lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue create mode 100644 lms/nladmin-ui/src/views/wms/basedata/st/sect/sectattr.js diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/controller/StIvtBsrealstorattrController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/controller/StIvtBsrealstorattrController.java index 410ae1d..f5dd2b9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/controller/StIvtBsrealstorattrController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/controller/StIvtBsrealstorattrController.java @@ -4,15 +4,14 @@ package org.nl.wms.storage_manage.database.controller; import com.alibaba.fastjson.JSONObject; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; +import org.nl.wms.storage_manage.database.dao.StIvtBsrealstorattr; import org.nl.wms.storage_manage.database.dto.StorQuery; import org.nl.wms.storage_manage.database.service.IStIvtBsrealstorattrService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -46,4 +45,32 @@ public class StIvtBsrealstorattrController { return new ResponseEntity<>(iStIvtBsrealstorattrService.getStor(whereJson), HttpStatus.OK); } + @PostMapping + @Log("新增仓库") + public ResponseEntity create(@Validated @RequestBody StIvtBsrealstorattr whereJson) { + iStIvtBsrealstorattrService.create(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PutMapping + @Log("修改仓库") + public ResponseEntity update(@Validated @RequestBody StIvtBsrealstorattr dao) { + iStIvtBsrealstorattrService.update(dao); + return new ResponseEntity<>(HttpStatus.OK); + } + + @DeleteMapping + @Log("删除仓库") + public ResponseEntity delete(@RequestBody Long[] ids) { + iStIvtBsrealstorattrService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PutMapping("/changeActive") + @Log("修改仓库管理状态") + public ResponseEntity changeActive(@Validated @RequestBody StIvtBsrealstorattr dao) { + iStIvtBsrealstorattrService.changeActive(dao); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/controller/StIvtSectattrController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/controller/StIvtSectattrController.java index e67e197..ee4fefb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/controller/StIvtSectattrController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/controller/StIvtSectattrController.java @@ -1,8 +1,17 @@ package org.nl.wms.storage_manage.database.controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.storage_manage.database.dao.StIvtBsrealstorattr; +import org.nl.wms.storage_manage.database.dao.StIvtSectattr; +import org.nl.wms.storage_manage.database.dto.SectQuery; +import org.nl.wms.storage_manage.database.service.IStIvtSectattrService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; /** *

@@ -16,4 +25,44 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/api/stIvtSectattr") public class StIvtSectattrController { + /** + * 库区服务 + */ + @Autowired + private IStIvtSectattrService iStIvtSectattrService; + + @GetMapping + @Log("查询库区") + public ResponseEntity query(SectQuery query, PageQuery page){ + return new ResponseEntity<>(iStIvtSectattrService.pageQuery(query,page), HttpStatus.OK); + } + + @PostMapping + @Log("新增库区") + public ResponseEntity create(@Validated @RequestBody StIvtSectattr dao) { + iStIvtSectattrService.create(dao); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PutMapping + @Log("修改库区") + public ResponseEntity update(@Validated @RequestBody StIvtSectattr dao) { + iStIvtSectattrService.update(dao); + return new ResponseEntity<>(HttpStatus.OK); + } + + @DeleteMapping + @Log("删除库区") + public ResponseEntity delete(@RequestBody Long[] ids) { + iStIvtSectattrService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PutMapping("/changeActive") + @Log("修改库区管理状态") + public ResponseEntity changeActive(@Validated @RequestBody StIvtSectattr dao) { + iStIvtSectattrService.changeActive(dao); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dto/SectQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dto/SectQuery.java new file mode 100644 index 0000000..5a24fa5 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dto/SectQuery.java @@ -0,0 +1,36 @@ +package org.nl.wms.storage_manage.database.dto; + +import lombok.Data; +import org.nl.common.domain.query.BaseQuery; +import org.nl.common.domain.query.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.storage_manage.database.dao.StIvtBsrealstorattr; + +/** + * 仓库查询条件 + * @author LXY + * @Date 2023/11/10 14:49 + */ +@Data +public class SectQuery extends BaseQuery { + + /** + * 仓库编码 + */ + private String stor_code; + + /** + * 仓库id + */ + private String stor_id; + + /** + * 库区编码 + */ + private String sect_code; + + @Override + public void paramMapping() { + super.doP.put("stor_code", QParam.builder().k(new String[]{"stor_code"}).type(QueryTEnum.LK).build()); + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/mapper/StIvtSectattrMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/mapper/StIvtSectattrMapper.java index 1c60f10..26d32b7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/mapper/StIvtSectattrMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/mapper/StIvtSectattrMapper.java @@ -1,7 +1,13 @@ package org.nl.wms.storage_manage.database.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.database.dao.StIvtSectattr; +import org.nl.wms.storage_manage.database.dto.SectQuery; + +import java.util.List; +import java.util.Map; /** *

@@ -13,4 +19,11 @@ import org.nl.wms.storage_manage.database.dao.StIvtSectattr; */ public interface StIvtSectattrMapper extends BaseMapper { + /** + * 分页查询 + * @param query：查询条件 + * @param pageQuery 分页 + * @return List + */ + List getPageQuery( @Param("query") SectQuery query, @Param("pageQuery") PageQuery pageQuery); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/mapper/xml/StIvtBsrealstorattrMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/mapper/xml/StIvtBsrealstorattrMapper.xml index 785b9dc..dad61c4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/mapper/xml/StIvtBsrealstorattrMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/mapper/xml/StIvtBsrealstorattrMapper.xml @@ -11,7 +11,8 @@ is_delete = '0' - and stor_code LIKE '%${query.stor_code}%' + and (stor_code LIKE '%${query.stor_code}%' + or stor_name LIKE '%${query.stor_code}%') diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/mapper/xml/StIvtSectattrMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/mapper/xml/StIvtSectattrMapper.xml index 4a07bf1..0574507 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/mapper/xml/StIvtSectattrMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/mapper/xml/StIvtSectattrMapper.xml @@ -2,4 +2,27 @@ + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/IStIvtBsrealstorattrService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/IStIvtBsrealstorattrService.java index 5fbe761..3ece97a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/IStIvtBsrealstorattrService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/IStIvtBsrealstorattrService.java @@ -40,4 +40,29 @@ public interface IStIvtBsrealstorattrService extends IService getStor(Map whereJson); + + /** + * 新增仓库 + * @param dao: 仓库实体类 + * + */ + void create(StIvtBsrealstorattr dao); + + /** + * 修改仓库 + * @param dao：仓库实体类 + */ + void update(StIvtBsrealstorattr dao); + + /** + * 删除仓库 + * @param ids：标识 + */ + void deleteAll(Long[] ids); + + /** + * 修改状态 + * @param dao： 仓库实体类 + */ + void changeActive(StIvtBsrealstorattr dao); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/IStIvtSectattrService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/IStIvtSectattrService.java index fc3b0f2..dc7f818 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/IStIvtSectattrService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/IStIvtSectattrService.java @@ -1,7 +1,9 @@ package org.nl.wms.storage_manage.database.service; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.storage_manage.database.dao.StIvtSectattr; +import org.nl.wms.storage_manage.database.dto.SectQuery; /** *

@@ -13,4 +15,35 @@ import org.nl.wms.storage_manage.database.dao.StIvtSectattr; */ public interface IStIvtSectattrService extends IService { + /** + * 查询库区 + * @param query 查询条件 + * @param page 分页查询 + * @return Object + */ + Object pageQuery(SectQuery query, PageQuery page); + + /** + * 新增库区 + * @param dao：库区实体 + */ + void create(StIvtSectattr dao); + + /** + * 修改库区 + * @param dao： 库区实体 + */ + void update(StIvtSectattr dao); + + /** + * 删除库区 + * @param ids + */ + void deleteAll(Long[] ids); + + /** + * 修改状态 + * @param dao + */ + void changeActive(StIvtSectattr dao); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/impl/StIvtBsrealstorattrServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/impl/StIvtBsrealstorattrServiceImpl.java index eae5eca..04f4bcf 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/impl/StIvtBsrealstorattrServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/impl/StIvtBsrealstorattrServiceImpl.java @@ -1,18 +1,26 @@ package org.nl.wms.storage_manage.database.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; import org.nl.wms.storage_manage.database.dao.StIvtBsrealstorattr; import org.nl.wms.storage_manage.database.dto.StorQuery; import org.nl.wms.storage_manage.database.mapper.StIvtBsrealstorattrMapper; import org.nl.wms.storage_manage.database.service.IStIvtBsrealstorattrService; +import org.nl.wms.storage_manage.ios.enums.IOSEnum; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; @@ -28,6 +36,7 @@ import java.util.Map; @Service public class StIvtBsrealstorattrServiceImpl extends ServiceImpl implements IStIvtBsrealstorattrService { + @Override public StIvtBsrealstorattr getById(Long storId) { if (ObjectUtil.isEmpty(this.baseMapper.selectById(storId))) { @@ -52,4 +61,80 @@ public class StIvtBsrealstorattrServiceImpl extends ServiceImpl getStor(Map whereJson) { return this.baseMapper.getStor(whereJson); } + + @Override + @Transactional(rollbackFor = Exception.class) + public void create(StIvtBsrealstorattr dao) { + StIvtBsrealstorattr isDao = this.getOne( + new QueryWrapper().lambda() + .eq(StIvtBsrealstorattr::getStor_code, dao.getStor_code()) + .eq(StIvtBsrealstorattr::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")) + ); + + if (ObjectUtil.isNotEmpty(isDao)) { + throw new BadRequestException("已存在相同编码的仓库【"+dao.getStor_code()+"】"); + } + + dao.setStor_id(IdUtil.getStringId()); + dao.setCreate_id(SecurityUtils.getCurrentUserId()); + dao.setCreate_name(SecurityUtils.getCurrentNickName()); + dao.setUpdate_optid(SecurityUtils.getCurrentUserId()); + dao.setUpdate_optname(SecurityUtils.getCurrentNickName()); + dao.setUpdate_time(DateUtil.now()); + dao.setCreate_time(DateUtil.now()); + + dao.setSyscompanyid(IOSEnum.IS_NOTANDYES.code("否")); + dao.setSysdeptid(IOSEnum.IS_NOTANDYES.code("否")); + dao.setSysownerid(IOSEnum.IS_NOTANDYES.code("否")); + + this.save(dao); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(StIvtBsrealstorattr dao) { + StIvtBsrealstorattr isDao = this.getById(dao.getStor_id()); + + if (isDao == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } + + dao.setUpdate_time(DateUtil.now()); + dao.setUpdate_optid(SecurityUtils.getCurrentUserId()); + dao.setUpdate_optname(SecurityUtils.getCurrentNickName()); + + this.updateById(dao); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteAll(Long[] ids) { + for (Long storId : ids) { + this.update( + new UpdateWrapper().lambda() + .set(StIvtBsrealstorattr::getIs_delete, IOSEnum.IS_NOTANDYES.code("是")) + .set(StIvtBsrealstorattr::getUpdate_optid, SecurityUtils.getCurrentUserId()) + .set(StIvtBsrealstorattr::getUpdate_optname, SecurityUtils.getCurrentNickName()) + .set(StIvtBsrealstorattr::getUpdate_time, DateUtil.now()) + .eq(StIvtBsrealstorattr::getStor_id, storId) + ); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void changeActive(StIvtBsrealstorattr dao) { + + String isUsed = IOSEnum.IS_NOTANDYES.code("是"); + if (StrUtil.equals(IOSEnum.IS_NOTANDYES.code("是"), dao.getIs_used())) { + isUsed = IOSEnum.IS_NOTANDYES.code("否"); + } + + dao.setIs_used(isUsed); + dao.setUpdate_time(DateUtil.now()); + dao.setUpdate_optid(SecurityUtils.getCurrentUserId()); + dao.setUpdate_optname(SecurityUtils.getCurrentNickName()); + this.updateById(dao); + + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/impl/StIvtSectattrServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/impl/StIvtSectattrServiceImpl.java index 2d6d101..701238c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/impl/StIvtSectattrServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/service/impl/StIvtSectattrServiceImpl.java @@ -1,10 +1,31 @@ package org.nl.wms.storage_manage.database.service.impl; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.nl.common.base.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.storage_manage.database.dao.StIvtBsrealstorattr; import org.nl.wms.storage_manage.database.dao.StIvtSectattr; +import org.nl.wms.storage_manage.database.dto.SectQuery; import org.nl.wms.storage_manage.database.mapper.StIvtSectattrMapper; +import org.nl.wms.storage_manage.database.service.IStIvtBsrealstorattrService; import org.nl.wms.storage_manage.database.service.IStIvtSectattrService; +import org.nl.wms.storage_manage.ios.enums.IOSEnum; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; /** *

@@ -17,4 +38,100 @@ import org.springframework.stereotype.Service; @Service public class StIvtSectattrServiceImpl extends ServiceImpl implements IStIvtSectattrService { + /** + * 仓库服务 + */ + @Autowired + private IStIvtBsrealstorattrService iStIvtBsrealstorattrService; + + @Override + public Object pageQuery(SectQuery query, PageQuery pageQuery) { + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + page.setOrderBy("create_time DESC"); + List mst_detail = this.baseMapper.getPageQuery(query, pageQuery); + + TableDataInfo build = TableDataInfo.build(mst_detail); + build.setTotalElements(page.getTotal()); + return build; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void create(StIvtSectattr dao) { + + StIvtSectattr isDao = this.getOne( + new QueryWrapper().lambda() + .eq(StIvtSectattr::getSect_code, dao.getSect_code()) + .eq(StIvtSectattr::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")) + ); + + if (ObjectUtil.isNotEmpty(isDao)) { + throw new BadRequestException("已存在相同编码的仓库【"+dao.getSect_code()+"】"); + } + + dao.setSect_id(IdUtil.getStringId()); + dao.setCreate_id(SecurityUtils.getCurrentUserId()); + dao.setCreate_name(SecurityUtils.getCurrentNickName()); + dao.setUpdate_optid(SecurityUtils.getCurrentUserId()); + dao.setUpdate_optname(SecurityUtils.getCurrentNickName()); + dao.setUpdate_time(DateUtil.now()); + dao.setCreate_time(DateUtil.now()); + + StIvtBsrealstorattr attrDao = iStIvtBsrealstorattrService.getById(dao.getStor_id()); + dao.setStor_type(attrDao.getStor_type_scode()); + this.save(dao); + + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(StIvtSectattr dao) { + + StIvtSectattr isDao = this.getById(dao.getSect_id()); + + if (isDao == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } + + dao.setUpdate_optid(SecurityUtils.getCurrentUserId()); + dao.setUpdate_optname(SecurityUtils.getCurrentNickName()); + dao.setUpdate_time(DateUtil.now()); + + StIvtBsrealstorattr attrDao = iStIvtBsrealstorattrService.getById(dao.getStor_id()); + dao.setStor_type(attrDao.getStor_type_scode()); + + this.updateById(dao); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteAll(Long[] ids) { + for (Long sectId : ids) { + this.update( + new UpdateWrapper().lambda() + .set(StIvtSectattr::getIs_delete, IOSEnum.IS_NOTANDYES.code("是")) + .set(StIvtSectattr::getUpdate_optid, SecurityUtils.getCurrentUserId()) + .set(StIvtSectattr::getUpdate_optname, SecurityUtils.getCurrentNickName()) + .set(StIvtSectattr::getUpdate_time, DateUtil.now()) + .eq(StIvtSectattr::getSect_id, sectId) + ); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void changeActive(StIvtSectattr dao) { + + String isUsed = IOSEnum.IS_NOTANDYES.code("是"); + if (StrUtil.equals(IOSEnum.IS_NOTANDYES.code("是"), dao.getIs_used())) { + isUsed = IOSEnum.IS_NOTANDYES.code("否"); + } + + dao.setIs_used(isUsed); + dao.setUpdate_time(DateUtil.now()); + dao.setUpdate_optid(SecurityUtils.getCurrentUserId()); + dao.setUpdate_optname(SecurityUtils.getCurrentNickName()); + this.updateById(dao); + + } } diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue new file mode 100644 index 0000000..d15d57f --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue @@ -0,0 +1,324 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/sect/sectattr.js b/lms/nladmin-ui/src/views/wms/basedata/st/sect/sectattr.js new file mode 100644 index 0000000..0c3a306 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/basedata/st/sect/sectattr.js @@ -0,0 +1,43 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/stIvtSectattr', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/stIvtSectattr/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/stIvtSectattr', + method: 'put', + data + }) +} + +export function getSect(params) { + return request({ + url: 'api/stIvtSectattr/getSect', + method: 'get', + params + }) +} + +export function changeActive(data) { + return request({ + url: 'api/stIvtSectattr/changeActive', + method: 'put', + data + }) +} + +export default { add, edit, del, getSect, changeActive } diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue index 454f48d..7094c4d 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue @@ -41,6 +41,11 @@ + + + + + @@ -89,13 +94,6 @@ - - - - - - - @@ -280,9 +278,6 @@ export default { stor_name: [ { required: true, message: '仓库名称不能为空', trigger: 'blur' } ], - sysdeptid: [ - { required: true, message: '所属部门不能为空', trigger: 'blur' } - ], stor_capacity: [ { required: false, message: '不能为空', trigger: 'blur' }, { validator: numberOne } @@ -358,6 +353,31 @@ export default { this.depts = date }) }, + buildDepts(depts) { + depts.forEach(data => { + if (data.children) { + this.buildDepts(data.children) + } + if (data.hasChildren && !data.children) { + data.children = null + } + }) + }, + loadDepts({ action, parentNode, callback }) { + if (action === LOAD_CHILDREN_OPTIONS) { + getDepts({ enabled: true, pid: parentNode.id }).then(res => { + parentNode.children = res.content.map(function(obj) { + if (obj.hasChildren) { + obj.children = null + } + return obj + }) + setTimeout(() => { + callback() + }, 200) + }) + } + }, // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { return true