From 627212210c9cebb60dd9fb288856d00bdfc9e045 Mon Sep 17 00:00:00 2001
From: youjie <272855983@qq.com>
Date: Fri, 11 Oct 2024 08:55:19 +0800
Subject: [PATCH] 增加数量大于查询
---
ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue | 15 ++++++++++-----
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryDetail/controller/InventoryDetailController.java | 2 ++
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/entity/InventoryDetail.java | 4 ++++
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue b/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
index 05172c2..ec5eb73 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
@@ -93,6 +93,16 @@
<a-input placeholder="请输入序列号" v-model="queryParam.sn"></a-input>
</a-form-item>
</a-col>
+ <a-col :xl='6' :lg='7' :md='8' :sm='24'>
+ <a-form-item label='库龄大于（天）'>
+ <a-input placeholder='请输入库龄大于（天）' v-model='queryParam.inventoryAge'></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl='6' :lg='7' :md='8' :sm='24'>
+ <a-form-item label='数量大于'>
+ <a-input placeholder='请输入数量' v-model='queryParam.inventoryQty'></a-input>
+ </a-form-item>
+ </a-col>
<a-col :xl="12" :lg="14" :md="16" :sm="24">
<a-form-item label="创建日期">
<j-date :show-date="true" date-format="YYYY-MM-DD" placeholder="请选择开始时间"
@@ -102,11 +112,6 @@
class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
</a-form-item>
</a-col>
- <a-col :xl='6' :lg='7' :md='8' :sm='24'>
- <a-form-item label='库龄大于（天）'>
- <a-input placeholder='请输入库龄大于（天）' v-model='queryParam.inventoryAge'></a-input>
- </a-form-item>
- </a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryDetail/controller/InventoryDetailController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryDetail/controller/InventoryDetailController.java
index 601e7f9..85f6593 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryDetail/controller/InventoryDetailController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryDetail/controller/InventoryDetailController.java
@@ -69,9 +69,11 @@ public class InventoryDetailController extends JeecgController<InventoryDetail,
inventoryAge = DateUtil.offsetDay(new Date(), 0 - inventoryDetail.getInventoryAge());
inventoryDetail.setInventoryAge(null);
}
+ BigDecimal inventoryQty = inventoryDetail.getInventoryQty();
HuahengJwtUtil.setWarehouseCode(req, inventoryDetail);
QueryWrapper<InventoryDetail> queryWrapper = QueryGenerator.initQueryWrapper(inventoryDetail, req.getParameterMap());
queryWrapper.lt(inventoryAge != null, "create_time", inventoryAge);
+ queryWrapper.ge(inventoryQty != null, "qty", inventoryQty);
Page<InventoryDetail> page = new Page<InventoryDetail>(pageNo, pageSize);
IPage<InventoryDetail> pageList = inventoryDetailService.queryPage(page, queryWrapper);
inventoryDetailService.calculateInventoryAge(pageList.getRecords());// 计算库龄
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/entity/InventoryDetail.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/entity/InventoryDetail.java
index dd8a274..fe923fd 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/entity/InventoryDetail.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/entity/InventoryDetail.java
@@ -131,6 +131,10 @@ public class InventoryDetail implements Serializable {
@Excel(name = "库龄（天）", width = 15)
@ApiModelProperty(value = "库龄（天）")
private Integer inventoryAge;
+ /** 库存数量 */
+ @ApiModelProperty(value = "库存数量")
+ @TableField(exist = false)
+ private BigDecimal inventoryQty;
/** 是否可用 */
@Excel(name = "是否可用", width = 15)
@Dict(dicCode = "inventory_enable")
--
libgit2 0.22.2