From d3ae08fbd8634429150f8a54bc779efdfd9aa1e2 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 13 十二月 2023 19:02:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/LWhWarningConfigServiceImpl.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhWarningConfigServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhWarningConfigServiceImpl.java
index a5b8bda..236c1d9 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhWarningConfigServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhWarningConfigServiceImpl.java
@@ -3,11 +3,13 @@
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.query.WhWarningConfigQry;
import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import org.springframework.stereotype.Service;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -29,15 +31,15 @@
}
-
private Map<String, Object> getConfigListQueryMap(WhWarningConfigQry param) {
Map<String, Object> configListQueryMap = new HashMap<>();
StringBuilder sql = new StringBuilder(GET_CONFIG_LIST_WITH_PAGE);
HashMap<String, Object> paramts = new HashMap<>();
//鏈烘瀯
if (param.getAgencyId() != null) {
- sql.append(" and left(ware.AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
- paramts.put("lengthAgencyId", param.getAgencyId());
+// sql.append(" and left(ware.AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
+ sql.append(" and ware.AGENCY_ID = :agencyId");
+// paramts.put("lengthAgencyId", param.getAgencyId());
paramts.put("agencyId", param.getAgencyId());
}
//浠撳簱绫诲瀷
@@ -46,13 +48,17 @@
paramts.put("warehouseType", param.getWarehouseType());
}
if (param.getBaseWarehouseId() != null) {
- sql.append(" AND wareConf.WAREHOUSE_ID = :warehouseId");
+ sql.append(" AND wareConf.BASE_WAREHOUSE_ID = :warehouseId");
paramts.put("warehouseId", param.getBaseWarehouseId());
}
//鐗╁搧鍚嶇О
if (StringUtils.isNotEmpty(param.getGoodsTemplateName())) {
sql.append(" AND goodsTemp.GOODS_NAME like :goodsTemplateName");
paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT);
+ }
+ if (param.getBaseGoodsTemplateId() != null) {
+ sql.append(" AND wareConf.BASE_GOODS_TEMPLATE_ID=:baseGoodsTemplateId");
+ paramts.put("baseGoodsTemplateId", param.getBaseGoodsTemplateId());
}
//鍒嗙被
if (param.getCategoryId() != null) {
@@ -72,4 +78,27 @@
return configListQueryMap;
}
+ private String QUERY_MODEL_IS_EXIST = "";
+
+ public List<Map<String, Object>> queryModelIsExist(Integer warehouseType, Long baseWarehouseId, List<Long> modelIds) {
+ StringBuilder sql = new StringBuilder("select WAREHOUSE_TYPE, BASE_WAREHOUSE_ID, BASE_GOODS_MODELS_ID from WH_WARNING_CONFIG where 1=1");
+ HashMap<String, Object> paramts = new HashMap<>();
+
+ //浠撳簱绫诲瀷
+ if (warehouseType != null) {
+ sql.append(" AND WAREHOUSE_TYPE = :warehouseType");
+ paramts.put("warehouseType", warehouseType);
+ }
+ if (baseWarehouseId != null) {
+ sql.append(" AND BASE_WAREHOUSE_ID = :warehouseId");
+ paramts.put("warehouseId", baseWarehouseId);
+ }
+ if (!CollectionUtils.isEmpty(modelIds)) {
+ sql.append(" AND BASE_GOODS_MODELS_ID in(:modelIds)");
+ paramts.put("modelIds", org.apache.commons.lang3.StringUtils.join(modelIds, ","));
+ }
+ return select(sql.toString(), paramts, new MapperUtil());
+ }
+
+
}
--
Gitblit v1.9.1