Merge remote-tracking branch 'origin/dev' into dev

mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java

@@ -36,7 +36,6 @@ public interface ErrorCodeConstants {
     ErrorCode WAREHOUSE_NOT_EXISTS = new ErrorCode(1_003_001, "仓库不存在");
     ErrorCode RG_NOT_EXISTS = new ErrorCode(1_003_002, "库区不存在");
     ErrorCode PN_NOT_EXISTS = new ErrorCode(1_003_003, "库位不存在");
-
+    ErrorCode Storage_NOT_EXISTS = new ErrorCode(1_003_004,"库存不存在");
-
 
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java

@@ -0,0 +1,95 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.storage;
+
+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.storage.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storage.StorageDO;
+import com.chanko.yunxi.mes.module.heli.service.storage.StorageService;
+
+@Tag(name = "管理后台 - 入/出库")
+@RestController
+@RequestMapping("/heli/storage")
+@Validated
+public class StorageController {
+
+    @Resource
+    private StorageService storageService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建入/出库")
+    @PreAuthorize("@ss.hasPermission('heli:storage:create')")
+    public CommonResult<Long> createStorage(@Valid @RequestBody StorageSaveReqVO createReqVO) {
+        return success(storageService.createStorage(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新入/出库")
+    @PreAuthorize("@ss.hasPermission('heli:storage:update')")
+    public CommonResult<Boolean> updateStorage(@Valid @RequestBody StorageSaveReqVO updateReqVO) {
+        storageService.updateStorage(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除入/出库")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('heli:storage:delete')")
+    public CommonResult<Boolean> deleteStorage(@RequestParam("id") Long id) {
+        storageService.deleteStorage(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得入/出库")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('heli:storage:query')")
+    public CommonResult<StorageRespVO> getStorage(@RequestParam("id") Long id) {
+        StorageDO storage = storageService.getStorage(id);
+        return success(BeanUtils.toBean(storage, StorageRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得入/出库分页")
+    @PreAuthorize("@ss.hasPermission('heli:storage:query')")
+    public CommonResult<PageResult<StorageRespVO>> getStoragePage(@Valid StoragePageReqVO pageReqVO) {
+        PageResult<StorageDO> pageResult = storageService.getStoragePage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, StorageRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出入/出库 Excel")
+    @PreAuthorize("@ss.hasPermission('heli:storage:export')")
+    @OperateLog(type = EXPORT)
+    public void exportStorageExcel(@Valid StoragePageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<StorageDO> list = storageService.getStoragePage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "入/出库.xls", "数据", StorageRespVO.class,
+                        BeanUtils.toBean(list, StorageRespVO.class));
+    }
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StoragePageReqVO.java

@@ -0,0 +1,93 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.storage.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+import java.math.BigDecimal;
+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 StoragePageReqVO extends PageParam {
+
+    @Schema(description = "入库出库类型：1为入库，2为出库", example = "2")
+    private Boolean stockType;
+
+    @Schema(description = "入/出库单号")
+    private String stockNo;
+
+    @Schema(description = "上游单号")
+    private Long headerNo;
+
+    @Schema(description = "物料 Id,对应 base_material表中的 Id 列", example = "651")
+    private Long materialId;
+
+    @Schema(description = "批次号")
+    private String lotNo;
+
+    @Schema(description = "仓库 Id，对应 wms_wh 表中的Id", example = "17136")
+    private Long whId;
+
+    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", example = "24171")
+    private Long rgId;
+
+    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", example = "3031")
+    private Long pnId;
+
+    @Schema(description = "库存良品数量")
+    private BigDecimal storageOkQty;
+
+    @Schema(description = "库存不良品数量")
+    private BigDecimal storageNgQty;
+
+    @Schema(description = "库存报废数量")
+    private BigDecimal storageSpQty;
+
+    @Schema(description = "备注", example = "随便")
+    private String description;
+
+    @Schema(description = "状态：1为保存；2为提交；3为作废", example = "2")
+    private Boolean status;
+
+    @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;
+
+    @Schema(description = "入库人")
+    private Long keeper;
+
+    @Schema(description = "入库时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] keeperTime;
+
+    @Schema(description = "出库人")
+    private Long outer;
+
+    @Schema(description = "出库时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] outerTime;
+
+    @Schema(description = "作废人")
+    private Long cancel;
+
+    @Schema(description = "作废时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] cancelTime;
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageRespVO.java

@@ -0,0 +1,101 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.storage.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.util.*;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 入/出库 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class StorageRespVO {
+
+    @Schema(description = "出库时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1806")
+    @ExcelProperty("出库时间")
+    private Long id;
+
+    @Schema(description = "入库出库类型：1为入库，2为出库", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("入库出库类型：1为入库，2为出库")
+    private Boolean stockType;
+
+    @Schema(description = "入/出库单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("入/出库单号")
+    private String stockNo;
+
+    @Schema(description = "上游单号")
+    @ExcelProperty("上游单号")
+    private Long headerNo;
+
+    @Schema(description = "物料 Id,对应 base_material表中的 Id 列", requiredMode = Schema.RequiredMode.REQUIRED, example = "651")
+    @ExcelProperty("物料 Id,对应 base_material表中的 Id 列")
+    private Long materialId;
+
+    @Schema(description = "批次号")
+    @ExcelProperty("批次号")
+    private String lotNo;
+
+    @Schema(description = "仓库 Id，对应 wms_wh 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "17136")
+    @ExcelProperty("仓库 Id，对应 wms_wh 表中的Id")
+    private Long whId;
+
+    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "24171")
+    @ExcelProperty("库区 Id，对应 wms_rg 表中的Id")
+    private Long rgId;
+
+    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "3031")
+    @ExcelProperty("库区 Id，对应 wms_rg 表中的Id")
+    private Long pnId;
+
+    @Schema(description = "库存良品数量")
+    @ExcelProperty("库存良品数量")
+    private BigDecimal storageOkQty;
+
+    @Schema(description = "库存不良品数量")
+    @ExcelProperty("库存不良品数量")
+    private BigDecimal storageNgQty;
+
+    @Schema(description = "库存报废数量")
+    @ExcelProperty("库存报废数量")
+    private BigDecimal storageSpQty;
+
+    @Schema(description = "备注", example = "随便")
+    @ExcelProperty("备注")
+    private String description;
+
+    @Schema(description = "状态：1为保存；2为提交；3为作废", example = "2")
+    @ExcelProperty("状态：1为保存；2为提交；3为作废")
+    private Boolean status;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "入库人")
+    @ExcelProperty("入库人")
+    private Long keeper;
+
+    @Schema(description = "入库时间")
+    @ExcelProperty("入库时间")
+    private LocalDateTime keeperTime;
+
+    @Schema(description = "出库人")
+    @ExcelProperty("出库人")
+    private Long outer;
+
+    @Schema(description = "出库时间")
+    @ExcelProperty("出库时间")
+    private LocalDateTime outerTime;
+
+    @Schema(description = "作废人")
+    @ExcelProperty("作废人")
+    private Long cancel;
+
+    @Schema(description = "作废时间")
+    @ExcelProperty("作废时间")
+    private LocalDateTime cancelTime;
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageSaveReqVO.java

@@ -0,0 +1,82 @@
+package com.chanko.yunxi.mes.module.heli.controller.admin.storage.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+import java.util.*;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 入/出库新增/修改 Request VO")
+@Data
+public class StorageSaveReqVO {
+
+    @Schema(description = "出库时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1806")
+    private Long id;
+
+    @Schema(description = "入库出库类型：1为入库，2为出库", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotNull(message = "入库出库类型：1为入库，2为出库不能为空")
+    private Boolean stockType;
+
+    @Schema(description = "入/出库单号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "入/出库单号不能为空")
+    private String stockNo;
+
+    @Schema(description = "上游单号")
+    private Long headerNo;
+
+    @Schema(description = "物料 Id,对应 base_material表中的 Id 列", requiredMode = Schema.RequiredMode.REQUIRED, example = "651")
+    @NotNull(message = "物料 Id,对应 base_material表中的 Id 列不能为空")
+    private Long materialId;
+
+    @Schema(description = "批次号")
+    private String lotNo;
+
+    @Schema(description = "仓库 Id，对应 wms_wh 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "17136")
+    @NotNull(message = "仓库 Id，对应 wms_wh 表中的Id不能为空")
+    private Long whId;
+
+    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "24171")
+    @NotNull(message = "库区 Id，对应 wms_rg 表中的Id不能为空")
+    private Long rgId;
+
+    @Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "3031")
+    @NotNull(message = "库区 Id，对应 wms_rg 表中的Id不能为空")
+    private Long pnId;
+
+    @Schema(description = "库存良品数量")
+    private BigDecimal storageOkQty;
+
+    @Schema(description = "库存不良品数量")
+    private BigDecimal storageNgQty;
+
+    @Schema(description = "库存报废数量")
+    private BigDecimal storageSpQty;
+
+    @Schema(description = "备注", example = "随便")
+    private String description;
+
+    @Schema(description = "状态：1为保存；2为提交；3为作废", example = "2")
+    private Boolean status;
+
+    @Schema(description = "入库人")
+    private Long keeper;
+
+    @Schema(description = "入库时间")
+    private LocalDateTime keeperTime;
+
+    @Schema(description = "出库人")
+    private Long outer;
+
+    @Schema(description = "出库时间")
+    private LocalDateTime outerTime;
+
+    @Schema(description = "作废人")
+    private Long cancel;
+
+    @Schema(description = "作废时间")
+    private LocalDateTime cancelTime;
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storage/StorageDO.java

@@ -0,0 +1,113 @@
+package com.chanko.yunxi.mes.module.heli.dal.dataobject.storage;
+
+import lombok.*;
+import java.util.*;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+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_storage")
+@KeySequence("wms_storage_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class StorageDO extends BaseDO {
+
+    /**
+     * 出库时间
+     */
+    @TableId
+    private Long id;
+    /**
+     * 入库出库类型：1为入库，2为出库
+     */
+    private Boolean stockType;
+    /**
+     * 入/出库单号
+     */
+    private String stockNo;
+    /**
+     * 上游单号
+     */
+    private Long headerNo;
+    /**
+     * 物料 Id,对应 base_material表中的 Id 列
+     */
+    private Long materialId;
+    /**
+     * 批次号
+     */
+    private String lotNo;
+    /**
+     * 仓库 Id，对应 wms_wh 表中的Id
+     */
+    private Long whId;
+    /**
+     * 库区 Id，对应 wms_rg 表中的Id
+     */
+    private Long rgId;
+    /**
+     * 库区 Id，对应 wms_rg 表中的Id
+     */
+    private Long pnId;
+    /**
+     * 库存良品数量
+     */
+    private BigDecimal storageOkQty;
+    /**
+     * 库存不良品数量
+     */
+    private BigDecimal storageNgQty;
+    /**
+     * 库存报废数量
+     */
+    private BigDecimal storageSpQty;
+    /**
+     * 备注
+     */
+    private String description;
+    /**
+     * 状态：1为保存；2为提交；3为作废
+     */
+    private Boolean status;
+    /**
+     * 入库人
+     */
+    private Long keeper;
+    /**
+     * 入库时间
+     */
+    private LocalDateTime keeperTime;
+    /**
+     * 出库人
+     */
+    private Long outer;
+    /**
+     * 出库时间
+     */
+    private LocalDateTime outerTime;
+    /**
+     * 作废人
+     */
+    private Long cancel;
+    /**
+     * 作废时间
+     */
+    private LocalDateTime cancelTime;
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storage/StorageMapper.java

@@ -0,0 +1,48 @@
+package com.chanko.yunxi.mes.module.heli.dal.mysql.storage;
+
+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.storage.StorageDO;
+import org.apache.ibatis.annotations.Mapper;
+import com.chanko.yunxi.mes.module.heli.controller.admin.storage.vo.*;
+
+/**
+ * 入/出库 Mapper
+ *
+ * @author 管理员
+ */
+@Mapper
+public interface StorageMapper extends BaseMapperX<StorageDO> {
+
+    default PageResult<StorageDO> selectPage(StoragePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<StorageDO>()
+                .eqIfPresent(StorageDO::getStockType, reqVO.getStockType())
+                .eqIfPresent(StorageDO::getStockNo, reqVO.getStockNo())
+                .eqIfPresent(StorageDO::getHeaderNo, reqVO.getHeaderNo())
+                .eqIfPresent(StorageDO::getMaterialId, reqVO.getMaterialId())
+                .eqIfPresent(StorageDO::getLotNo, reqVO.getLotNo())
+                .eqIfPresent(StorageDO::getWhId, reqVO.getWhId())
+                .eqIfPresent(StorageDO::getRgId, reqVO.getRgId())
+                .eqIfPresent(StorageDO::getPnId, reqVO.getPnId())
+                .eqIfPresent(StorageDO::getStorageOkQty, reqVO.getStorageOkQty())
+                .eqIfPresent(StorageDO::getStorageNgQty, reqVO.getStorageNgQty())
+                .eqIfPresent(StorageDO::getStorageSpQty, reqVO.getStorageSpQty())
+                .eqIfPresent(StorageDO::getDescription, reqVO.getDescription())
+                .eqIfPresent(StorageDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(StorageDO::getCreator, reqVO.getCreator())
+                .betweenIfPresent(StorageDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(StorageDO::getUpdater, reqVO.getUpdater())
+                .betweenIfPresent(StorageDO::getUpdateTime, reqVO.getUpdateTime())
+                .eqIfPresent(StorageDO::getKeeper, reqVO.getKeeper())
+                .betweenIfPresent(StorageDO::getKeeperTime, reqVO.getKeeperTime())
+                .eqIfPresent(StorageDO::getOuter, reqVO.getOuter())
+                .betweenIfPresent(StorageDO::getOuterTime, reqVO.getOuterTime())
+                .eqIfPresent(StorageDO::getCancel, reqVO.getCancel())
+                .betweenIfPresent(StorageDO::getCancelTime, reqVO.getCancelTime())
+                .orderByDesc(StorageDO::getId));
+    }
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageService.java

@@ -0,0 +1,55 @@
+package com.chanko.yunxi.mes.module.heli.service.storage;
+
+import java.util.*;
+import javax.validation.*;
+import com.chanko.yunxi.mes.module.heli.controller.admin.storage.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storage.StorageDO;
+import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
+import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
+
+/**
+ * 入/出库 Service 接口
+ *
+ * @author 管理员
+ */
+public interface StorageService {
+
+    /**
+     * 创建入/出库
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createStorage(@Valid StorageSaveReqVO createReqVO);
+
+    /**
+     * 更新入/出库
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateStorage(@Valid StorageSaveReqVO updateReqVO);
+
+    /**
+     * 删除入/出库
+     *
+     * @param id 编号
+     */
+    void deleteStorage(Long id);
+
+    /**
+     * 获得入/出库
+     *
+     * @param id 编号
+     * @return 入/出库
+     */
+    StorageDO getStorage(Long id);
+
+    /**
+     * 获得入/出库分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 入/出库分页
+     */
+    PageResult<StorageDO> getStoragePage(StoragePageReqVO pageReqVO);
+
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java

@@ -0,0 +1,74 @@
+package com.chanko.yunxi.mes.module.heli.service.storage;
+
+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.storage.vo.*;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.storage.StorageDO;
+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.storage.StorageMapper;
+
+import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
+
+/**
+ * 入/出库 Service 实现类
+ *
+ * @author 管理员
+ */
+@Service
+@Validated
+public class StorageServiceImpl implements StorageService {
+
+    @Resource
+    private StorageMapper storageMapper;
+
+    @Override
+    public Long createStorage(StorageSaveReqVO createReqVO) {
+        // 插入
+        StorageDO storage = BeanUtils.toBean(createReqVO, StorageDO.class);
+        storageMapper.insert(storage);
+        // 返回
+        return storage.getId();
+    }
+
+    @Override
+    public void updateStorage(StorageSaveReqVO updateReqVO) {
+        // 校验存在
+        validateStorageExists(updateReqVO.getId());
+        // 更新
+        StorageDO updateObj = BeanUtils.toBean(updateReqVO, StorageDO.class);
+        storageMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteStorage(Long id) {
+        // 校验存在
+        validateStorageExists(id);
+        // 删除
+        storageMapper.deleteById(id);
+    }
+
+    private void validateStorageExists(Long id) {
+        if (storageMapper.selectById(id) == null) {
+            throw exception(Storage_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public StorageDO getStorage(Long id) {
+        return storageMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<StorageDO> getStoragePage(StoragePageReqVO pageReqVO) {
+        return storageMapper.selectPage(pageReqVO);
+    }
+
+}

mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storage/StorageMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chanko.yunxi.mes.module.heli.dal.mysql.storage.StorageMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

mes-ui/mes-ui-admin-vue3/src/api/heli/storage/index.ts

@@ -0,0 +1,54 @@
+import request from '@/config/axios'
+
+export interface StorageVO {
+  id: number
+  stockType: boolean
+  stockNo: string
+  headerNo: number
+  materialId: number
+  lotNo: string
+  whId: number
+  rgId: number
+  pnId: number
+  storageOkQty: number
+  storageNgQty: number
+  storageSpQty: number
+  description: string
+  status: boolean
+  keeper: number
+  keeperTime: Date
+  outer: number
+  outerTime: Date
+  cancel: number
+  cancelTime: Date
+}
+
+// 查询入/出库分页
+export const getStoragePage = async (params) => {
+  return await request.get({ url: `/heli/storage/page`, params })
+}
+
+// 查询入/出库详情
+export const getStorage = async (id: number) => {
+  return await request.get({ url: `/heli/storage/get?id=` + id })
+}
+
+// 新增入/出库
+export const createStorage = async (data: StorageVO) => {
+  return await request.post({ url: `/heli/storage/create`, data })
+}
+
+// 修改入/出库
+export const updateStorage = async (data: StorageVO) => {
+  return await request.put({ url: `/heli/storage/update`, data })
+}
+
+// 删除入/出库
+export const deleteStorage = async (id: number) => {
+  return await request.delete({ url: `/heli/storage/delete?id=` + id })
+}
+
+// 导出入/出库 Excel
+export const exportStorage = async (params) => {
+  return await request.download({ url: `/heli/storage/export-excel`, params })
+}

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue

@@ -0,0 +1,203 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="入库出库类型：1为入库，2为出库" prop="stockType">
+        <el-radio-group v-model="formData.stockType">
+          <el-radio label="1">请选择字典生成</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="入/出库单号" prop="stockNo">
+        <el-input v-model="formData.stockNo" placeholder="请输入入/出库单号" />
+      </el-form-item>
+      <el-form-item label="上游单号" prop="headerNo">
+        <el-input v-model="formData.headerNo" placeholder="请输入上游单号" />
+      </el-form-item>
+      <el-form-item label="物料 Id,对应 base_material表中的 Id 列" prop="materialId">
+        <el-input v-model="formData.materialId" placeholder="请输入物料 Id,对应 base_material表中的 Id 列" />
+      </el-form-item>
+      <el-form-item label="批次号" prop="lotNo">
+        <el-input v-model="formData.lotNo" placeholder="请输入批次号" />
+      </el-form-item>
+      <el-form-item label="仓库 Id，对应 wms_wh 表中的Id" prop="whId">
+        <el-input v-model="formData.whId" placeholder="请输入仓库 Id，对应 wms_wh 表中的Id" />
+      </el-form-item>
+      <el-form-item label="库区 Id，对应 wms_rg 表中的Id" prop="rgId">
+        <el-input v-model="formData.rgId" placeholder="请输入库区 Id，对应 wms_rg 表中的Id" />
+      </el-form-item>
+      <el-form-item label="库区 Id，对应 wms_rg 表中的Id" prop="pnId">
+        <el-input v-model="formData.pnId" placeholder="请输入库区 Id，对应 wms_rg 表中的Id" />
+      </el-form-item>
+      <el-form-item label="库存良品数量" prop="storageOkQty">
+        <el-input v-model="formData.storageOkQty" placeholder="请输入库存良品数量" />
+      </el-form-item>
+      <el-form-item label="库存不良品数量" prop="storageNgQty">
+        <el-input v-model="formData.storageNgQty" placeholder="请输入库存不良品数量" />
+      </el-form-item>
+      <el-form-item label="库存报废数量" prop="storageSpQty">
+        <el-input v-model="formData.storageSpQty" placeholder="请输入库存报废数量" />
+      </el-form-item>
+      <el-form-item label="备注" prop="description">
+        <el-input v-model="formData.description" type="textarea" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="状态：1为保存；2为提交；3为作废" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio label="1">请选择字典生成</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="入库人" prop="keeper">
+        <el-input v-model="formData.keeper" placeholder="请输入入库人" />
+      </el-form-item>
+      <el-form-item label="入库时间" prop="keeperTime">
+        <el-date-picker
+          v-model="formData.keeperTime"
+          type="date"
+          value-format="x"
+          placeholder="选择入库时间"
+        />
+      </el-form-item>
+      <el-form-item label="出库人" prop="outer">
+        <el-input v-model="formData.outer" placeholder="请输入出库人" />
+      </el-form-item>
+      <el-form-item label="出库时间" prop="outerTime">
+        <el-date-picker
+          v-model="formData.outerTime"
+          type="date"
+          value-format="x"
+          placeholder="选择出库时间"
+        />
+      </el-form-item>
+      <el-form-item label="作废人" prop="cancel">
+        <el-input v-model="formData.cancel" placeholder="请输入作废人" />
+      </el-form-item>
+      <el-form-item label="作废时间" prop="cancelTime">
+        <el-date-picker
+          v-model="formData.cancelTime"
+          type="date"
+          value-format="x"
+          placeholder="选择作废时间"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as StorageApi from '@/api/heli/storage'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  stockType: undefined,
+  stockNo: undefined,
+  headerNo: undefined,
+  materialId: undefined,
+  lotNo: undefined,
+  whId: undefined,
+  rgId: undefined,
+  pnId: undefined,
+  storageOkQty: undefined,
+  storageNgQty: undefined,
+  storageSpQty: undefined,
+  description: undefined,
+  status: undefined,
+  keeper: undefined,
+  keeperTime: undefined,
+  outer: undefined,
+  outerTime: undefined,
+  cancel: undefined,
+  cancelTime: undefined,
+})
+const formRules = reactive({
+  stockType: [{ required: true, message: '入库出库类型：1为入库，2为出库不能为空', trigger: 'blur' }],
+  stockNo: [{ required: true, message: '入/出库单号不能为空', trigger: 'blur' }],
+  materialId: [{ required: true, message: '物料 Id,对应 base_material表中的 Id 列不能为空', trigger: 'blur' }],
+  whId: [{ required: true, message: '仓库 Id，对应 wms_wh 表中的Id不能为空', trigger: 'blur' }],
+  rgId: [{ required: true, message: '库区 Id，对应 wms_rg 表中的Id不能为空', trigger: 'blur' }],
+  pnId: [{ required: true, message: '库区 Id，对应 wms_rg 表中的Id不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await StorageApi.getStorage(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as StorageApi.StorageVO
+    if (formType.value === 'create') {
+      await StorageApi.createStorage(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await StorageApi.updateStorage(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    stockType: undefined,
+    stockNo: undefined,
+    headerNo: undefined,
+    materialId: undefined,
+    lotNo: undefined,
+    whId: undefined,
+    rgId: undefined,
+    pnId: undefined,
+    storageOkQty: undefined,
+    storageNgQty: undefined,
+    storageSpQty: undefined,
+    description: undefined,
+    status: undefined,
+    keeper: undefined,
+    keeperTime: undefined,
+    outer: undefined,
+    outerTime: undefined,
+    cancel: undefined,
+    cancelTime: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/index.vue

@@ -0,0 +1,433 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="入库出库类型：1为入库，2为出库" prop="stockType">
+        <el-select
+          v-model="queryParams.stockType"
+          placeholder="请选择入库出库类型：1为入库，2为出库"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="入/出库单号" prop="stockNo">
+        <el-input
+          v-model="queryParams.stockNo"
+          placeholder="请输入入/出库单号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="上游单号" prop="headerNo">
+        <el-input
+          v-model="queryParams.headerNo"
+          placeholder="请输入上游单号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="物料 Id,对应 base_material表中的 Id 列" prop="materialId">
+        <el-input
+          v-model="queryParams.materialId"
+          placeholder="请输入物料 Id,对应 base_material表中的 Id 列"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="批次号" prop="lotNo">
+        <el-input
+          v-model="queryParams.lotNo"
+          placeholder="请输入批次号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="仓库 Id，对应 wms_wh 表中的Id" prop="whId">
+        <el-input
+          v-model="queryParams.whId"
+          placeholder="请输入仓库 Id，对应 wms_wh 表中的Id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="库区 Id，对应 wms_rg 表中的Id" prop="rgId">
+        <el-input
+          v-model="queryParams.rgId"
+          placeholder="请输入库区 Id，对应 wms_rg 表中的Id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="库区 Id，对应 wms_rg 表中的Id" prop="pnId">
+        <el-input
+          v-model="queryParams.pnId"
+          placeholder="请输入库区 Id，对应 wms_rg 表中的Id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="库存良品数量" prop="storageOkQty">
+        <el-input
+          v-model="queryParams.storageOkQty"
+          placeholder="请输入库存良品数量"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="库存不良品数量" prop="storageNgQty">
+        <el-input
+          v-model="queryParams.storageNgQty"
+          placeholder="请输入库存不良品数量"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="库存报废数量" prop="storageSpQty">
+        <el-input
+          v-model="queryParams.storageSpQty"
+          placeholder="请输入库存报废数量"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="状态：1为保存；2为提交；3为作废" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态：1为保存；2为提交；3为作废"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="记录的创建人,对应员工表中的 Id" prop="creator">
+        <el-input
+          v-model="queryParams.creator"
+          placeholder="请输入记录的创建人,对应员工表中的 Id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="记录的修改人,对应员工表中的 Id" prop="updater">
+        <el-input
+          v-model="queryParams.updater"
+          placeholder="请输入记录的修改人,对应员工表中的 Id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="更新时间" prop="updateTime">
+        <el-date-picker
+          v-model="queryParams.updateTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="入库人" prop="keeper">
+        <el-input
+          v-model="queryParams.keeper"
+          placeholder="请输入入库人"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="入库时间" prop="keeperTime">
+        <el-date-picker
+          v-model="queryParams.keeperTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="出库人" prop="outer">
+        <el-input
+          v-model="queryParams.outer"
+          placeholder="请输入出库人"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="出库时间" prop="outerTime">
+        <el-date-picker
+          v-model="queryParams.outerTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="作废人" prop="cancel">
+        <el-input
+          v-model="queryParams.cancel"
+          placeholder="请输入作废人"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="作废时间" prop="cancelTime">
+        <el-date-picker
+          v-model="queryParams.cancelTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['heli:storage:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['heli:storage:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="出库时间" align="center" prop="id" />
+      <el-table-column label="入库出库类型：1为入库，2为出库" align="center" prop="stockType" />
+      <el-table-column label="入/出库单号" align="center" prop="stockNo" />
+      <el-table-column label="上游单号" align="center" prop="headerNo" />
+      <el-table-column label="物料 Id,对应 base_material表中的 Id 列" align="center" prop="materialId" />
+      <el-table-column label="批次号" align="center" prop="lotNo" />
+      <el-table-column label="仓库 Id，对应 wms_wh 表中的Id" align="center" prop="whId" />
+      <el-table-column label="库区 Id，对应 wms_rg 表中的Id" align="center" prop="rgId" />
+      <el-table-column label="库区 Id，对应 wms_rg 表中的Id" align="center" prop="pnId" />
+      <el-table-column label="库存良品数量" align="center" prop="storageOkQty" />
+      <el-table-column label="库存不良品数量" align="center" prop="storageNgQty" />
+      <el-table-column label="库存报废数量" align="center" prop="storageSpQty" />
+      <el-table-column label="备注" align="center" prop="description" />
+      <el-table-column label="状态：1为保存；2为提交；3为作废" align="center" prop="status" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="入库人" align="center" prop="keeper" />
+      <el-table-column
+        label="入库时间"
+        align="center"
+        prop="keeperTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="出库人" align="center" prop="outer" />
+      <el-table-column
+        label="出库时间"
+        align="center"
+        prop="outerTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="作废人" align="center" prop="cancel" />
+      <el-table-column
+        label="作废时间"
+        align="center"
+        prop="cancelTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['heli:storage:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['heli:storage:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <StorageForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as StorageApi from '@/api/heli/storage'
+import StorageForm from './StorageForm.vue'
+
+defineOptions({ name: 'Storage' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  stockType: undefined,
+  stockNo: undefined,
+  headerNo: undefined,
+  materialId: undefined,
+  lotNo: undefined,
+  whId: undefined,
+  rgId: undefined,
+  pnId: undefined,
+  storageOkQty: undefined,
+  storageNgQty: undefined,
+  storageSpQty: undefined,
+  description: undefined,
+  status: undefined,
+  creator: undefined,
+  createTime: [],
+  updater: undefined,
+  updateTime: [],
+  keeper: undefined,
+  keeperTime: [],
+  outer: undefined,
+  outerTime: [],
+  cancel: undefined,
+  cancelTime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await StorageApi.getStoragePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await StorageApi.deleteStorage(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await StorageApi.exportStorage(queryParams)
+    download.excel(data, '入/出库.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

sql/v1.1.0/heli.sql

@@ -29,8 +29,8 @@ CREATE TABLE `wms_storage`  (
                                 `tenant_id` bigint(20) NOT NULL COMMENT '租户编号',
                                 `keeper` bigint(20) NULL DEFAULT NULL COMMENT '入库人',
                                 `keeper_time` datetime NULL DEFAULT NULL COMMENT '入库时间',
-                                `outer` bigint(20) NULL DEFAULT NULL COMMENT '出库人',
+                                `outbound` bigint(20) NULL DEFAULT NULL COMMENT '出库人',
-                                `outer_time` datetime NULL DEFAULT NULL COMMENT '出库时间',
+                                `outbound_time` datetime NULL DEFAULT NULL COMMENT '出库时间',
                                 `cancel` bigint(20) NULL DEFAULT NULL COMMENT '作废人',
                                 `cancel_time` datetime NULL DEFAULT NULL COMMENT '作废时间',
                                 PRIMARY KEY (`id`) USING BTREE