From 5f131141f3be72733bc2adf33f3fe18f58d5f7b5 Mon Sep 17 00:00:00 2001 From: liux <963924687@qq.com> Date: Fri, 11 Jul 2025 10:32:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ims/vo/FetchMaterialDetailPageVO.java | 221 +----------------- .../mapper/ims/FetchMaterialDetailMapper.xml | 2 +- .../mapper/ims/FetchMaterialMapper.xml | 6 +- 3 files changed, 7 insertions(+), 222 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/FetchMaterialDetailPageVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/FetchMaterialDetailPageVO.java index 9f1067b..3f0963e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/FetchMaterialDetailPageVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/vo/FetchMaterialDetailPageVO.java @@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -10,6 +11,7 @@ import java.time.LocalDateTime; value = "领料明细表", description = "领料明细表" ) +@Data public class FetchMaterialDetailPageVO { @ApiModelProperty("领料明细id") private Long fetchDetailId; @@ -32,7 +34,7 @@ public class FetchMaterialDetailPageVO { @ApiModelProperty("货品单位") private String unitName; @ApiModelProperty("库存数量") - private Long inventoryNum; + private Long materialNum; @ApiModelProperty("领料数量") private BigDecimal fetchNum; @ApiModelProperty("备注") @@ -60,223 +62,6 @@ public class FetchMaterialDetailPageVO { @ApiModelProperty("是否注册(1是2否)") private Integer ifRegister; - public Long getFetchDetailId() { - return this.fetchDetailId; - } - - public String getFetchMaterialId() { - return this.fetchMaterialId; - } - - public Long getMaterialId() { - return this.materialId; - } - - public Long getInventoryId() { - return this.inventoryId; - } - - public String getMaterialName() { - return this.materialName; - } - - public String getMaterialCode() { - return this.materialCode; - } - - public Long getUnitId() { - return this.unitId; - } - - public String getUnitName() { - return this.unitName; - } - - public Long getInventoryNum() { - return this.inventoryNum; - } - - public BigDecimal getFetchNum() { - return this.fetchNum; - } - - public String getRemark() { - return this.remark; - } - - - public Long getStallId() { - return this.stallId; - } - - public String getStallName() { - return this.stallName; - } - - public BigDecimal getOutCount() { - return this.outCount; - } - - public BigDecimal getResidueNum() { - return this.residueNum; - } - - public String getBarCode() { - return this.barCode; - } - - public Integer getSalesMode() { - return this.salesMode; - } - - public Integer getIfRegister() { - return this.ifRegister; - } - - public Long getMaterialTypeId() { - return materialTypeId; - } - - public FetchMaterialDetailPageVO setMaterialTypeId(Long materialTypeId) { - this.materialTypeId = materialTypeId; - return this; - } - - public String getMaterialTypeName() { - return materialTypeName; - } - - public FetchMaterialDetailPageVO setMaterialTypeName(String materialTypeName) { - this.materialTypeName = materialTypeName; - return this; - } - - public FetchMaterialDetailPageVO setFetchDetailId(final Long fetchDetailId) { - this.fetchDetailId = fetchDetailId; - return this; - } - - public FetchMaterialDetailPageVO setFetchMaterialId(final String fetchMaterialId) { - this.fetchMaterialId = fetchMaterialId; - return this; - } - - public FetchMaterialDetailPageVO setMaterialId(final Long materialId) { - this.materialId = materialId; - return this; - } - - public FetchMaterialDetailPageVO setInventoryId(final Long inventoryId) { - this.inventoryId = inventoryId; - return this; - } - - public FetchMaterialDetailPageVO setMaterialName(final String materialName) { - this.materialName = materialName; - return this; - } - - public FetchMaterialDetailPageVO setMaterialCode(final String materialCode) { - this.materialCode = materialCode; - return this; - } - - - public FetchMaterialDetailPageVO setUnitId(final Long unitId) { - this.unitId = unitId; - return this; - } - - public FetchMaterialDetailPageVO setUnitName(final String unitName) { - this.unitName = unitName; - return this; - } - - public FetchMaterialDetailPageVO setInventoryNum(final Long inventoryNum) { - this.inventoryNum = inventoryNum; - return this; - } - - public FetchMaterialDetailPageVO setFetchNum(final BigDecimal fetchNum) { - this.fetchNum = fetchNum; - return this; - } - - public FetchMaterialDetailPageVO setRemark(final String remark) { - this.remark = remark; - return this; - } - - public String getCreateBy() { - return createBy; - } - - public LocalDateTime getCreateTime() { - return createTime; - } - - public String getUpdateBy() { - return updateBy; - } - - public LocalDateTime getUpdateTime() { - return updateTime; - } - - public FetchMaterialDetailPageVO setCreateBy(final String crby) { - this.createBy = crby; - return this; - } - - public FetchMaterialDetailPageVO setCreateTime(final LocalDateTime crtime) { - this.createTime = crtime; - return this; - } - - public FetchMaterialDetailPageVO setUpdateBy(final String upby) { - this.updateBy = upby; - return this; - } - - public FetchMaterialDetailPageVO setUpdateTime(final LocalDateTime uptime) { - this.updateTime = uptime; - return this; - } - - public FetchMaterialDetailPageVO setStallId(final Long stallId) { - this.stallId = stallId; - return this; - } - - public FetchMaterialDetailPageVO setStallName(final String stallName) { - this.stallName = stallName; - return this; - } - - public FetchMaterialDetailPageVO setOutCount(final BigDecimal outCount) { - this.outCount = outCount; - return this; - } - - public FetchMaterialDetailPageVO setResidueNum(final BigDecimal residueNum) { - this.residueNum = residueNum; - return this; - } - - public FetchMaterialDetailPageVO setBarCode(final String barCode) { - this.barCode = barCode; - return this; - } - - public FetchMaterialDetailPageVO setSalesMode(final Integer salesMode) { - this.salesMode = salesMode; - return this; - } - - public FetchMaterialDetailPageVO setIfRegister(final Integer ifRegister) { - this.ifRegister = ifRegister; - return this; - } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/FetchMaterialDetailMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/FetchMaterialDetailMapper.xml index 3297326..dc6531f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/FetchMaterialDetailMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/FetchMaterialDetailMapper.xml @@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.material_type_name , b.unit_id, c.unit_name, - e.material_num inventoryNum, + e.material_num, a.fetch_num, a.create_by as createBy, a.create_time as createTime, diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/FetchMaterialMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/FetchMaterialMapper.xml index fd903a0..6da1aa5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/FetchMaterialMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/FetchMaterialMapper.xml @@ -182,11 +182,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and (a.fetch_material_id like #{content.fetchMaterialId} + and (a.fetch_material_id like concat('%', #{content.fetchMaterialId}, '%') or - a.title like #{content.fetchMaterialId} + a.title like concat('%', #{content.fetchMaterialId}, '%') or - a.fetch_material_code like #{content.fetchMaterialId} + a.fetch_material_code like concat('%', #{content.fetchMaterialId}, '%') )