diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/0/9/094339bed4ba4403f9b0c60c75ade3f6aa5e96bd b/wms_pro/hd/.idea/sonarlint/issuestore/0/9/094339bed4ba4403f9b0c60c75ade3f6aa5e96bd deleted file mode 100644 index 53f0cc80..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/0/9/094339bed4ba4403f9b0c60c75ade3f6aa5e96bd +++ /dev/null @@ -1,9 +0,0 @@ - -Q -java:S3740#"/Provide the parametrized type for this generic.(ُ8Ȑ1 -L -java:S3740-"/Provide the parametrized type for this generic.(8ɐ1 -Q -java:S37404"/Provide the parametrized type for this generic.(8ɐ1 -k java:S117#"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ُ -e java:S117;"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(h \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/1/b/1bd0fad6108c13d02e39735b623b7af835725dc9 b/wms_pro/hd/.idea/sonarlint/issuestore/1/b/1bd0fad6108c13d02e39735b623b7af835725dc9 deleted file mode 100644 index d3937d77..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/1/b/1bd0fad6108c13d02e39735b623b7af835725dc9 +++ /dev/null @@ -1,24 +0,0 @@ - -v java:S116!"\Rename this field "storagevehicle_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -r java:S116&"^Rename this field "storagevehicle_code" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(@ -s java:S116+"^Rename this field "storagevehicle_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ƀ -h java:S1160"SRename this field "one_code" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ѩ -m java:S1165"SRename this field "two_code" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -i java:S116:"TRename this field "rfid_code" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Ӎ -i java:S116?"TRename this field "create_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S116D"VRename this field "create_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S116I"VRename this field "create_time" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ه -n java:S116N"TRename this field "update_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S116S"VRename this field "update_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -k java:S116X"VRename this field "update_time" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -l java:S116^"RRename this field "is_used" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -s java:S116c"^Rename this field "storagevehicle_type" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -l java:S116h"XRename this field "vehicle_width" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(d -m java:S116n"YRename this field "vehicle_weight" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(j -q java:S116t"WRename this field "vehicle_long" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -m java:S116y"YRename this field "vehicle_height" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(I -t java:S116~"ZRename this field "overstruct_type" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ћ -q java:S116"[Rename this field "occupystruct_qty" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(پׅ -g java:S116"QRename this field "ext_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(񐽕 -A -java:S1128"+Remove this unused import 'java.util.Date'.( \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/2/a/2ad3fe4ba54e76946b9064e2e10aa26f43f04b61 b/wms_pro/hd/.idea/sonarlint/issuestore/2/a/2ad3fe4ba54e76946b9064e2e10aa26f43f04b61 deleted file mode 100644 index f5e84c76..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/2/a/2ad3fe4ba54e76946b9064e2e10aa26f43f04b61 +++ /dev/null @@ -1,4 +0,0 @@ - -Q -java:S3740"/Provide the parametrized type for this generic.(81 -k java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/3/9/393731eb48daaa1a5f73e039a1985a2f2e7261dd b/wms_pro/hd/.idea/sonarlint/issuestore/3/9/393731eb48daaa1a5f73e039a1985a2f2e7261dd deleted file mode 100644 index ce8b944b..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/3/9/393731eb48daaa1a5f73e039a1985a2f2e7261dd +++ /dev/null @@ -1,4 +0,0 @@ - -y java:S116"dRename this field "storagevehicle_code_begin" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -| java:S116"bRename this field "storagevehicle_code_end" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -s java:S116"^Rename this field "storagevehicle_type" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/4/c/4c8cfb9f6e3870061053a6e1c2ed8f7913178d04 b/wms_pro/hd/.idea/sonarlint/issuestore/4/c/4c8cfb9f6e3870061053a6e1c2ed8f7913178d04 deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/6/0/600228c110448d16e5738c74733e1807e77f1b53 b/wms_pro/hd/.idea/sonarlint/issuestore/6/0/600228c110448d16e5738c74733e1807e77f1b53 deleted file mode 100644 index 3a85a54c..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/6/0/600228c110448d16e5738c74733e1807e77f1b53 +++ /dev/null @@ -1,32 +0,0 @@ - -E -java:S37400"/Provide the parametrized type for this generic.( -o -java:S11927"TDefine a constant instead of duplicating this literal "storagevehicle_code" 3 times.( -k java:S117."QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(۟ -g java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -x -java:S1488"\Immediately return this expression instead of assigning it to the temporary variable "list".( - -java:S1488"\Immediately return this expression instead of assigning it to the temporary variable "json".(81 -] java:S125(""8Remove this useless assignment to local variable "code".(81 -Z -java:S1854A"8Remove this useless assignment to local variable "code".(81 -Z -java:S1854D"8Remove this useless assignment to local variable "code".(ܽ81 -U -java:S1854G"8Remove this useless assignment to local variable "code".(Ç81 -U -java:S1854J"8Remove this useless assignment to local variable "code".(81 -Z -java:S1854M"8Remove this useless assignment to local variable "code".(81 -F -java:S1481;")Remove this unused "code" local variable.(81 -< java:S131<""Add a default case to this switch.( -X java:S125U" + * 实物库属性表 前端控制器 + *

