diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/ClassStandardController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/ClassStandardController.java index f469e82..43546ca 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/ClassStandardController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/ClassStandardController.java @@ -3,6 +3,8 @@ package org.nl.wms.basedata_manage.controller; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.common.base.TableDataInfo; +import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; import org.nl.wms.basedata_manage.service.IMdPbClassstandardService; import org.nl.wms.basedata_manage.service.dao.MdPbClassstandard; @@ -76,6 +78,13 @@ public class ClassStandardController { return new ResponseEntity<>(iMdPbClassstandardService.buildTree(superiorList), HttpStatus.OK); } + @GetMapping("/queryClassById") + @Log("查询分类基础列表") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity queryClassById(@RequestParam Map whereJson) { + return new ResponseEntity<>(iMdPbClassstandardService.queryClassById(whereJson), HttpStatus.OK); + } + @GetMapping("/getClassName") @Log("获取分类名称下拉框") public ResponseEntity getClassName() { @@ -88,4 +97,11 @@ public class ClassStandardController { return new ResponseEntity<>(iMdPbClassstandardService.queryClassBycode(whereJson), HttpStatus.OK); } + @GetMapping("/getClassTable") + @Log("查询物料基础类型") + //@PreAuthorize("@el.check('materialtype:list')") + public ResponseEntity queryClassTable(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(iMdPbClassstandardService.queryClassTable(whereJson, page)), HttpStatus.OK); + } + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/MaterialbaseController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/MaterialbaseController.java index 54406b9..f45506c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/MaterialbaseController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/MaterialbaseController.java @@ -1,12 +1,14 @@ package org.nl.wms.basedata_manage.controller; +import cn.hutool.core.map.MapUtil; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; +import org.nl.wms.basedata_manage.enums.MaterOptTypeEnum; import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService; import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase; import org.springframework.beans.factory.annotation.Autowired; @@ -68,6 +70,11 @@ public class MaterialbaseController { iMdMeMaterialbaseService.materialSync(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - + @Log("查询物料操作类型") + @PostMapping("/getMaterOptType") + public ResponseEntity getMaterOptType(@RequestBody Map map) { + String materOpt_code = MapUtil.getStr(map, "materOpt_code"); + return new ResponseEntity<>(MaterOptTypeEnum.getObj(materOpt_code), HttpStatus.OK); + } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/StructrelamaterialController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/StructrelamaterialController.java index 1a4a6a8..696b580 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/StructrelamaterialController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/StructrelamaterialController.java @@ -8,12 +8,8 @@ import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; import org.nl.wms.basedata_manage.service.StructrelamaterialService; -import org.nl.wms.basedata_manage.service.dao.Structrelamaterial; -import org.nl.wms.basedata_manage.service.dto.StructrelamaterialDto; -import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -36,20 +32,6 @@ public class StructrelamaterialController { return new ResponseEntity<>(TableDataInfo.build(structrelamaterialService.pageQuery(whereJson, page)),HttpStatus.OK); } - @PostMapping - @Log("新增物料存放设置") - public ResponseEntity create(@Validated @RequestBody Structrelamaterial dto){ - structrelamaterialService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改物料存放设置") - public ResponseEntity update(@Validated @RequestBody Structrelamaterial dto){ - structrelamaterialService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - @Log("删除物料存放设置") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -64,10 +46,4 @@ public class StructrelamaterialController { return new ResponseEntity<>(HttpStatus.CREATED); } - @PostMapping("/delSet") - @Log("删除物料存放设置") - public ResponseEntity delSet(@RequestBody Map whereJson){ - structrelamaterialService.delSet(whereJson); - return new ResponseEntity<>(HttpStatus.OK); - } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/enums/MaterOptTypeEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/enums/MaterOptTypeEnum.java new file mode 100644 index 0000000..a1af678 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/enums/MaterOptTypeEnum.java @@ -0,0 +1,88 @@ +package org.nl.wms.basedata_manage.enums; + +import com.alibaba.fastjson.JSONObject; + +/** + * 获取物料操作类型 + */ +public enum MaterOptTypeEnum { + QBWL(0, "00", "全部物料", "1943247496885178368", ""); + + + //顺序号 + private int index; + //编码 + private String code; + //名字 + private String name; + //分类标识串 + private String class_idStr; + //描述 + private String desc; + + public static JSONObject getObj(String code) { + for (MaterOptTypeEnum item : values()) { + if (item.getCode().equals(code)) { + JSONObject json=new JSONObject(); + json.put("index",item.getIndex()); + json.put("code",item.getCode()); + json.put("name",item.getName()); + json.put("class_idStr",item.getClass_idStr()); + json.put("desc",item.getDesc()); + return json; + } + } + + return null; + + } + + + private MaterOptTypeEnum(int index, String code, String name, String class_idStr, String desc) { + this.index = index; + this.code = code; + this.name = name; + this.class_idStr = class_idStr; + this.desc = desc; + } + + public String getClass_idStr() { + return class_idStr; + } + + public void setClass_idStr(String class_idStr) { + this.class_idStr = class_idStr; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + + public int getIndex() { + return index; + } + + public void setIndex(int index) { + this.index = index; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbClassstandardService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbClassstandardService.java index f5dc7e5..04d978b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbClassstandardService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbClassstandardService.java @@ -1,7 +1,9 @@ package org.nl.wms.basedata_manage.service; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.basedata_manage.service.dao.MdPbClassstandard; import org.springframework.data.domain.Pageable; @@ -66,6 +68,7 @@ public interface IMdPbClassstandardService extends IService { */ JSONObject buildTree(List superiorList); + JSONObject queryClassById(Map whereJson); /** * 获取分类名称下拉框 * @return List @@ -78,4 +81,21 @@ public interface IMdPbClassstandardService extends IService { * @return JSONObject */ JSONObject queryClassBycode(Map whereJson); + + IPage queryClassTable(Map whereJson, PageQuery page); + + /** + * 获取当前节点的所有子类节点集合数据 + * + * @param class_id + * @return + */ + List getChildIdSet(String class_id); + + /** + * 获取当前节点和其所有子类节点集合数据 + * @param class_id + * @return + */ + List getAllChildIdSet(String class_id); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/StructrelamaterialService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/StructrelamaterialService.java index b788309..ac73dc1 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/StructrelamaterialService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/StructrelamaterialService.java @@ -4,12 +4,7 @@ package org.nl.wms.basedata_manage.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.basedata_manage.service.dao.Structattr; import org.nl.wms.basedata_manage.service.dao.Structrelamaterial; -import org.nl.wms.basedata_manage.service.dto.StructrelamaterialDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; import java.util.Map; /** @@ -27,40 +22,6 @@ public interface StructrelamaterialService extends IService */ IPage pageQuery(Map whereJson, PageQuery page); - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param material_type_id ID - * @return Structrelamaterial - */ - Structrelamaterial findById(String material_type_id); - - /** - * 根据编码查询 - * @param code code - * @return Structrelamaterial - */ - Structrelamaterial findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(Structrelamaterial dto); - - /** - * 编辑 - * @param dto / - */ - void update(Structrelamaterial dto); - /** * 多选删除 * @param ids / @@ -69,6 +30,4 @@ public interface StructrelamaterialService extends IService void insertSet(Map whereJson); - void delSet(Map whereJson); - } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbClassstandard.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbClassstandard.java index 786157b..d7c992c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbClassstandard.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbClassstandard.java @@ -1,5 +1,6 @@ package org.nl.wms.basedata_manage.service.dao; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -118,4 +119,7 @@ public class MdPbClassstandard implements Serializable { */ private String update_time; + @TableField(exist = false) + private String address; + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structrelamaterial.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structrelamaterial.java index 5ed125d..1857207 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structrelamaterial.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/Structrelamaterial.java @@ -1,5 +1,6 @@ package org.nl.wms.basedata_manage.service.dao; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -26,4 +27,17 @@ public class Structrelamaterial implements Serializable { private String set_name; private String set_time; + + @TableField(exist = false) + private String sect_code; + + @TableField(exist = false) + private String sect_name; + + @TableField(exist = false) + private String class_code; + + @TableField(exist = false) + private String class_name; + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbClassstandardMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbClassstandardMapper.java index 8fa4ac3..4a4bd02 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbClassstandardMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbClassstandardMapper.java @@ -1,8 +1,12 @@ package org.nl.wms.basedata_manage.service.dao.mapper; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.nl.wms.basedata_manage.service.dao.MdPbClassstandard; +import java.util.List; + /** *

* 基础数据分类标准表 Mapper 接口 @@ -12,4 +16,6 @@ import org.nl.wms.basedata_manage.service.dao.MdPbClassstandard; * @since 2025-05-14 */ public interface MdPbClassstandardMapper extends BaseMapper { + + List getChildIdSet(@Param("param") String whereJson); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbClassstandardMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbClassstandardMapper.xml index a6d8bed..1544b21 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbClassstandardMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbClassstandardMapper.xml @@ -2,4 +2,21 @@ + + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructrelamaterialMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructrelamaterialMapper.java index 6907c9b..6b6e432 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructrelamaterialMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructrelamaterialMapper.java @@ -4,13 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.nl.wms.basedata_manage.service.dao.Structattr; -import org.nl.wms.basedata_manage.service.dao.StructattrVechielDto; import org.nl.wms.basedata_manage.service.dao.Structrelamaterial; import org.nl.wms.basedata_manage.service.dto.QueryPageParam; - import java.util.List; -import java.util.Map; /** * @author dsh @@ -19,7 +15,7 @@ import java.util.Map; @Mapper public interface StructrelamaterialMapper extends BaseMapper{ - IPage pagequery(IPage pages, @Param("paramMap") QueryPageParam paramMap); + IPage pagequery(IPage pages, @Param("paramMap") QueryPageParam paramMap, @Param("pointCodes") List classIds); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructrelamaterialMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructrelamaterialMapper.xml index 0016e1e..14a37de 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructrelamaterialMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructrelamaterialMapper.xml @@ -18,14 +18,15 @@ INNER JOIN st_ivt_sectattr se ON se.sect_id = sm.sect_id INNER JOIN md_pb_classstandard class ON class.class_id = sm.material_type_id where 1=1 - - AND (class.class_code like '%${paramMap.search}%' or class.class_name like '%${paramMap.search}%') - - - AND se.stor_id = '%${paramMap.stor_id}%' - - AND se.sect_id = '%${paramMap.sect_id}%' + AND sm.sect_id = #{paramMap.sect_id} + + + AND class.class_id IN + + #{code} + + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dto/QueryPageParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dto/QueryPageParam.java index af196db..ce3736f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dto/QueryPageParam.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dto/QueryPageParam.java @@ -3,6 +3,7 @@ package org.nl.wms.basedata_manage.service.dto; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @Author: lyd @@ -12,8 +13,7 @@ import java.io.Serializable; public class QueryPageParam implements Serializable { private String stor_id; private String sect_id; - private String classIds; - + private List classIds; private String search; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbClassstandardServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbClassstandardServiceImpl.java index 88f6bf2..3ae89eb 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbClassstandardServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbClassstandardServiceImpl.java @@ -4,24 +4,35 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.db.Db; +import cn.hutool.db.Entity; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.IdUtil; import org.nl.common.utils.PageUtil; import org.nl.common.utils.SecurityUtils; import org.nl.wms.basedata_manage.enums.BaseDataEnum; import org.nl.wms.basedata_manage.service.IMdPbClassstandardService; +import org.nl.wms.basedata_manage.service.dao.BsrealStorattrDto; import org.nl.wms.basedata_manage.service.dao.MdPbClassstandard; +import org.nl.wms.basedata_manage.service.dao.Structattr; +import org.nl.wms.basedata_manage.service.dao.mapper.BsrealStorattrMapper; import org.nl.wms.basedata_manage.service.dao.mapper.MdPbClassstandardMapper; import org.nl.wms.basedata_manage.service.dto.ClassstandardDto; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; +import javax.sql.DataSource; +import java.sql.SQLException; import java.util.*; import java.util.stream.Collectors; @@ -36,8 +47,11 @@ import java.util.stream.Collectors; @Service public class MdPbClassstandardServiceImpl extends ServiceImpl implements IMdPbClassstandardService { + @Resource + private MdPbClassstandardMapper mdPbClassstandardMapper; + @Override - public MapqueryAll(Map whereJson, Pageable page) { + public Map queryAll(Map whereJson, Pageable page) { // 查询所有分类 String class_code = MapUtil.getStr(whereJson, "class_code"); LambdaQueryWrapper lambda = new QueryWrapper().lambda(); @@ -306,6 +320,57 @@ public class MdPbClassstandardServiceImpl extends ServiceImpl lambda = new LambdaQueryWrapper<>(); + + String where = "1=1"; + + if (!StrUtil.isEmpty(whereStr)) { + where += whereStr; + } + if (StrUtil.isNotEmpty(class_idStr)) { + where += " AND class_id IN " + class_idStr; + lambda.in(MdPbClassstandard::getClass_id,class_idStr.split(",")); + } + if (!StrUtil.isEmpty(parent_class_id)) { + where = " AND parent_class_id = " + parent_class_id; + lambda.eq(MdPbClassstandard::getParent_class_id,parent_class_id); + } + lambda.orderByAsc(MdPbClassstandard::getClass_id); + + List daoList = this.list(lambda); + for (MdPbClassstandard dao : daoList) { + // 类型转换 + ClassstandardDto dto = JSONObject.parseObject(JSONObject.toJSONString(dao), ClassstandardDto.class); + + if (Integer.parseInt(dto.getSub_count()) > 0) { + dto.setHasChildren(true); + dto.setLeaf(false); + } else { + dto.setHasChildren(false); + dto.setLeaf(true); + } + dto.setId(dto.getClass_id()); + dto.setLabel(dto.getClass_name()); + dto.setCreate_user_name(dto.getCreate_name()); + dto.setUpdate_user_name(dto.getUpdate_optname()); + ja.add(JSONObject.toJSON(dto)); + } + jo.put("content", ja); + return jo; + } + @Override public List getClassName() { List daoList = this.list( @@ -398,4 +463,48 @@ public class MdPbClassstandardServiceImpl extends ServiceImpl queryClassTable(Map whereJson, PageQuery page) { + HashMap map = new HashMap<>(); + map.put("flag", "1"); + String material_type_id = (String) whereJson.get("material_type_id"); + String class_idStr = (String) whereJson.get("class_idStr"); + LambdaQueryWrapper lam = new LambdaQueryWrapper(); + //处理物料当前节点的所有子节点 + if (!StrUtil.isEmpty(material_type_id)) { + List classIds = this.getAllChildIdSet(material_type_id); + lam.in(MdPbClassstandard::getClass_id,classIds); + } else if (ObjectUtil.isNotEmpty(class_idStr)) { + List classIds = this.getAllChildIdSet(class_idStr); + lam.in(MdPbClassstandard::getClass_id,classIds); + } + Page pa = mdPbClassstandardMapper.selectPage(new Page(page.getPage() + 1 ,page.getSize()), lam); + + List list = pa.getRecords(); + List listnew = new ArrayList<>(); + for (int i = 0; i < list.size(); i++) { + MdPbClassstandard json = list.get(i); + if(!"0".equals(json.getParent_class_id())){ + MdPbClassstandard jsonParent = mdPbClassstandardMapper.selectById(json.getParent_class_id()); + json.setAddress(jsonParent.getClass_name()); + } + listnew.add(json); + } + pa.setRecords(listnew); + return pa; + } + + @Override + public List getChildIdSet(String class_id) { + return mdPbClassstandardMapper.getChildIdSet(class_id); + } + + @Override + public List getAllChildIdSet(String class_id) { + List ids = mdPbClassstandardMapper.getChildIdSet(class_id); + ids.add(class_id); + return ids; + } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/SectattrServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/SectattrServiceImpl.java index aafb40e..99284b3 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/SectattrServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/SectattrServiceImpl.java @@ -179,7 +179,7 @@ public class SectattrServiceImpl extends ServiceImpl i stor_cas.put("label", stor_jo.getStor_name()); List sectattrList = sectattrMapper.selectList(new LambdaQueryWrapper<>(Sectattr.class) - .select(Sectattr::getSect_code,Sectattr::getSect_name) + .select(Sectattr::getSect_id,Sectattr::getSect_name) .eq(StrUtil.isNotEmpty(stor_jo.getStor_id()),Sectattr::getStor_id,stor_jo.getStor_id()) .eq(StrUtil.isNotEmpty(sect_type_attr),Sectattr::getSect_type_attr,sect_type_attr) .eq(Sectattr::getIs_delete,BaseDataEnum.IS_YES_NOT.code("否")) @@ -191,7 +191,7 @@ public class SectattrServiceImpl extends ServiceImpl i for (int j = 0; j < sectattrList.size(); j++) { Sectattr sect_jo = sectattrList.get(j); JSONObject sect_cas = new JSONObject(); - sect_cas.put("value", sect_jo.getSect_code()); + sect_cas.put("value", sect_jo.getSect_id()); sect_cas.put("label", sect_jo.getSect_name()); sect_ja.add(sect_cas); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructrelamaterialServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructrelamaterialServiceImpl.java index 20f79b9..a65c263 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructrelamaterialServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructrelamaterialServiceImpl.java @@ -5,9 +5,7 @@ package org.nl.wms.basedata_manage.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,14 +14,12 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; -import org.nl.wms.basedata_manage.service.IStructattrService; +import org.nl.wms.basedata_manage.service.IMdPbClassstandardService; import org.nl.wms.basedata_manage.service.StructrelamaterialService; -import org.nl.wms.basedata_manage.service.dao.Structattr; import org.nl.wms.basedata_manage.service.dao.Structrelamaterial; -import org.nl.wms.basedata_manage.service.dao.mapper.StructattrMapper; import org.nl.wms.basedata_manage.service.dao.mapper.StructrelamaterialMapper; import org.nl.wms.basedata_manage.service.dto.QueryPageParam; -import org.springframework.data.domain.Pageable; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,71 +38,26 @@ public class StructrelamaterialServiceImpl extends ServiceImpl pageQuery(Map whereJson, PageQuery page) { - String search = (String) whereJson.get("search"); String material_type_id = (String) whereJson.get("material_type_id"); String class_idStr = (String) whereJson.get("class_idStr"); + QueryPageParam param = new QueryPageParam(); //处理物料当前节点的所有子节点 - if (!StrUtil.isEmpty(material_type_id)) { - //map.put("material_type_id", material_type_id); - //String classIds = classstandardService.getChildIdStr(material_type_id); - //map.put("classIds", classIds); + if (StrUtil.isNotEmpty(material_type_id)) { + List classIds = iMdPbClassstandardService.getAllChildIdSet(material_type_id); + param.setClassIds(classIds); } else if (ObjectUtil.isNotEmpty(class_idStr)) { - // String classIds = classstandardService.getAllChildIdStr(class_idStr); - //map.put("classIds", classIds); + List classIds = iMdPbClassstandardService.getAllChildIdSet(class_idStr); + param.setClassIds(classIds); } - QueryPageParam param = new QueryPageParam(); - param.setSearch(search); + param.setSect_id((String) whereJson.get("sect_id")); - param.setStor_id((String) whereJson.get("stor_id")); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); - return structrelamaterialMapper.pagequery(pages, param); - } - - @Override - public List queryAll(Map whereJson) { - List list = structrelamaterialMapper.selectList(null); - return list; - } - - @Override - public Structrelamaterial findById(String id) { - return structrelamaterialMapper.selectById(id); - } - - @Override - public Structrelamaterial findByCode(String code) { - return structrelamaterialMapper.selectById(code); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(Structrelamaterial dto) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - dto.setMaterset_id(IdUtil.getStringId()); - dto.setSet_id(currentUserId); - dto.setSet_name(nickName); - dto.setSet_time(now); - - structrelamaterialMapper.insert(dto); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(Structrelamaterial dto) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - dto.setSet_id(currentUserId); - dto.setSet_name(nickName); - dto.setSet_time(now); - - structrelamaterialMapper.updateById(dto); + return structrelamaterialMapper.pagequery(pages, param, param.getClassIds()); } @Override @@ -117,38 +68,37 @@ public class StructrelamaterialServiceImpl extends ServiceImpl class_rows = (ArrayList) whereJson.get("class_rows"); + for (int i = 0; i < class_rows.size(); i++) { HashMap class_row = class_rows.get(i); - JSONObject material_set = mater.query("sect_id = '" + sect_id + "' AND material_type_id = '" + class_row.get("class_id") + "'") - .uniqueResult(0); + LambdaQueryWrapper lambda = new LambdaQueryWrapper(); + lambda.eq(Structrelamaterial::getSect_id,sect_id); + lambda.eq(Structrelamaterial::getMaterial_type_id,class_row.get("class_id")); + Structrelamaterial material_set = structrelamaterialMapper.selectOne(lambda); if (material_set != null) { - HashMap update_map = new HashMap<>(); - update_map.put("set_id", currentUserId + ""); - update_map.put("set_name", nickName); - update_map.put("set_time", now); - mater.update(update_map, "sect_id = '" + sect_id + "' AND material_type_id = '" + class_row.get("class_id") + "'"); + material_set.setSet_id(currentUserId); + material_set.setSet_name(nickName); + material_set.setSet_time(now); + material_set.setSect_id(sect_id); + material_set.setMaterial_type_id(class_row.get("class_id")); + structrelamaterialMapper.updateById(material_set); } else { - JSONObject jo = new JSONObject(); - jo.put("sect_id", sect_id); - jo.put("material_type_id", class_row.get("class_id")); - jo.put("set_id", currentUserId + ""); - jo.put("set_name", nickName); - jo.put("set_time", now); - mater.insert(jo); + material_set = new Structrelamaterial(); + material_set.setSet_id(currentUserId); + material_set.setSet_name(nickName); + material_set.setSet_time(now); + material_set.setSect_id(sect_id); + material_set.setMaterial_type_id(class_row.get("class_id")); + material_set.setMaterset_id(IdUtil.getStringId()); + structrelamaterialMapper.insert(material_set); } - }*/ - } - - @Override - public void delSet(Map whereJson) { - String materset_id = (String) whereJson.get("materset_id"); - structrelamaterialMapper.deleteById(materset_id); + } } } diff --git a/nladmin-ui/src/i18n/langs/zh-CN.js b/nladmin-ui/src/i18n/langs/zh-CN.js index fb1109e..ef067db 100644 --- a/nladmin-ui/src/i18n/langs/zh-CN.js +++ b/nladmin-ui/src/i18n/langs/zh-CN.js @@ -2,7 +2,7 @@ export default { 'lang': 'zh', // 平台 'platform': { - 'title': 'c', + 'title': '富佳WMS', 'tip1': '用户名不能为空', 'tip2': '密码不能为空', 'tip3': '验证码不能为空' diff --git a/nladmin-ui/src/views/monitor/server/index.vue b/nladmin-ui/src/views/monitor/server/index.vue index 934d97f..f2f1980 100644 --- a/nladmin-ui/src/views/monitor/server/index.vue +++ b/nladmin-ui/src/views/monitor/server/index.vue @@ -14,7 +14,6 @@ import ECharts from 'vue-echarts' import 'echarts/lib/chart/line' import 'echarts/lib/component/polar' -import { initData } from '@/api/data' export default { name: 'ServerMonitor', components: { @@ -95,12 +94,12 @@ export default { } }, created() { - this.init() + /* this.init() this.monitor = window.setInterval(() => { setTimeout(() => { this.init() }, 2) - }, 3500) + }, 3500)*/ }, destroyed() { clearInterval(this.monitor) diff --git a/nladmin-ui/src/views/wms/basedata/materialSet/AddDialog.vue b/nladmin-ui/src/views/wms/basedata/materialSet/AddDialog.vue index ba6aeb2..a6a0663 100644 --- a/nladmin-ui/src/views/wms/basedata/materialSet/AddDialog.vue +++ b/nladmin-ui/src/views/wms/basedata/materialSet/AddDialog.vue @@ -4,7 +4,7 @@ append-to-body :visible.sync="dialogVisible" destroy-on-close - :show-close="false" + :show-close="true" width="60%" @close="close" > @@ -68,7 +68,7 @@