diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/position/service/dto/CachelinePositionDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/position/service/dto/CachelinePositionDto.java index 2b65068f..78234925 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/position/service/dto/CachelinePositionDto.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/position/service/dto/CachelinePositionDto.java @@ -24,7 +24,7 @@ public class CachelinePositionDto implements Serializable { private BigDecimal positionOrder_no; /** 缓存线编码 */ - private String cacheLine_code; + private String cacheline_code; /** 缓存线层数 */ private BigDecimal layer_num; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/region/rest/CachelineRegionRelationController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/region/rest/CachelineRegionRelationController.java new file mode 100644 index 00000000..51573e20 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/region/rest/CachelineRegionRelationController.java @@ -0,0 +1,66 @@ +package org.nl.wms.cacheline.region.rest; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.anno.Log; +import org.nl.wms.cacheline.region.service.CachelineRegionRelationService; +import org.nl.wms.cacheline.region.service.dto.CachelineRegionRelationDto; +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; + +/** +* @author lyd +* @date 2023-03-24 +**/ +@RestController +@RequiredArgsConstructor +@Api(tags = "个缓存线区域关系管理") +@RequestMapping("/api/cachelineRegionRelation") +@Slf4j +public class CachelineRegionRelationController { + + private final CachelineRegionRelationService cachelineRegionRelationService; + + @GetMapping + @Log("查询个缓存线区域关系") + @ApiOperation("查询个缓存线区域关系") + //@PreAuthorize("@el.check('cachelineRegionRelation:list')") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ + return new ResponseEntity<>(cachelineRegionRelationService.queryAll(whereJson,page),HttpStatus.OK); + } + + @PostMapping + @Log("新增个缓存线区域关系") + @ApiOperation("新增个缓存线区域关系") + //@PreAuthorize("@el.check('cachelineRegionRelation:add')") + public ResponseEntity create(@Validated @RequestBody CachelineRegionRelationDto dto){ + cachelineRegionRelationService.create(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改个缓存线区域关系") + @ApiOperation("修改个缓存线区域关系") + //@PreAuthorize("@el.check('cachelineRegionRelation:edit')") + public ResponseEntity update(@Validated @RequestBody CachelineRegionRelationDto dto){ + cachelineRegionRelationService.update(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除个缓存线区域关系") + @ApiOperation("删除个缓存线区域关系") + //@PreAuthorize("@el.check('cachelineRegionRelation:del')") + @DeleteMapping + public ResponseEntity delete(@RequestBody String[] ids) { + cachelineRegionRelationService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/region/service/CachelineRegionRelationService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/region/service/CachelineRegionRelationService.java new file mode 100644 index 00000000..34c19773 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/region/service/CachelineRegionRelationService.java @@ -0,0 +1,64 @@ +package org.nl.wms.cacheline.region.service; + +import org.nl.wms.cacheline.region.service.dto.CachelineRegionRelationDto; +import org.springframework.data.domain.Pageable; + +import java.util.Map; +import java.util.List; + +/** +* @description 服务接口 +* @author lyd +* @date 2023-03-24 +**/ +public interface CachelineRegionRelationService { + + /** + * 查询数据分页 + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map queryAll(Map whereJson, Pageable page); + + /** + * 查询所有数据不分页 + * @param whereJson 条件参数 + * @return List + */ + List queryAll(Map whereJson); + + /** + * 根据ID查询 + * @param relation_id ID + * @return CachelineRegionRelation + */ + CachelineRegionRelationDto findById(String relation_id); + + /** + * 根据编码查询 + * @param code code + * @return CachelineRegionRelation + */ + CachelineRegionRelationDto findByCode(String code); + + + /** + * 创建 + * @param dto / + */ + void create(CachelineRegionRelationDto dto); + + /** + * 编辑 + * @param dto / + */ + void update(CachelineRegionRelationDto dto); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(String[] ids); + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/region/service/dto/CachelineRegionRelationDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/region/service/dto/CachelineRegionRelationDto.java new file mode 100644 index 00000000..d64e226c --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/region/service/dto/CachelineRegionRelationDto.java @@ -0,0 +1,49 @@ +package org.nl.wms.cacheline.region.service.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author lyd + * @description / + * @date 2023-03-24 + **/ +@Data +public class CachelineRegionRelationDto implements Serializable { + + /** + * 主键标识 + */ + private String relation_id; + + /** + * 区域编码 + */ + private String region_code; + + /** + * 缓存线编码 + */ + private String cacheline_code; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 更新时间 + */ + private String update_time; + + /** + * 是否可用 + */ + private String is_active; + + /** + * 是否删除 + */ + private String is_delete; +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/region/service/impl/CachelineRegionRelationServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/region/service/impl/CachelineRegionRelationServiceImpl.java new file mode 100644 index 00000000..f87c4aa8 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/region/service/impl/CachelineRegionRelationServiceImpl.java @@ -0,0 +1,123 @@ +package org.nl.wms.cacheline.region.service.impl; + +import com.alibaba.fastjson.JSON; +import lombok.RequiredArgsConstructor; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.wql.core.bean.ResultBean; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.util.WqlUtil; +import org.nl.wms.cacheline.region.service.CachelineRegionRelationService; +import org.nl.wms.cacheline.region.service.dto.CachelineRegionRelationDto; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import org.springframework.data.domain.Pageable; +import java.util.List; +import java.util.Map; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.nl.common.utils.SecurityUtils; + +import lombok.extern.slf4j.Slf4j; +import cn.hutool.core.util.ObjectUtil; + +/** +* @description 服务实现 +* @author lyd +* @date 2023-03-24 +**/ +@Service +@RequiredArgsConstructor +@Slf4j +public class CachelineRegionRelationServiceImpl implements CachelineRegionRelationService { + + @Override + public Map queryAll(Map whereJson, Pageable page){ + WQLObject wo = WQLObject.getWQLObject("sch_cacheline_region_relation"); + String where = "1 = 1"; + if (ObjectUtil.isNotEmpty(whereJson.get("search"))){ + String search = whereJson.get("search").toString(); + where = "region_code like '%" + search + "%' " + + "OR cacheline_code like '%" + search + "%'"; + } + ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), where, "region_code, cacheline_code"); + final JSONObject json = rb.pageResult(); + return json; + } + + @Override + public List queryAll(Map whereJson){ + WQLObject wo = WQLObject.getWQLObject("sch_cacheline_region_relation"); + JSONArray arr = wo.query().getResultJSONArray(0); + if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(CachelineRegionRelationDto.class); + return null; + } + + @Override + public CachelineRegionRelationDto findById(String relation_id) { + WQLObject wo = WQLObject.getWQLObject("sch_cacheline_region_relation"); + JSONObject json = wo.query("relation_id = '" + relation_id + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(json)){ + return json.toJavaObject( CachelineRegionRelationDto.class); + } + return null; + } + + @Override + public CachelineRegionRelationDto findByCode(String code) { + WQLObject wo = WQLObject.getWQLObject("sch_cacheline_region_relation"); + JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(json)){ + return json.toJavaObject( CachelineRegionRelationDto.class); + } + return null; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void create(CachelineRegionRelationDto dto) { + dto.setRelation_id(IdUtil.getSnowflake(1, 1).nextIdStr()); + dto.setUpdate_time(DateUtil.now()); + dto.setCreate_time(DateUtil.now()); + + WQLObject wo = WQLObject.getWQLObject("sch_cacheline_region_relation"); + JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); + wo.insert(json); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(CachelineRegionRelationDto dto) { + CachelineRegionRelationDto entity = this.findById(dto.getRelation_id()); + if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + + dto.setUpdate_time(DateUtil.now()); + + WQLObject wo = WQLObject.getWQLObject("sch_cacheline_region_relation"); + JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); + wo.update(json); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteAll(String[] ids) { + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + + + WQLObject wo = WQLObject.getWQLObject("sch_cacheline_region_relation"); + for (String relation_id: ids) { + JSONObject param = new JSONObject(); + param.put("relation_id", String.valueOf(relation_id)); + param.put("is_delete", "1"); + param.put("update_optid", currentUserId); + param.put("update_optname", nickName); + param.put("update_time", DateUtil.now()); + wo.update(param); + } + } + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java index 93b83107..199662f4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java @@ -13,6 +13,7 @@ import cn.hutool.poi.excel.ExcelUtil; 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.conditions.query.QueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -71,8 +72,10 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService { String product_area = MapUtil.getStr(whereJson, "product_area"); String product_series = ""; // 员工只能看到自己创建的工单 + String currentUsername = SecurityUtils.getCurrentUsername(); + SysUser one = userService.getOne(new LambdaQueryWrapper().eq(SysUser::getUsername, currentUsername)); String currentUserId = ""; - if (!SecurityUtils.getCurrentUsername().equals("admin")) currentUserId = SecurityUtils.getCurrentUserId(); + if (!one.getIsAdmin()) currentUserId = SecurityUtils.getCurrentUserId(); JSONObject map = new JSONObject(); map.put("flag", "1"); //map.put("order_status", order_status); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls index ac076407..7df0c7d0 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls differ diff --git a/mes/qd/src/api/wms/cacheline/region/cachelineRegionRelation.js b/mes/qd/src/api/wms/cacheline/region/cachelineRegionRelation.js new file mode 100644 index 00000000..a354bf67 --- /dev/null +++ b/mes/qd/src/api/wms/cacheline/region/cachelineRegionRelation.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/cachelineRegionRelation', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/cachelineRegionRelation/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/cachelineRegionRelation', + method: 'put', + data + }) +} + +export default { add, edit, del } diff --git a/mes/qd/src/views/wms/basedata/master/storagevehicleinfo/index.vue b/mes/qd/src/views/wms/basedata/master/storagevehicleinfo/index.vue index a4cd92a9..39675a6d 100644 --- a/mes/qd/src/views/wms/basedata/master/storagevehicleinfo/index.vue +++ b/mes/qd/src/views/wms/basedata/master/storagevehicleinfo/index.vue @@ -140,7 +140,7 @@ diff --git a/mes/qd/src/views/wms/cacheline/position/index.vue b/mes/qd/src/views/wms/cacheline/position/index.vue index 2a34d66f..5032cc9e 100644 --- a/mes/qd/src/views/wms/cacheline/position/index.vue +++ b/mes/qd/src/views/wms/cacheline/position/index.vue @@ -69,8 +69,8 @@ - - + + @@ -152,7 +152,7 @@ - + @@ -161,7 +161,6 @@ - + + + +