+ * + * @author author + * @since 2024-01-16 + */ +@RestController +@RequestMapping("/api/stIvtBsrealstorattr") +public class StIvtBsrealstorattrController { + + /** + * 仓库服务 + */ + @Autowired + private IStIvtBsrealstorattrService iStIvtBsrealstorattrService; + + @GetMapping + public ResponseEntity query(StorQuery query, PageQuery page){ + return new ResponseEntity<>(iStIvtBsrealstorattrService.pageQuery(query,page), HttpStatus.OK); + } + + @GetMapping("/getStor") + public ResponseEntity queryStor(@RequestParam Map whereJson) { + return new ResponseEntity<>(iStIvtBsrealstorattrService.getStor(whereJson), HttpStatus.OK); + } + + @PostMapping + public ResponseEntity create(@Validated @RequestBody StIvtBsrealstorattr whereJson) { + iStIvtBsrealstorattrService.create(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PutMapping + public ResponseEntity update(@Validated @RequestBody StIvtBsrealstorattr dao) { + iStIvtBsrealstorattrService.update(dao); + return new ResponseEntity<>(HttpStatus.OK); + } + + @DeleteMapping + public ResponseEntity delete(@RequestBody Long[] ids) { + iStIvtBsrealstorattrService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PutMapping("/changeActive") + public ResponseEntity changeActive(@Validated @RequestBody StIvtBsrealstorattr dao) { + iStIvtBsrealstorattrService.changeActive(dao); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/IStIvtBsrealstorattrService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/IStIvtBsrealstorattrService.java new file mode 100644 index 00000000..c4506a39 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/IStIvtBsrealstorattrService.java @@ -0,0 +1,68 @@ +package org.nl.wms.base_manage.bsrealstorattr.service; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.entity.PageQuery; +import org.nl.wms.base_manage.bsrealstorattr.service.dao.StIvtBsrealstorattr; +import org.nl.wms.base_manage.bsrealstorattr.service.dto.StorQuery; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 实物库属性表 服务类 + *

+ * + * @author author + * @since 2024-01-16 + */ +public interface IStIvtBsrealstorattrService extends IService { + + /** + * 根据仓库id搜索 + * @param storId / + * @return StIvtBsrealstorattr 实体类对象 + */ + StIvtBsrealstorattr getById(Long storId); + + /** + * 分页查询 + * @param query 查询条件 + * @param page 分页查询 + * @return Object + */ + Object pageQuery(StorQuery query, PageQuery page); + + /** + * 获取仓库下拉框 + * @param whereJson ： 查询条件 + * @return JSONObject + */ + List 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/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/dao/StIvtBsrealstorattr.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/dao/StIvtBsrealstorattr.java new file mode 100644 index 00000000..852273ba --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/dao/StIvtBsrealstorattr.java @@ -0,0 +1,189 @@ +package org.nl.wms.base_manage.bsrealstorattr.service.dao; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * 实物库属性表 + *

+ * + * @author author + * @since 2024-01-16 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("st_ivt_bsrealstorattr") +public class StIvtBsrealstorattr implements Serializable { + + private static final Long serialVersionUID = 1L; + + /** + * 仓库标识 + */ + @TableId + private String stor_id; + + /** + * 仓库编码 + */ + private String stor_code; + + /** + * 仓库名称 + */ + private String stor_name; + + /** + * 仓库简称 + */ + private String simple_name; + + /** + * 仓库容量 + */ + private BigDecimal stor_capacity; + + /** + * 总面积 + */ + private BigDecimal total_area; + + /** + * 仓库性质 + */ + private String stor_type_scode; + + /** + * 是否允许红冲 + */ + private Boolean is_reversed; + + /** + * 是否移出业务自动确认 + */ + private Boolean is_mvout_auto_cfm; + + /** + * 是否移入业务自动确认 + */ + private Boolean is_mvin_auto_cfm; + + /** + * 地区 + */ + private String area; + + /** + * 仓库地址 + */ + private String storea_ddress; + + /** + * 负责人 + */ + private String principal; + + /** + * 办公电话 + */ + private String office_phone; + + /** + * 负责人手机 + */ + private String mobile_no; + + /** + * 备注 + */ + private String remark; + + /** + * 显示顺序 + */ + private BigDecimal order_index; + + /** + * 状态 + */ + private String whstate_scode; + + /** + * 是否启用 + */ + private Boolean is_used; + + /** + * 物料基本分类 + */ + private String base_class_id; + + /** + * 创建人 + */ + private String create_id; + + /** + * 创建人姓名 + */ + private String create_name; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 修改人 + */ + private String update_id; + + /** + * 修改人姓名 + */ + private String update_name; + + /** + * 修改时间 + */ + private String update_time; + + /** + * 拥有者ID + */ + private String sysownerid; + + /** + * 部门ID + */ + private String sysdeptid; + + /** + * 公司ID + */ + private String syscompanyid; + + /** + * 外部标识 + */ + private String ext_id; + + /** + * 部门名称 + */ + private String depart_name; + + /** + * 公司名称 + */ + private String company_name; + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/dao/mapper/StIvtBsrealstorattrMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/dao/mapper/StIvtBsrealstorattrMapper.java new file mode 100644 index 00000000..59cb1668 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/dao/mapper/StIvtBsrealstorattrMapper.java @@ -0,0 +1,37 @@ +package org.nl.wms.base_manage.bsrealstorattr.service.dao.mapper; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.nl.common.domain.entity.PageQuery; +import org.nl.wms.base_manage.bsrealstorattr.service.dao.StIvtBsrealstorattr; +import org.nl.wms.base_manage.bsrealstorattr.service.dto.StorQuery; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 实物库属性表 Mapper 接口 + *

+ * + * @author author + * @since 2024-01-16 + */ +public interface StIvtBsrealstorattrMapper extends BaseMapper { + + /** + * 分页查询 + * @param query：查询条件 + * @param pageQuery 分页 + * @return List + */ + List getPageQuery(@Param("query") StorQuery query, @Param("pageQuery") PageQuery pageQuery); + + /** + * 获取仓库下拉框 + * @param whereJson：查询条件 + * @return List + */ + List getStor(Map whereJson); +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/dao/mapper/xml/StIvtBsrealstorattrMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/dao/mapper/xml/StIvtBsrealstorattrMapper.xml new file mode 100644 index 00000000..2c08669a --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/dao/mapper/xml/StIvtBsrealstorattrMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/dto/StorQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/dto/StorQuery.java new file mode 100644 index 00000000..eab2d823 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/dto/StorQuery.java @@ -0,0 +1,26 @@ +package org.nl.wms.base_manage.bsrealstorattr.service.dto; + +import lombok.Data; +import org.nl.common.domain.entity.BaseQuery; +import org.nl.common.domain.entity.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.base_manage.bsrealstorattr.service.dao.StIvtBsrealstorattr; + +/** + * 仓库查询条件 + * @author LXY + * @Date 2023/11/10 14:49 + */ +@Data +public class StorQuery extends BaseQuery { + + /** + * 仓库编码 + */ + private String stor_code; + + @Override + public void paramMapping() { + super.doP.put("stor_code", QParam.builder().k(new String[]{"stor_code"}).type(QueryTEnum.LK).build()); + } +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/impl/StIvtBsrealstorattrServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/impl/StIvtBsrealstorattrServiceImpl.java new file mode 100644 index 00000000..a85d2818 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/impl/StIvtBsrealstorattrServiceImpl.java @@ -0,0 +1,122 @@ +package org.nl.wms.base_manage.bsrealstorattr.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.entity.PageQuery; +import org.nl.common.domain.exception.BadRequestException; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.base_manage.bsrealstorattr.service.IStIvtBsrealstorattrService; +import org.nl.wms.base_manage.bsrealstorattr.service.dao.StIvtBsrealstorattr; +import org.nl.wms.base_manage.bsrealstorattr.service.dao.mapper.StIvtBsrealstorattrMapper; +import org.nl.wms.base_manage.bsrealstorattr.service.dto.StorQuery; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 实物库属性表 服务实现类 + *

+ * + * @author author + * @since 2024-01-16 + */ +@Service +public class StIvtBsrealstorattrServiceImpl extends ServiceImpl implements IStIvtBsrealstorattrService { + + + @Override + public StIvtBsrealstorattr getById(Long storId) { + if (ObjectUtil.isEmpty(this.baseMapper.selectById(storId))) { + throw new BadRequestException("仓库不存在,请检查!"); + } + + return this.baseMapper.selectById(storId); + } + + @Override + public Object pageQuery(StorQuery 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 + public List 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()) + ); + + 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_id(SecurityUtils.getCurrentUserId()); + dao.setUpdate_name(SecurityUtils.getCurrentNickName()); + dao.setUpdate_time(DateUtil.now()); + dao.setCreate_time(DateUtil.now()); + + dao.setSyscompanyid("0"); + dao.setSysdeptid("0"); + dao.setSysownerid("0"); + + 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_id(SecurityUtils.getCurrentUserId()); + dao.setUpdate_name(SecurityUtils.getCurrentNickName()); + + this.updateById(dao); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteAll(Long[] ids) { + for (Long storId : ids) { + this.removeById(storId); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void changeActive(StIvtBsrealstorattr dao) { + dao.setIs_used(dao.getIs_used()); + dao.setUpdate_time(DateUtil.now()); + dao.setUpdate_id(SecurityUtils.getCurrentUserId()); + dao.setUpdate_name(SecurityUtils.getCurrentNickName()); + this.updateById(dao); + } +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/controller/StIvtSectattrController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/controller/StIvtSectattrController.java new file mode 100644 index 00000000..6d703a20 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/controller/StIvtSectattrController.java @@ -0,0 +1,75 @@ +package org.nl.wms.base_manage.sect.controller; + + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; +import org.nl.common.domain.entity.PageQuery; +import org.nl.wms.base_manage.sect.service.IStIvtSectattrService; +import org.nl.wms.base_manage.sect.service.dao.StIvtSectattr; +import org.nl.wms.base_manage.sect.service.dto.SectQuery; +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.*; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 库区属性表 前端控制器 + *

+ * + * @author author + * @since 2024-01-16 + */ +@RestController +@RequestMapping("/api/stIvtSectattr") +public class StIvtSectattrController { + + /** + * 库区服务 + */ + @Autowired + private IStIvtSectattrService iStIvtSectattrService; + + @GetMapping + public ResponseEntity query(SectQuery query, PageQuery page) { + return new ResponseEntity<>(iStIvtSectattrService.pageQuery(query, page), HttpStatus.OK); + } + + @PostMapping + public ResponseEntity create(@Validated @RequestBody StIvtSectattr dao) { + iStIvtSectattrService.create(dao); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PutMapping + public ResponseEntity update(@Validated @RequestBody StIvtSectattr dao) { + iStIvtSectattrService.update(dao); + return new ResponseEntity<>(HttpStatus.OK); + } + + @DeleteMapping + public ResponseEntity delete(@RequestBody Long[] ids) { + iStIvtSectattrService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PutMapping("/changeActive") + public ResponseEntity changeActive(@Validated @RequestBody StIvtSectattr dao) { + iStIvtSectattrService.changeActive(dao); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @GetMapping("/getSect") + //("查询库区下拉框") + public ResponseEntity querySect() { + List list = iStIvtSectattrService.getSect(new JSONObject()); + return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); + } + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/IStIvtSectattrService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/IStIvtSectattrService.java new file mode 100644 index 00000000..3315dc5c --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/IStIvtSectattrService.java @@ -0,0 +1,60 @@ +package org.nl.wms.base_manage.sect.service; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.entity.PageQuery; +import org.nl.wms.base_manage.sect.service.dao.StIvtSectattr; +import org.nl.wms.base_manage.sect.service.dto.SectQuery; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 库区属性表 服务类 + *

+ * + * @author author + * @since 2024-01-16 + */ +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); + + /** + * 查询库区下拉选 + * @param json + * @return + */ + List getSect(JSONObject json); +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/dao/StIvtSectattr.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/dao/StIvtSectattr.java new file mode 100644 index 00000000..3714bab5 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/dao/StIvtSectattr.java @@ -0,0 +1,185 @@ +package org.nl.wms.base_manage.sect.service.dao; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * 库区属性表 + *

+ * + * @author author + * @since 2024-01-16 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("st_ivt_sectattr") +public class StIvtSectattr implements Serializable { + + private static final Long serialVersionUID = 1L; + + /** + * 库区标识 + */ + @TableId + private String sect_id; + + /** + * 库区编码 + */ + private String sect_code; + + /** + * 库区名称 + */ + private String sect_name; + + /** + * 库区简称 + */ + private String simple_name; + + /** + * 库区类型 + */ + private String sect_type_attr; + + /** + * 仓库标识 + */ + private String stor_id; + + /** + * 仓库类型 + */ + private String stor_type; + + /** + * 容量 + */ + private BigDecimal capacity; + + /** + * 宽度 + */ + private BigDecimal width; + + /** + * 高度 + */ + private BigDecimal height; + + /** + * 深度 + */ + private BigDecimal zdepth; + + /** + * 起始X坐标 + */ + private BigDecimal xqty; + + /** + * 起始Y坐标 + */ + private BigDecimal yqty; + + /** + * 起始Z坐标 + */ + private BigDecimal zqty; + + /** + * 负责人 + */ + private String sect_manager_name; + + /** + * 负责人电话 + */ + private String mobile_no; + + /** + * 备注 + */ + private String remark; + + /** + * 创建人 + */ + private String create_id; + + /** + * 创建人姓名 + */ + private String create_name; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 修改人 + */ + private String update_id; + + /** + * 修改人姓名 + */ + private String update_name; + + /** + * 修改时间 + */ + private String update_time; + + /** + * 是否删除 + */ + private String is_delete; + + /** + * 背景色 + */ + private String back_ground_color; + + /** + * 前景色 + */ + private String front_ground_color; + + /** + * 背景图片 + */ + private String back_ground_pic; + + /** + * 字体显示方向 + */ + private String font_direction_scode; + + /** + * 所在楼层 + */ + private BigDecimal floor_no; + + /** + * 是否启用 + */ + private String is_used; + + /** + * 外部标识 + */ + private String ext_id; + + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/dao/mapper/StIvtSectattrMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/dao/mapper/StIvtSectattrMapper.java new file mode 100644 index 00000000..f95bec44 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/dao/mapper/StIvtSectattrMapper.java @@ -0,0 +1,32 @@ +package org.nl.wms.base_manage.sect.service.dao.mapper; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.nl.common.domain.entity.PageQuery; +import org.nl.wms.base_manage.sect.service.dao.StIvtSectattr; +import org.nl.wms.base_manage.sect.service.dto.SectQuery; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 库区属性表 Mapper 接口 + *

+ * + * @author author + * @since 2024-01-16 + */ +public interface StIvtSectattrMapper extends BaseMapper { + + /** + * 分页查询 + * @param query：查询条件 + * @param pageQuery 分页 + * @return List + */ + List getPageQuery(@Param("query") SectQuery query, @Param("pageQuery") PageQuery pageQuery); + + List> getSectByStorQuery(Map query); +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/dao/mapper/xml/StIvtSectattrMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/dao/mapper/xml/StIvtSectattrMapper.xml new file mode 100644 index 00000000..7b0ac299 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/dao/mapper/xml/StIvtSectattrMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/dto/SectQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/dto/SectQuery.java new file mode 100644 index 00000000..a1087031 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/dto/SectQuery.java @@ -0,0 +1,38 @@ +package org.nl.wms.base_manage.sect.service.dto; + +import lombok.Data; +import org.nl.common.domain.entity.BaseQuery; +import org.nl.common.domain.entity.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.base_manage.bsrealstorattr.service.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; + + private String search; + + @Override + public void paramMapping() { + super.doP.put("stor_code", QParam.builder().k(new String[]{"stor_code"}).type(QueryTEnum.LK).build()); + } +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/impl/StIvtSectattrServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/impl/StIvtSectattrServiceImpl.java new file mode 100644 index 00000000..eedc5900 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/sect/service/impl/StIvtSectattrServiceImpl.java @@ -0,0 +1,162 @@ +package org.nl.wms.base_manage.sect.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.TableDataInfo; +import org.nl.common.domain.entity.PageQuery; +import org.nl.common.domain.exception.BadRequestException; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.base_manage.bsrealstorattr.service.IStIvtBsrealstorattrService; +import org.nl.wms.base_manage.bsrealstorattr.service.dao.StIvtBsrealstorattr; +import org.nl.wms.base_manage.sect.service.IStIvtSectattrService; +import org.nl.wms.base_manage.sect.service.dao.StIvtSectattr; +import org.nl.wms.base_manage.sect.service.dao.mapper.StIvtSectattrMapper; +import org.nl.wms.base_manage.sect.service.dto.SectQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + *

+ * 库区属性表 服务实现类 + *

+ * + * @author author + * @since 2024-01-16 + */ +@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, "0") + ); + + 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_id(SecurityUtils.getCurrentUserId()); + dao.setUpdate_name(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_id(SecurityUtils.getCurrentUserId()); + dao.setUpdate_name(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, "1") + .set(StIvtSectattr::getUpdate_id, SecurityUtils.getCurrentUserId()) + .set(StIvtSectattr::getUpdate_name, 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 = "1"; + if (StrUtil.equals("1", dao.getIs_used())) { + isUsed = "0"; + } + + dao.setIs_used(isUsed); + dao.setUpdate_time(DateUtil.now()); + dao.setUpdate_id(SecurityUtils.getCurrentUserId()); + dao.setUpdate_name(SecurityUtils.getCurrentNickName()); + this.updateById(dao); + } + + @Override + public List getSect(JSONObject json) { + List> sects = this.baseMapper.getSectByStorQuery(json); + Map>> groupBy_stor_id = sects.stream().collect(Collectors.groupingBy(a -> (String)((Map)a).get("stor_id"))); + List stor_ja = new ArrayList<>(); + for (Map.Entry>> entry : groupBy_stor_id.entrySet()) { + Map stor_cas = new HashMap<>(); + List> sectList = entry.getValue(); + stor_cas.put("value", entry.getKey()); + stor_cas.put("label", sectList.get(0).get("stor_name")); + List sect_ja = new ArrayList<>(); + for (Map map : sectList) { + Map sect_cas = new HashMap<>(); + sect_cas.put("value", String.valueOf(map.get("sect_id"))); + sect_cas.put("label", map.get("sect_name")); + sect_ja.add(sect_cas); + } + stor_cas.put("children", sect_ja); + stor_ja.add(stor_cas); + } + return stor_ja; + } +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java index 7bca272a..b8eeb91c 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java @@ -1,21 +1,64 @@ -package org.nl.wms.stor_manage.struct.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 仓位属性表 前端控制器 - *

- * - * @author generator - * @since 2024-04-08 - */ -@RestController -@RequestMapping("/stIvtStructattr") -public class StIvtStructattrController { - -} - +package org.nl.wms.stor_manage.struct.controller; + +import cn.hutool.core.date.DateUtil; +import org.nl.common.domain.entity.PageQuery; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService; +import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr; +import org.nl.wms.stor_manage.struct.service.dto.StructattrQuery; +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.*; + +/** + *

+ * 仓位属性表 前端控制器 + *

+ * + * @author generator + * @since 2024-04-08 + */ +@RestController +@RequestMapping("/api/structattr") +public class StIvtStructattrController { + + @Autowired + private IStIvtStructattrService structattrService; + + @GetMapping + public ResponseEntity query(StructattrQuery query, PageQuery page) { + return new ResponseEntity<>(structattrService.pageQuery(query,page), HttpStatus.OK); + } + + @PostMapping + public ResponseEntity create(@Validated @RequestBody StIvtStructattr dto) { + dto.setId(IdUtil.getStringId()); + dto.setCreate_id(SecurityUtils.getCurrentUserId()); + dto.setCreate_name(SecurityUtils.getCurrentNickName()); + dto.setCreate_time(DateUtil.now()); + structattrService.save(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + public ResponseEntity update(@Validated @RequestBody StIvtStructattr dto) { + structattrService.updateById(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @DeleteMapping + public ResponseEntity delete(@RequestBody Long[] ids) { + structattrService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PutMapping("/changeActive") + public ResponseEntity changeActive(@RequestBody StIvtStructattr dto) { + structattrService.changeActive(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java index 7ba4bb62..49006989 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java @@ -1,6 +1,7 @@ package org.nl.wms.stor_manage.struct.service; import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr; +import org.nl.common.domain.entity.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.wms.stor_manage.struct.service.dto.StructattrQuery; @@ -25,4 +26,9 @@ public interface IStIvtStructattrService extends IService { List> getByQuery(StructattrQuery query); void changeStruct(String struct_code,String vehicle_code,String task_type); + void deleteAll(Long[] ids); + + Object pageQuery(StructattrQuery query, PageQuery page); + + void changeActive(StIvtStructattr dto); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/StIvtStructattr.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/StIvtStructattr.java index ee4e12f5..32bdd602 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/StIvtStructattr.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/StIvtStructattr.java @@ -1,6 +1,8 @@ package org.nl.wms.stor_manage.struct.service.dao; import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.Data; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/StIvtStructattrMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/StIvtStructattrMapper.java index e4599ed5..cc45a741 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/StIvtStructattrMapper.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/StIvtStructattrMapper.java @@ -1,7 +1,13 @@ package org.nl.wms.stor_manage.struct.service.dao.mapper; import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr; +import org.apache.ibatis.annotations.Param; +import org.nl.common.domain.entity.PageQuery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.stor_manage.struct.service.dto.StructattrQuery; + +import java.util.List; +import java.util.Map; /** *

@@ -13,4 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface StIvtStructattrMapper extends BaseMapper { + List getPageQuery(@Param("query") StructattrQuery query, PageQuery pageQuery); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml index 2f80186d..598eddb3 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml @@ -2,4 +2,38 @@ + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java index 043c4242..1332176d 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java @@ -14,9 +14,13 @@ import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr; public class StructattrQuery extends BaseQuery { private String search; + private String stor_code; + private String sect_code; + private String lock_type; + private Boolean is_used; @Override public void paramMapping() { - super.doP.put("search", QParam.builder().k(new String[]{"unit_name"}).type(QueryTEnum.LK).build()); + super.doP.put("search", QParam.builder().k(new String[]{"struct_code"}).type(QueryTEnum.LK).build()); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java index 7faf08b8..4c423695 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java @@ -3,6 +3,10 @@ package org.nl.wms.stor_manage.struct.service.impl; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.entity.PageQuery; import org.nl.common.enums.StatusEnum; import org.nl.common.utils.IdUtil; import org.nl.wms.base_manage.vehicle.vehicleMater.service.IMdPbVehicleMaterService; @@ -37,11 +41,6 @@ public class StIvtStructattrServiceImpl extends ServiceImpl> getByQuery(StructattrQuery query) { - List> maps = this.listMaps(query.build()); - return maps; - } public static void main(String[] args) { Boolean in = StatusEnum.TASK_TYPE_IN.check("10"); @@ -78,4 +77,33 @@ public class StIvtStructattrServiceImpl extends ServiceImpl> getByQuery(StructattrQuery query) { + List> maps = this.listMaps(query.build()); + return maps; + } + + @Override + public void deleteAll(Long[] ids) { + for (Long id : ids) { + this.removeById(id); + } + } + + @Override + public Object pageQuery(StructattrQuery 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 + public void changeActive(StIvtStructattr dto) { + dto.setIs_used(dto.getIs_used()); + this.updateById(dto); + } + } diff --git a/wms_pro/qd/src/views/wms/base_manage/sect/index.vue b/wms_pro/qd/src/views/wms/base_manage/sect/index.vue new file mode 100644 index 00000000..300f6af3 --- /dev/null +++ b/wms_pro/qd/src/views/wms/base_manage/sect/index.vue @@ -0,0 +1,336 @@ + + + + + diff --git a/wms_pro/qd/src/views/wms/base_manage/sect/sectattr.js b/wms_pro/qd/src/views/wms/base_manage/sect/sectattr.js new file mode 100644 index 00000000..7a53bb3d --- /dev/null +++ b/wms_pro/qd/src/views/wms/base_manage/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() { + return request({ + url: 'api/stIvtSectattr/getSect', + method: 'get' + }) +} + + +export function changeActive(data) { + return request({ + url: 'api/stIvtSectattr/changeActive', + method: 'put', + data + }) +} + +export default { add, edit, del, getSect, changeActive } diff --git a/wms_pro/qd/src/views/wms/base_manage/stor/index.vue b/wms_pro/qd/src/views/wms/base_manage/stor/index.vue new file mode 100644 index 00000000..4a7b3bdb --- /dev/null +++ b/wms_pro/qd/src/views/wms/base_manage/stor/index.vue @@ -0,0 +1,368 @@ + + + + + diff --git a/wms_pro/qd/src/views/wms/base_manage/stor/storattr.js b/wms_pro/qd/src/views/wms/base_manage/stor/storattr.js new file mode 100644 index 00000000..a3eef932 --- /dev/null +++ b/wms_pro/qd/src/views/wms/base_manage/stor/storattr.js @@ -0,0 +1,43 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/stIvtBsrealstorattr', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/stIvtBsrealstorattr/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/stIvtBsrealstorattr', + method: 'put', + data + }) +} + +export function getStor(params) { + return request({ + url: 'api/stIvtBsrealstorattr/getStor', + method: 'get', + params + }) +} + +export function changeActive(data) { + return request({ + url: 'api/stIvtBsrealstorattr/changeActive', + method: 'put', + data + }) +} + +export default { add, edit, del, getStor, changeActive } diff --git a/wms_pro/qd/src/views/wms/base_manage/struct/index.vue b/wms_pro/qd/src/views/wms/base_manage/struct/index.vue new file mode 100644 index 00000000..ea3ae33b --- /dev/null +++ b/wms_pro/qd/src/views/wms/base_manage/struct/index.vue @@ -0,0 +1,482 @@ + + + + + diff --git a/wms_pro/qd/src/views/wms/base_manage/struct/structattr.js b/wms_pro/qd/src/views/wms/base_manage/struct/structattr.js new file mode 100644 index 00000000..55d6f627 --- /dev/null +++ b/wms_pro/qd/src/views/wms/base_manage/struct/structattr.js @@ -0,0 +1,51 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/structattr', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/structattr/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/structattr', + method: 'put', + data + }) +} + +export function changeActive(data) { + return request({ + url: 'api/structattr/changeActive', + method: 'put', + data + }) +} + +export function oneCreate(data) { + return request({ + url: 'api/structattr/oneCreate', + method: 'post', + data + }) +} + +export function blurQuery(data) { + return request({ + url: 'api/structattr/blurQuery', + method: 'post', + data + }) +} + +export default { add, edit, del, changeActive, oneCreate, blurQuery } diff --git a/wms_pro/qd/src/views/wms/flow_manage/logicflow/PropertySetting/StorInvTaskProperties.vue b/wms_pro/qd/src/views/wms/flow_manage/logicflow/PropertySetting/StorInvTaskProperties.vue index bf3ecf21..3eb7acda 100644 --- a/wms_pro/qd/src/views/wms/flow_manage/logicflow/PropertySetting/StorInvTaskProperties.vue +++ b/wms_pro/qd/src/views/wms/flow_manage/logicflow/PropertySetting/StorInvTaskProperties.vue @@ -50,6 +50,9 @@ + + + @@ -99,7 +102,8 @@ export default { skipExpression: '', form_type: '', passNode: true, - documentation: '' + documentation: '', + sourceData: '' }, rules: { id: [