From e7412d7916772b270638505c02125d7ba155c283 Mon Sep 17 00:00:00 2001 From: zengchenxi Date: Thu, 9 May 2024 17:15:34 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E3=80=91=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/storagemat/vo/StorageMatRespVO.java | 17 ++++++++++++----- .../storagemat/vo/StorageMatSaveReqVO.java | 9 +++------ .../dal/dataobject/storagemat/StorageMatDO.java | 9 +++++++++ .../dal/mysql/storagemat/StorageMatMapper.java | 3 +-- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storagemat/vo/StorageMatRespVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storagemat/vo/StorageMatRespVO.java index 8a5cb9a8..87032ba8 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storagemat/vo/StorageMatRespVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storagemat/vo/StorageMatRespVO.java @@ -1,13 +1,12 @@ package com.chanko.yunxi.mes.module.biz.controller.admin.storagemat.vo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.util.*; +import lombok.Data; + import java.math.BigDecimal; -import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; @Schema(description = "管理后台 - 入/出库物料 Response VO") @Data @@ -65,4 +64,12 @@ public class StorageMatRespVO { @Schema(description = "工序id") private Long procedureId; + private String projectSubCode; + + private String materialType; + + private String spec; + + private String unit; + } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storagemat/vo/StorageMatSaveReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storagemat/vo/StorageMatSaveReqVO.java index 62efb1f6..6ae84355 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storagemat/vo/StorageMatSaveReqVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storagemat/vo/StorageMatSaveReqVO.java @@ -22,16 +22,13 @@ public class StorageMatSaveReqVO { @NotNull(message = "物料 Id,对应 base_material表中的 Id 列不能为空") private Long matId; - @Schema(description = "仓库 Id，对应 wms_wh 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "31860") - @NotNull(message = "仓库 Id，对应 wms_wh 表中的Id不能为空") + @Schema(description = "仓库 Id，对应 wms_wh 表中的Id", example = "31860") private Long whId; - @Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13060") - @NotNull(message = "库区 Id，对应 wms_rg 表中的Id不能为空") + @Schema(description = "库区 Id，对应 wms_rg 表中的Id", example = "13060") private Long rgId; - @Schema(description = "库区 Id，对应 wms_rg 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25544") - @NotNull(message = "库区 Id，对应 wms_rg 表中的Id不能为空") + @Schema(description = "库区 Id，对应 wms_rg 表中的Id", example = "25544") private Long pnId; @Schema(description = "库存良品数量") diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/storagemat/StorageMatDO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/storagemat/StorageMatDO.java index aa0f7196..72500035 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/storagemat/StorageMatDO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/storagemat/StorageMatDO.java @@ -75,4 +75,13 @@ public class StorageMatDO extends BaseDO { @TableField(exist = false) private String projectSubCode; + @TableField(exist = false) + private String materialType; + + @TableField(exist = false) + private String spec; + + @TableField(exist = false) + private String unit; + } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/storagemat/StorageMatMapper.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/storagemat/StorageMatMapper.java index d6947845..bbd5344d 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/storagemat/StorageMatMapper.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/storagemat/StorageMatMapper.java @@ -39,10 +39,9 @@ public interface StorageMatMapper extends BaseMapperX { } default List selectMatByStorckID(Long stockId) { - MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(StorageMatDO.class) - .select("a.name as projectSubName", "a.code as projectSubCode") + .select("a.name as projectSubName", "a.code as projectSubCode", "a.material_type, a.spec, a.unit") .leftJoin(MaterialDO.class, "a", MaterialDO::getId, StorageMatDO::getMatId) .disableSubLogicDel() .eq(stockId!= null && stockId!= 0,StorageMatDO::getStockId, stockId);