From e19d9742d5d14823bc414b1d1d47778b3daee227 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 19 十二月 2023 09:24:56 +0800
Subject: [PATCH] 盘点时库存查询不分仓库类型
---
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
index 3cad491..1fff7d3 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
@@ -20,7 +20,9 @@
import com.consum.base.service.LWhGoodsService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhGoods;
import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
@@ -146,6 +148,13 @@
if (baseWarehouse.getId() == null) {
return ResponseValue.error("浠撳簱id涓虹┖");
}
+ Long id = baseWarehouse.getId();
+ LWhGoods lWhGoods = new LWhGoods();
+ lWhGoods.setWarehouseId(id);
+ List<LWhGoods> select = lWhGoodsService.select(lWhGoods);
+ if (!CollectionUtils.isEmpty(select)) {
+ return ResponseValue.error("璇ヤ粨搴撴鍦ㄤ娇鐢紝涓嶈兘鍒犻櫎");
+ }
int num = baseWarehouseService.updateById(baseWarehouse);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鍒犻櫎澶辫触锛�");
@@ -186,10 +195,9 @@
}
Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId();
Integer warehouseType = warehouseQry.getWarehouseType();
- Integer states = warehouseQry.getStates();
Integer buyType = warehouseQry.getBuyType();
- // TODO 鍏朵粬绫诲瀷鐨勫簱瀛樻煡璇㈡槸鍚﹁鏌ラ儴闂ㄧ被鍨嬬殑搴撳瓨
+ // 鍏朵粬绫诲瀷鐨勫簱瀛樻煡璇㈡槸鍚︿篃瑕佹煡閮ㄩ棬绫诲瀷鐨勫簱瀛�
List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
int num = lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModelsId, 1, buyType);
return ResponseValue.success(num);
--
Gitblit v1.9.1