diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java new file mode 100644 index 00000000..5c6e2a75 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java @@ -0,0 +1,71 @@ +package org.nl.wms.dispatch_manage.point.controller; + + +import cn.hutool.core.date.DateUtil; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.entity.PageQuery; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.dispatch_manage.point.service.ISchBasePointService; +import org.nl.wms.dispatch_manage.point.service.dao.SchBasePoint; +import org.nl.wms.dispatch_manage.point.service.dto.SchBasePointQuery; +import org.nl.wms.dispatch_manage.region.service.ISchBaseRegionService; +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.Set; + +/** + *

+ * 点位基础表 前端控制器 + *

+ * + * @author generator + * @since 2024-06-12 + */ +@RestController +@RequestMapping("/api/point") +public class SchBasePointController { + @Autowired + private ISchBasePointService pointService; + @Autowired + private ISchBaseRegionService regionService; + + @GetMapping + public ResponseEntity query(SchBasePointQuery whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(pointService.page(page.build(SchBasePoint.class), whereJson.build())), HttpStatus.OK); + } + + @PostMapping + public ResponseEntity create(@Validated @RequestBody SchBasePoint entity) { + entity.setId(IdUtil.getStringId()); + entity.setCreate_name(SecurityUtils.getCurrentNickName()); + entity.setCreate_time(DateUtil.now()); + pointService.save(entity); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + public ResponseEntity update(@Validated @RequestBody SchBasePoint entity) { + entity.setUpdate_name(SecurityUtils.getCurrentNickName()); + entity.setUpdate_time(DateUtil.now()); + pointService.updateById(entity); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + + @DeleteMapping + public ResponseEntity delete(@RequestBody Set ids) { + pointService.removeByIds(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + @GetMapping("/getRegion") + public ResponseEntity getRegion() { + return new ResponseEntity<>(regionService.list(), HttpStatus.OK); + } +} + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/ISchBasePointService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/ISchBasePointService.java new file mode 100644 index 00000000..4d05ba9a --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/ISchBasePointService.java @@ -0,0 +1,16 @@ +package org.nl.wms.dispatch_manage.point.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.dispatch_manage.point.service.dao.SchBasePoint; + +/** + *

+ * 点位基础表 服务类 + *

+ * + * @author generator + * @since 2024-06-12 + */ +public interface ISchBasePointService extends IService { + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/SchBasePoint.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/SchBasePoint.java new file mode 100644 index 00000000..b6aa0c34 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/SchBasePoint.java @@ -0,0 +1,111 @@ +package org.nl.wms.dispatch_manage.point.service.dao; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 点位基础表 + *

+ * + * @author generator + * @since 2024-06-12 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("sch_base_point") +public class SchBasePoint implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 点位id + */ + private String id; + + /** + * 点位编码 + */ + private String code; + + /** + * 点位名称 + */ + private String name; + + /** + * 生产区域 + */ + private String product_area; + + /** + * 区域编码 + */ + private String region_code; + + /** + * 点位类型 + */ + private String point_type; + + /** + * 锁定类型 + */ + private String lock_type; + + /** + * 点位组编码 + */ + private String group_code; + + /** + * 位置 + */ + private String point_location; + + /** + * 备注 + */ + private String remark; + + /** + * 是否启用 + */ + private String is_used; + + /** + * 创建人 + */ + private String create_name; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 修改人 + */ + private String update_name; + + /** + * 修改时间 + */ + private String update_time; + + /** + * 表单数据 + */ + private String form_data; + + private String priority; + + /** + * 载具编码 + */ + private String vehicle_code; + + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/mapper/SchBasePointMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/mapper/SchBasePointMapper.java new file mode 100644 index 00000000..86a4cf20 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/mapper/SchBasePointMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.dispatch_manage.point.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.dispatch_manage.point.service.dao.SchBasePoint; + +/** + *

+ * 点位基础表 Mapper 接口 + *

+ * + * @author generator + * @since 2024-06-12 + */ +public interface SchBasePointMapper extends BaseMapper { + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/mapper/xml/SchBasePointMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/mapper/xml/SchBasePointMapper.xml new file mode 100644 index 00000000..db0f7873 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dao/mapper/xml/SchBasePointMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dto/SchBasePointQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dto/SchBasePointQuery.java new file mode 100644 index 00000000..c1c66ab5 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/dto/SchBasePointQuery.java @@ -0,0 +1,21 @@ +package org.nl.wms.dispatch_manage.point.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.dispatch_manage.point.service.dao.SchBasePoint; + +/** + * @author lyd + * @date 2023-05-15 + **/ +@Data +public class SchBasePointQuery extends BaseQuery { + private String search; + + @Override + public void paramMapping() { + super.doP.put("search", QParam.builder().k(new String[]{"point_code", "point_name"}).type(QueryTEnum.LK).build()); + } +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/impl/SchBasePointServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/impl/SchBasePointServiceImpl.java new file mode 100644 index 00000000..457a8f43 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/service/impl/SchBasePointServiceImpl.java @@ -0,0 +1,20 @@ +package org.nl.wms.dispatch_manage.point.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.dispatch_manage.point.service.ISchBasePointService; +import org.nl.wms.dispatch_manage.point.service.dao.SchBasePoint; +import org.nl.wms.dispatch_manage.point.service.dao.mapper.SchBasePointMapper; +import org.springframework.stereotype.Service; + +/** + *

+ * 点位基础表 服务实现类 + *

+ * + * @author generator + * @since 2024-06-12 + */ +@Service +public class SchBasePointServiceImpl extends ServiceImpl implements ISchBasePointService { + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/controller/SchBaseRegionController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/controller/SchBaseRegionController.java new file mode 100644 index 00000000..e46bcded --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/controller/SchBaseRegionController.java @@ -0,0 +1,66 @@ +package org.nl.wms.dispatch_manage.region.controller; + + +import cn.hutool.core.date.DateUtil; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.entity.PageQuery; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.dispatch_manage.region.service.ISchBaseRegionService; +import org.nl.wms.dispatch_manage.region.service.dao.SchBaseRegion; +import org.nl.wms.dispatch_manage.region.service.dto.SchBaseRegionQuery; +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.Set; + +/** + *

+ * 区域基础表 前端控制器 + *

+ * + * @author generator + * @since 2024-06-12 + */ +@RestController +@RequestMapping("/api/region") +public class SchBaseRegionController { + + @Autowired + private ISchBaseRegionService regionService; + + @GetMapping + public ResponseEntity query(SchBaseRegionQuery whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(regionService.page(page.build(SchBaseRegion.class), whereJson.build())), HttpStatus.OK); + } + + @PostMapping + public ResponseEntity create(@Validated @RequestBody SchBaseRegion entity) { + entity.setId(IdUtil.getStringId()); + entity.setCreate_name(SecurityUtils.getCurrentNickName()); + entity.setCreate_time(DateUtil.now()); + regionService.save(entity); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + public ResponseEntity update(@Validated @RequestBody SchBaseRegion entity) { + entity.setUpdate_name(SecurityUtils.getCurrentNickName()); + entity.setUpdate_time(DateUtil.now()); + regionService.updateById(entity); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + + @DeleteMapping + public ResponseEntity delete(@RequestBody Set ids) { + regionService.removeByIds(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + +} + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/service/ISchBaseRegionService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/service/ISchBaseRegionService.java new file mode 100644 index 00000000..cb1919f7 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/service/ISchBaseRegionService.java @@ -0,0 +1,15 @@ +package org.nl.wms.dispatch_manage.region.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.dispatch_manage.region.service.dao.SchBaseRegion; + +/** + *

+ * 区域基础表 服务类 + *

+ * + * @author generator + * @since 2024-06-12 + */ +public interface ISchBaseRegionService extends IService { +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/service/dao/SchBaseRegion.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/service/dao/SchBaseRegion.java new file mode 100644 index 00000000..bf1c6d38 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/service/dao/SchBaseRegion.java @@ -0,0 +1,86 @@ +package org.nl.wms.dispatch_manage.region.service.dao; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 区域基础表 + *

+ * + * @author generator + * @since 2024-06-12 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("sch_base_region") +public class SchBaseRegion implements Serializable { + + private static final long serialVersionUID = 1L; + + private String id; + + /** + * 是否合并下发任务0否1是 + */ + private String is_merge; + + /** + * 备注 + */ + private String remark; + + /** + * 创建人 + */ + private String create_name; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 修改人 + */ + private String update_name; + + /** + * 修改时间 + */ + private String update_time; + + /** + * 表单数据 + */ + private String form_data; + + /** + * 区域编码 + */ + private String code; + + /** + * 区域名称 + */ + private String name; + + /** + * 点位类型说明 + */ + private String type_explain; + + /** + * 点位状态说明 + */ + private String status_explain; + + /** + * 生产区域 + */ + private String product_area; + + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/service/dao/mapper/SchBaseRegionMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/service/dao/mapper/SchBaseRegionMapper.java new file mode 100644 index 00000000..e1e66dda --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/service/dao/mapper/SchBaseRegionMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.dispatch_manage.region.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.dispatch_manage.region.service.dao.SchBaseRegion; + +/** + *

+ * 区域基础表 Mapper 接口 + *

+ * + * @author generator + * @since 2024-06-12 + */ +public interface SchBaseRegionMapper extends BaseMapper { + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/service/dao/mapper/xml/SchBaseRegionMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/service/dao/mapper/xml/SchBaseRegionMapper.xml new file mode 100644 index 00000000..f2eaa412 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/service/dao/mapper/xml/SchBaseRegionMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/service/dto/SchBaseRegionQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/service/dto/SchBaseRegionQuery.java new file mode 100644 index 00000000..9007f014 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/service/dto/SchBaseRegionQuery.java @@ -0,0 +1,20 @@ +package org.nl.wms.dispatch_manage.region.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.dispatch_manage.region.service.dao.SchBaseRegion; + +/** + * @author lyd + * @date 2023-05-15 + **/ +@Data +public class SchBaseRegionQuery extends BaseQuery { + private String search; + @Override + public void paramMapping() { + super.doP.put("search", QParam.builder().k(new String[]{"code","name"}).type(QueryTEnum.LK).build()); + } +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/service/impl/SchBaseRegionServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/service/impl/SchBaseRegionServiceImpl.java new file mode 100644 index 00000000..8c510d93 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/service/impl/SchBaseRegionServiceImpl.java @@ -0,0 +1,21 @@ +package org.nl.wms.dispatch_manage.region.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.dispatch_manage.region.service.ISchBaseRegionService; +import org.nl.wms.dispatch_manage.region.service.dao.SchBaseRegion; +import org.nl.wms.dispatch_manage.region.service.dao.mapper.SchBaseRegionMapper; +import org.springframework.stereotype.Service; + +/** + *

+ * 区域基础表 服务实现类 + *

+ * + * @author generator + * @since 2024-06-12 + */ +@Service +public class SchBaseRegionServiceImpl extends ServiceImpl implements ISchBaseRegionService { + + +} diff --git a/wms_pro/qd/src/views/wms/dispatch_manage/point/index.vue b/wms_pro/qd/src/views/wms/dispatch_manage/point/index.vue new file mode 100644 index 00000000..5544e76f --- /dev/null +++ b/wms_pro/qd/src/views/wms/dispatch_manage/point/index.vue @@ -0,0 +1,430 @@ + + + + + diff --git a/wms_pro/qd/src/views/wms/dispatch_manage/point/point.js b/wms_pro/qd/src/views/wms/dispatch_manage/point/point.js new file mode 100644 index 00000000..82b04c1d --- /dev/null +++ b/wms_pro/qd/src/views/wms/dispatch_manage/point/point.js @@ -0,0 +1,80 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/point', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/point/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/point', + method: 'put', + data + }) +} + +export function findPoints(area_type) { + return request({ + url: 'api/point/area_type/' + area_type + }) +} + +export function changeActive(data) { + return request({ + url: 'api/point/changeActive', + method: 'put', + data + }) +} + +export function getPoint(data) { + return request({ + url: '/api/point/getPoint', + method: 'post', + data + }) +} + +export function changeUsed(data) { + return request({ + url: 'api/point/changeUsed', + method: 'post', + data: data + }) +} + +export function changeLock(data) { + return request({ + url: 'api/point/changeLock', + method: 'post', + data: data + }) +} + +export function outUnLock(data) { + return request({ + url: 'api/point/outUnLock', + method: 'post', + data: data + }) +} + +export function getRegion() { + return request({ + url: '/api/point/getRegion', + method: 'get' + }) +} + +export default {add, edit, del, changeActive, findPoints, getPoint, getRegion, changeUsed, changeLock, outUnLock} diff --git a/wms_pro/qd/src/views/wms/dispatch_manage/region/index.vue b/wms_pro/qd/src/views/wms/dispatch_manage/region/index.vue new file mode 100644 index 00000000..2a3b976f --- /dev/null +++ b/wms_pro/qd/src/views/wms/dispatch_manage/region/index.vue @@ -0,0 +1,214 @@ + + + + + diff --git a/wms_pro/qd/src/views/wms/dispatch_manage/region/region.js b/wms_pro/qd/src/views/wms/dispatch_manage/region/region.js new file mode 100644 index 00000000..6901b7ec --- /dev/null +++ b/wms_pro/qd/src/views/wms/dispatch_manage/region/region.js @@ -0,0 +1,69 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/region', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/region/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/region', + method: 'put', + data + }) +} + +export function changeActive(data) { + return request({ + url: 'api/region/changeActive', + method: 'put', + data + }) +} + +export function getPointStatusSelectByCode(code) { + return request({ + url: 'api/region/getPointStatusSelectByCode', + method: 'post', + data: code + }) +} + +export function getPointTypeSelectByCode(code) { + return request({ + url: 'api/region/getPointTypeSelectByCode', + method: 'post', + data: code + }) +} + +export function getRegionSelect(data) { + return request({ + url: 'api/region/getRegionSelect', + method: 'post', + data + }) +} + + + +export default { + add, + edit, + del, + changeActive, + getPointStatusSelectByCode, + getPointTypeSelectByCode, + getRegionSelect +}