From 4b3355a9446dee66777613f333267d18ee89cd55 Mon Sep 17 00:00:00 2001 From: siontion Date: Thu, 11 Jan 2024 10:28:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加 仓库设置 模块 --- .../yunxi/mes/module/heli/enums/CodeEnum.java | 2 +- .../module/heli/enums/ErrorCodeConstants.java | 6 + .../admin/warehouse/WarehouseController.java | 95 +++++++++++ .../warehouse/vo/WarehousePageReqVO.java | 50 ++++++ .../admin/warehouse/vo/WarehouseRespVO.java | 59 +++++++ .../warehouse/vo/WarehouseSaveReqVO.java | 33 ++++ .../dal/dataobject/warehouse/WarehouseDO.java | 53 ++++++ .../dal/mysql/warehouse/WarehouseMapper.java | 35 ++++ .../service/warehouse/WarehouseService.java | 55 ++++++ .../warehouse/WarehouseServiceImpl.java | 81 +++++++++ .../mapper/warehouse/WarehouseMapper.xml | 12 ++ .../src/api/heli/warehouse/index.ts | 40 +++++ .../src/views/heli/procedure/index.vue | 2 +- .../views/heli/warehouse/WarehouseForm.vue | 119 +++++++++++++ .../src/views/heli/warehouse/index.vue | 156 ++++++++++++++++++ 15 files changed, 796 insertions(+), 2 deletions(-) create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/WarehouseController.java create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/vo/WarehousePageReqVO.java create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/vo/WarehouseRespVO.java create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/vo/WarehouseSaveReqVO.java create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/warehouse/WarehouseDO.java create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/warehouse/WarehouseMapper.java create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/warehouse/WarehouseService.java create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/warehouse/WarehouseServiceImpl.java create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/warehouse/WarehouseMapper.xml create mode 100644 mes-ui/mes-ui-admin-vue3/src/api/heli/warehouse/index.ts create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/index.vue diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/CodeEnum.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/CodeEnum.java index c4a83506..5e83adcb 100644 --- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/CodeEnum.java +++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/CodeEnum.java @@ -30,7 +30,7 @@ public enum CodeEnum { CUSTOMER("客户", "Cus", 6), SUPPLIER("供应商", "Sup", 6), PROCEDURE("工序", "Prs", 6), - WAREHOUSE("仓库", "St", 4), + WAREHOUSE("仓库", "Wa", 4), ; diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java index 249721f6..74bda9a7 100644 --- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java +++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java @@ -31,4 +31,10 @@ public interface ErrorCodeConstants { ErrorCode WORKSHOP_NOT_EXISTS = new ErrorCode(1_002_001, "车间不存在"); ErrorCode CLASSES_NOT_EXISTS = new ErrorCode(1_002_002, "生产班组不存在"); ErrorCode MOULD_TYPE_NOT_EXISTS = new ErrorCode(1_002_003, "模具类型不存在"); + + /*********库存管理************/ + ErrorCode WAREHOUSE_NOT_EXISTS = new ErrorCode(1_003_001, "仓库不存在"); + + + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/WarehouseController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/WarehouseController.java new file mode 100644 index 00000000..078aaadd --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/WarehouseController.java @@ -0,0 +1,95 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.warehouse; + +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import javax.validation.constraints.*; +import javax.validation.*; +import javax.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; +import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; +import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success; + +import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils; + +import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog; +import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*; + +import com.chanko.yunxi.mes.module.heli.controller.admin.warehouse.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.warehouse.WarehouseDO; +import com.chanko.yunxi.mes.module.heli.service.warehouse.WarehouseService; + +@Tag(name = "管理后台 - 仓库") +@RestController +@RequestMapping("/heli/warehouse") +@Validated +public class WarehouseController { + + @Resource + private WarehouseService warehouseService; + + @PostMapping("/create") + @Operation(summary = "创建仓库") + @PreAuthorize("@ss.hasPermission('heli:warehouse:create')") + public CommonResult createWarehouse(@Valid @RequestBody WarehouseSaveReqVO createReqVO) { + return success(warehouseService.createWarehouse(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新仓库") + @PreAuthorize("@ss.hasPermission('heli:warehouse:update')") + public CommonResult updateWarehouse(@Valid @RequestBody WarehouseSaveReqVO updateReqVO) { + warehouseService.updateWarehouse(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除仓库") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('heli:warehouse:delete')") + public CommonResult deleteWarehouse(@RequestParam("id") Long id) { + warehouseService.deleteWarehouse(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得仓库") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('heli:warehouse:query')") + public CommonResult getWarehouse(@RequestParam("id") Long id) { + WarehouseDO warehouse = warehouseService.getWarehouse(id); + return success(BeanUtils.toBean(warehouse, WarehouseRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得仓库分页") + @PreAuthorize("@ss.hasPermission('heli:warehouse:query')") + public CommonResult> getWarehousePage(@Valid WarehousePageReqVO pageReqVO) { + PageResult pageResult = warehouseService.getWarehousePage(pageReqVO); + return success(BeanUtils.toBean(pageResult, WarehouseRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出仓库 Excel") + @PreAuthorize("@ss.hasPermission('heli:warehouse:export')") + @OperateLog(type = EXPORT) + public void exportWarehouseExcel(@Valid WarehousePageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = warehouseService.getWarehousePage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "仓库.xls", "数据", WarehouseRespVO.class, + BeanUtils.toBean(list, WarehouseRespVO.class)); + } + +} \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/vo/WarehousePageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/vo/WarehousePageReqVO.java new file mode 100644 index 00000000..693f7715 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/vo/WarehousePageReqVO.java @@ -0,0 +1,50 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.warehouse.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 仓库分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class WarehousePageReqVO extends PageParam { + + @Schema(description = "主键id", example = "18985") + private Long id; + + @Schema(description = "仓库编号，唯一") + private String whNo; + + @Schema(description = "仓库名称，唯一", example = "王五") + private String whName; + + @Schema(description = "联系人") + private String contact; + + @Schema(description = "联系电话") + private String telephone; + + @Schema(description = "状态,1 表示正常，2 表示禁用", example = "2") + private Integer whStatus; + + @Schema(description = "记录的创建人,对应员工表中的 Id") + private String creator; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "记录的修改人,对应员工表中的 Id") + private String updater; + + @Schema(description = "更新时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] updateTime; + +} \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/vo/WarehouseRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/vo/WarehouseRespVO.java new file mode 100644 index 00000000..060e5205 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/vo/WarehouseRespVO.java @@ -0,0 +1,59 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.warehouse.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; +import com.chanko.yunxi.mes.framework.excel.core.annotations.DictFormat; +import com.chanko.yunxi.mes.framework.excel.core.convert.DictConvert; + +@Schema(description = "管理后台 - 仓库 Response VO") +@Data +@ExcelIgnoreUnannotated +public class WarehouseRespVO { + + @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "18985") + @ExcelProperty("主键id") + private Long id; + + @Schema(description = "仓库编号，唯一") + @ExcelProperty("仓库编号，唯一") + private String whNo; + + @Schema(description = "仓库名称，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @ExcelProperty("仓库名称，唯一") + private String whName; + + @Schema(description = "联系人") + @ExcelProperty("联系人") + private String contact; + + @Schema(description = "联系电话") + @ExcelProperty("联系电话") + private String telephone; + + @Schema(description = "状态,1 表示正常，2 表示禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @ExcelProperty(value = "状态,1 表示正常，2 表示禁用", converter = DictConvert.class) + @DictFormat("heli_common_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 + private Integer whStatus; + + @Schema(description = "记录的创建人,对应员工表中的 Id", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("记录的创建人,对应员工表中的 Id") + private String creator; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "记录的修改人,对应员工表中的 Id") + @ExcelProperty("记录的修改人,对应员工表中的 Id") + private String updater; + + @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("更新时间") + private LocalDateTime updateTime; + +} \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/vo/WarehouseSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/vo/WarehouseSaveReqVO.java new file mode 100644 index 00000000..a48ff5bc --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/warehouse/vo/WarehouseSaveReqVO.java @@ -0,0 +1,33 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.warehouse.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; +import java.util.*; + +@Schema(description = "管理后台 - 仓库新增/修改 Request VO") +@Data +public class WarehouseSaveReqVO { + + @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "18985") + private Long id; + + @Schema(description = "仓库编号，唯一") + private String whNo; + + @Schema(description = "仓库名称，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @NotEmpty(message = "仓库名称，唯一不能为空") + private String whName; + + @Schema(description = "联系人") + private String contact; + + @Schema(description = "联系电话") + private String telephone; + + @Schema(description = "状态,1 表示正常，2 表示禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotNull(message = "状态,1 表示正常，2 表示禁用不能为空") + private Integer whStatus; + +} \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/warehouse/WarehouseDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/warehouse/WarehouseDO.java new file mode 100644 index 00000000..d7fa4170 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/warehouse/WarehouseDO.java @@ -0,0 +1,53 @@ +package com.chanko.yunxi.mes.module.heli.dal.dataobject.warehouse; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO; + +/** + * 仓库 DO + * + * @author 管理员 + */ +@TableName("wms_wh") +@KeySequence("wms_wh_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class WarehouseDO extends BaseDO { + + /** + * 主键id + */ + @TableId + private Long id; + /** + * 仓库编号，唯一 + */ + private String whNo; + /** + * 仓库名称，唯一 + */ + private String whName; + /** + * 联系人 + */ + private String contact; + /** + * 联系电话 + */ + private String telephone; + /** + * 状态,1 表示正常，2 表示禁用 + * + * 枚举 {@link TODO heli_common_status 对应的类} + */ + private Integer whStatus; + +} \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/warehouse/WarehouseMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/warehouse/WarehouseMapper.java new file mode 100644 index 00000000..b1395e92 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/warehouse/WarehouseMapper.java @@ -0,0 +1,35 @@ +package com.chanko.yunxi.mes.module.heli.dal.mysql.warehouse; + +import java.util.*; + +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.warehouse.WarehouseDO; +import org.apache.ibatis.annotations.Mapper; +import com.chanko.yunxi.mes.module.heli.controller.admin.warehouse.vo.*; + +/** + * 仓库 Mapper + * + * @author 管理员 + */ +@Mapper +public interface WarehouseMapper extends BaseMapperX { + + default PageResult selectPage(WarehousePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(WarehouseDO::getId, reqVO.getId()) + .likeIfPresent(WarehouseDO::getWhNo, reqVO.getWhNo()) + .likeIfPresent(WarehouseDO::getWhName, reqVO.getWhName()) + .eqIfPresent(WarehouseDO::getContact, reqVO.getContact()) + .eqIfPresent(WarehouseDO::getTelephone, reqVO.getTelephone()) + .eqIfPresent(WarehouseDO::getWhStatus, reqVO.getWhStatus()) + .eqIfPresent(WarehouseDO::getCreator, reqVO.getCreator()) + .betweenIfPresent(WarehouseDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(WarehouseDO::getUpdater, reqVO.getUpdater()) + .betweenIfPresent(WarehouseDO::getUpdateTime, reqVO.getUpdateTime()) + .orderByDesc(WarehouseDO::getId)); + } + +} \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/warehouse/WarehouseService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/warehouse/WarehouseService.java new file mode 100644 index 00000000..1e01e94c --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/warehouse/WarehouseService.java @@ -0,0 +1,55 @@ +package com.chanko.yunxi.mes.module.heli.service.warehouse; + +import java.util.*; +import javax.validation.*; +import com.chanko.yunxi.mes.module.heli.controller.admin.warehouse.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.warehouse.WarehouseDO; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; + +/** + * 仓库 Service 接口 + * + * @author 管理员 + */ +public interface WarehouseService { + + /** + * 创建仓库 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createWarehouse(@Valid WarehouseSaveReqVO createReqVO); + + /** + * 更新仓库 + * + * @param updateReqVO 更新信息 + */ + void updateWarehouse(@Valid WarehouseSaveReqVO updateReqVO); + + /** + * 删除仓库 + * + * @param id 编号 + */ + void deleteWarehouse(Long id); + + /** + * 获得仓库 + * + * @param id 编号 + * @return 仓库 + */ + WarehouseDO getWarehouse(Long id); + + /** + * 获得仓库分页 + * + * @param pageReqVO 分页查询 + * @return 仓库分页 + */ + PageResult getWarehousePage(WarehousePageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/warehouse/WarehouseServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/warehouse/WarehouseServiceImpl.java new file mode 100644 index 00000000..ca829e88 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/warehouse/WarehouseServiceImpl.java @@ -0,0 +1,81 @@ +package com.chanko.yunxi.mes.module.heli.service.warehouse; + +import cn.hutool.core.lang.UUID; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import com.chanko.yunxi.mes.module.heli.controller.admin.warehouse.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.warehouse.WarehouseDO; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; + +import com.chanko.yunxi.mes.module.heli.dal.mysql.warehouse.WarehouseMapper; + +import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.chanko.yunxi.mes.module.heli.enums.CodeEnum.SUPPLIER; +import static com.chanko.yunxi.mes.module.heli.enums.CodeEnum.WAREHOUSE; +import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*; + +/** + * 仓库 Service 实现类 + * + * @author 管理员 + */ +@Service +@Validated +public class WarehouseServiceImpl implements WarehouseService { + + @Resource + private WarehouseMapper warehouseMapper; + + @Override + public Long createWarehouse(WarehouseSaveReqVO createReqVO) { + // 插入 + WarehouseDO warehouse = BeanUtils.toBean(createReqVO, WarehouseDO.class); + warehouse.setWhNo(UUID.fastUUID().toString(true)); + warehouseMapper.insert(warehouse); + + warehouse.setWhNo(WAREHOUSE.getCode(warehouse.getId().toString())); + warehouseMapper.updateById(warehouse); + // 返回 + return warehouse.getId(); + } + + @Override + public void updateWarehouse(WarehouseSaveReqVO updateReqVO) { + // 校验存在 + validateWarehouseExists(updateReqVO.getId()); + // 更新 + WarehouseDO updateObj = BeanUtils.toBean(updateReqVO, WarehouseDO.class); + warehouseMapper.updateById(updateObj); + } + + @Override + public void deleteWarehouse(Long id) { + // 校验存在 + validateWarehouseExists(id); + // 删除 + warehouseMapper.deleteById(id); + } + + private void validateWarehouseExists(Long id) { + if (warehouseMapper.selectById(id) == null) { + throw exception(WAREHOUSE_NOT_EXISTS); + } + } + + @Override + public WarehouseDO getWarehouse(Long id) { + return warehouseMapper.selectById(id); + } + + @Override + public PageResult getWarehousePage(WarehousePageReqVO pageReqVO) { + return warehouseMapper.selectPage(pageReqVO); + } + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/warehouse/WarehouseMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/warehouse/WarehouseMapper.xml new file mode 100644 index 00000000..8c6d024a --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/warehouse/WarehouseMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/warehouse/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/warehouse/index.ts new file mode 100644 index 00000000..55f4a257 --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/warehouse/index.ts @@ -0,0 +1,40 @@ +import request from '@/config/axios' + +export interface WarehouseVO { + id: number + whNo: string + whName: string + contact: string + telephone: string + whStatus: number +} + +// 查询仓库分页 +export const getWarehousePage = async (params) => { + return await request.get({ url: `/heli/warehouse/page`, params }) +} + +// 查询仓库详情 +export const getWarehouse = async (id: number) => { + return await request.get({ url: `/heli/warehouse/get?id=` + id }) +} + +// 新增仓库 +export const createWarehouse = async (data: WarehouseVO) => { + return await request.post({ url: `/heli/warehouse/create`, data }) +} + +// 修改仓库 +export const updateWarehouse = async (data: WarehouseVO) => { + return await request.put({ url: `/heli/warehouse/update`, data }) +} + +// 删除仓库 +export const deleteWarehouse = async (id: number) => { + return await request.delete({ url: `/heli/warehouse/delete?id=` + id }) +} + +// 导出仓库 Excel +export const exportWarehouse = async (params) => { + return await request.download({ url: `/heli/warehouse/export-excel`, params }) +} \ No newline at end of file diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/procedure/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/procedure/index.vue index 8a20be35..b96230e5 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/procedure/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/procedure/index.vue @@ -9,7 +9,7 @@ - + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue new file mode 100644 index 00000000..a265c238 --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue @@ -0,0 +1,119 @@ + + \ No newline at end of file diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/index.vue new file mode 100644 index 00000000..657b6c96 --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/index.vue @@ -0,0 +1,156 @@ + + + \ No newline at end of file