增加数量大于查询

肖超群
1 parent 90b9c96c
Showing 3 changed files with 16 additions and 5 deletions
ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryDetail/controller/InventoryDetailController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/entity/InventoryDetail.java
@@ -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">
@@ -69,9 +69,11 @@ public class InventoryDetailController extends JeecgController&lt;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());// 计算库龄
@@ -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")