root/hl_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add：仓库管理

Browse Source
This commit is contained in:
zhangzhiqiang
2023-09-01 10:11:27 +08:00
parent f83dc77f98
commit df9fdd85df
7 changed files with 91 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StorattrController.java
View File

@@ -5,12 +5,15 @@ package org.nl.wms.masterdata_manage.storage.controller.storage;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.TableDataInfo;
import org.nl.common.anno.Log;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery;
import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
import org.nl.wms.masterdata_manage.storage.service.storage.dto.StorattrQuery;
@@ -38,6 +41,13 @@ public class StorattrController {
protected IStIvtBsrealstorattrService stIvtBsrealstorattrService;
@GetMapping()
@Log("查询仓库")
//("查询仓库")
public ResponseEntity<Object> query(StorattrQuery query, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(stIvtBsrealstorattrService.page(page.build(), query.build())), HttpStatus.OK);
}
@PostMapping("/queryStor")
@Log("查询仓库")
//("查询仓库")

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dto/StorattrQuery.java
View File

@@ -22,6 +22,6 @@ public class StorattrQuery extends BaseQuery<StIvtBsrealstorattr> {
@Override
public void paramMapping() {
super.doP.put("search", QParam.builder().k(new String[]{"struct_code","struct_name"}).type(QueryTEnum.LK).build());
super.doP.put("search", QParam.builder().k(new String[]{"stor_code","stor_name"}).type(QueryTEnum.ORLK).build());
}
}

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/impl/StIvtBsrealstorattrServiceImpl.java
View File

@@ -68,7 +68,8 @@ public class StIvtBsrealstorattrServiceImpl extends ServiceImpl<StIvtBsrealstora
if (byId == null) {
throw new BadRequestException(form.getString("stor_id")+"被删除，操作失败!");
}
StIvtBsrealstorattr byCode = this.getOne(new QueryWrapper<StIvtBsrealstorattr>().eq("stor_code", form.getString("stor_code")));
StIvtBsrealstorattr byCode = this.getOne(new QueryWrapper<StIvtBsrealstorattr>()
.eq("stor_code", form.getString("stor_code")).ne("stor_name",form.getString("stor_name")));
if (byCode != null ) {
throw new BadRequestException(form.getString("stor_code")+"存在相同的仓库编号");
}

0
mes/hd/nladmin-system/src/main/resources/ 成品初始化.sql → mes/hd/nladmin-system/src/main/resources/sql/ 成品初始化.sql
View File

16
mes/hd/nladmin-system/src/main/resources/sql/0901维护.sql Normal file
View File

@@ -0,0 +1,16 @@
--仓库管理sql仓库类型枚举--
INSERT INTO `hl_one_mes`.`sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1697425596130398208', 'stor_type', '仓库性质', '虚拟库', '1', 0, NULL, NULL, NULL, NULL, '1694303357524643840', '管理员', '2023-09-01 09:46:13', '1694303357524643840', '管理员', '2023-09-01 09:46:13');
INSERT INTO `hl_one_mes`.`sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1697426120640696320', 'stor_type', '仓库性质', '半成品库', '2', 0, NULL, NULL, NULL, NULL, '1694303357524643840', '管理员', '2023-09-01 09:48:18', '1694303357524643840', '管理员', '2023-09-01 09:48:18');
INSERT INTO `hl_one_mes`.`sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1697426155990290432', 'stor_type', '仓库性质', '原材料库', '3', 0, NULL, NULL, NULL, NULL, '1694303357524643840', '管理员', '2023-09-01 09:48:26', '1694303357524643840', '管理员', '2023-09-01 09:48:26');
INSERT INTO `hl_one_mes`.`sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1697426215268388864', 'stor_type', '仓库性质', '成品库', '4', 0, NULL, NULL, NULL, NULL, '1694303357524643840', '管理员', '2023-09-01 09:48:41', '1694303357524643840', '管理员', '2023-09-01 09:48:41');
INSERT INTO `hl_one_mes`.`sys_dict`(`dict_id`, `code`, `name`, `label`, `value`, `dict_sort`, `dict_type`, `para1`, `para2`, `para3`, `create_id`, `create_name`, `create_time`, `update_id`, `update_name`, `update_time`) VALUES ('1697426251763027968', 'stor_type', '仓库性质', '备件库', '5', 0, NULL, NULL, NULL, NULL, '1694303357524643840', '管理员', '2023-09-01 09:48:49', '1694303357524643840', '管理员', '2023-09-01 09:48:49');