From 97e58258cc2bfae3f640346d28c39e41ca06193e Mon Sep 17 00:00:00 2001 From: siontion Date: Thu, 25 Jul 2024 17:56:47 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=9E=E6=97=B6=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E3=80=91=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8BaterialType?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tpluslasteststock/vo/TplusLastestStockPageReqVO.java | 3 +++ .../admin/tpluslasteststock/vo/TplusLastestStockRespVO.java | 2 ++ .../dal/dataobject/tpluslasteststock/TplusLastestStockDO.java | 3 +++ .../dal/mysql/tpluslasteststock/TplusLastestStockMapper.java | 4 ++-- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/tpluslasteststock/vo/TplusLastestStockPageReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/tpluslasteststock/vo/TplusLastestStockPageReqVO.java index e726be22..d2dca7d6 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/tpluslasteststock/vo/TplusLastestStockPageReqVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/tpluslasteststock/vo/TplusLastestStockPageReqVO.java @@ -52,4 +52,7 @@ public class TplusLastestStockPageReqVO extends PageParam { @Schema(description = "现存量") private String existingQuantity; + @Schema(description = "物料类型") + private String materialType; + } \ No newline at end of file diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/tpluslasteststock/vo/TplusLastestStockRespVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/tpluslasteststock/vo/TplusLastestStockRespVO.java index 61a458cd..37a0bfbf 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/tpluslasteststock/vo/TplusLastestStockRespVO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/tpluslasteststock/vo/TplusLastestStockRespVO.java @@ -66,4 +66,6 @@ public class TplusLastestStockRespVO { @Schema(description = "库存单位") private String unit; + + private String materialType; } \ No newline at end of file diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/tpluslasteststock/TplusLastestStockDO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/tpluslasteststock/TplusLastestStockDO.java index 1dbe515e..830eeaac 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/tpluslasteststock/TplusLastestStockDO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/tpluslasteststock/TplusLastestStockDO.java @@ -75,5 +75,8 @@ public class TplusLastestStockDO extends BaseDO { @TableField(exist = false) private String unit; + @TableField(exist = false) + private String materialType; + } \ No newline at end of file diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/tpluslasteststock/TplusLastestStockMapper.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/tpluslasteststock/TplusLastestStockMapper.java index e0da6b26..170a6d1c 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/tpluslasteststock/TplusLastestStockMapper.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/tpluslasteststock/TplusLastestStockMapper.java @@ -26,13 +26,13 @@ public interface TplusLastestStockMapper extends BaseMapperX query = new MPJLambdaWrapper<>(); query.selectAll(TplusLastestStockDO.class) - .select("a.spec,a.unit") + .select("a.spec,a.unit,a.material_type") .leftJoin(MaterialDO.class,"a",MaterialDO::getCode,TplusLastestStockDO::getInventoryCode) .groupBy(MaterialDO::getCode) .orderByDesc(TplusLastestStockDO::getInventoryCode); query.like(!StringUtils.isEmpty(reqVO.getInventoryCode()),TplusLastestStockDO::getInventoryCode,reqVO.getInventoryCode()) .like(!StringUtils.isEmpty(reqVO.getInventoryName()),TplusLastestStockDO::getInventoryName,reqVO.getInventoryName()) - .eq(!StringUtils.isEmpty(reqVO.getInventoryClassCode()),TplusLastestStockDO::getInventoryClassCode,reqVO.getInventoryClassCode()) + .eq(!StringUtils.isEmpty(reqVO.getMaterialType()),MaterialDO::getMaterialType,reqVO.getMaterialType()) .eq(reqVO.getWarehouseId()!=null,TplusLastestStockDO::getWarehouseId,reqVO.getWarehouseId()) ;