From 5d745c2c8854d2c1e94e5ee9004d5219681f6d7c Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期五, 29 十二月 2023 11:02:50 +0800
Subject: [PATCH] 增加图片验证码和登录日志
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
index 9393423..1edab61 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
@@ -2,6 +2,7 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -33,6 +34,7 @@
import com.consum.base.service.LWhFormInventoryGoodsService;
import com.consum.base.service.LWhFormInventoryService;
import com.consum.base.service.LWhGoodsService;
+import com.consum.base.service.core.LWhFormInventoryCoreService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantUser;
@@ -157,8 +159,8 @@
paramts.put("inventoryDateEnd", param.getEndTime() * 1000000 + 240000);
}
// 鏈烘瀯
- sql.append("and AGENCY_ID =:AGENCY_ID ");
- paramts.put("AGENCY_ID", sysInfo.getTenantId());
+ sql.append("and AGENCY_ID =:agencyId ");
+ paramts.put("agencyId", sysInfo.getTenantId());
sql.append("ORDER BY CREATE_TIME DESC ");
return selectSplit(sql.toString(), paramts, new LWhFormInventory());
@@ -354,17 +356,10 @@
+ "bgt.CLASSIFICATION TYPE,bgm.UNIT FROM l_wh_goods g "
+ "LEFT JOIN base_goods_template bgt ON g.BASE_GOODS_TEMPLATE_ID = bgt.ID "
+ "LEFT JOIN base_goods_models bgm ON bgm.GOODS_TEMPLATES_ID = bgt.id WHERE "
- + "WAREHOUSE_ID = :warehouseId ";
+ + "WAREHOUSE_ID = :warehouseId GROUP BY g.BASE_GOODS_MODELS_ID ";
HashMap<String, Object> param = new HashMap<>();
param.put("warehouseId", warehouseId);
- // String sql =
- // "select bgt.id baseGoodsTemplateId,bgm.id baseGoodsModelId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME
- // baseGoodsModelsName,bgt.CLASSIFICATION type,bgm.UNIT "
- // + "from base_goods_models bgm left join base_goods_template bgt on bgm.GOODS_TEMPLATES_ID = bgt.id "
- // + "where bgt.AGENCY_ID = :agencyId";
- // HashMap<String, Object> param = new HashMap<>();
- // param.put("agencyId", inventory.getAgencyId());
List<Map<String, Object>> result = this.select(sql, param, new MapperUtil());
List<FormInventoryGoodsVO> goodsVOList = Lists.newArrayList();
result.forEach(item -> {
@@ -392,7 +387,7 @@
param.put("id", id);
List<Map<String, Object>> select = this.select(sql, param, new MapperUtil());
if (CollectionUtils.isEmpty(select)) {
- return null;
+ return Collections.emptyList();
}
List<InventoryExcelTemplate> list = Lists.newArrayList();
select.forEach(item -> {
--
Gitblit v1.9.1