From ae729b5af85b7df9aa9e2c0bb3e5fb6115f1ca9e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 23 九月 2025 18:07:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java
index 14793b8..3b3a210 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java
@@ -65,10 +65,6 @@
@ApiOperation(value = "供应商获取库存分页列表")
@PostMapping(value = "/pageList")
public R<PageInfo<TErpGoodsVO>> pageList(@RequestBody TErpGoodsQuery query) {
- V3LabsTransPreorderRequest request = new V3LabsTransPreorderRequest();
- request.setLklAppId(LakalaConfig.appId);
- request.setMerchantNo(LakalaConfig.MerchantNo);
- request.setTermNo(LakalaConfig.TermNo);
SysUser user = tokenService.getLoginUser().getUser();
Integer roleType = user.getRoleType();
@@ -161,11 +157,11 @@
}
@ApiOperation(value = "有效期预警商品选择")
@GetMapping(value = "/pageInventoryGoodsList")
- public R<List<TErpGoodsInventoryVO>> pageInventoryGoodsList(@RequestParam String warehouseId,@RequestParam(required = false)String batchNumber) {
+ public R<List<TErpGoodsInventoryVO>> pageInventoryGoodsList(@RequestParam String warehouseId,@RequestParam(required = false)String batchId) {
SysUser user = tokenService.getLoginUser().getUser();
List<TErpGoodsInventoryVO> tErpGoodsInventoryVOS = erpGoodsService.pageInventoryGoodsList(warehouseId, user);
- if(batchNumber!=null && !"".equals(batchNumber)){
- tErpGoodsInventoryVOS = tErpGoodsInventoryVOS.stream().filter(e->e.getBatchNumber().equals(batchNumber)).collect(Collectors.toList());
+ if(batchId!=null && !"".equals(batchId)){
+ tErpGoodsInventoryVOS = tErpGoodsInventoryVOS.stream().filter(e->e.getId().equals(batchId)).collect(Collectors.toList());
}
return R.ok(tErpGoodsInventoryVOS);
}
--
Gitblit v1.7.1