From 3f69b4dfc585c4dfbc3c07a6acf5cdd838033636 Mon Sep 17 00:00:00 2001
From: liuguocan <527956374@qq.com>
Date: 星期二, 28 十一月 2023 14:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 4 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java
index 446e11e..e063677 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhWarningServiceImpl.java
@@ -3,11 +3,13 @@
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.query.WhWarningQry;
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;
/**
@@ -31,8 +33,8 @@
}
//鏈烘瀯
if (param.getAgencyId() != null) {
- sql.append(" and left(ware.AGENCY_ID, length(:lengthAgencyId)) = :agencyId");
- paramts.put("lengthAgencyId", param.getAgencyId());
+ sql.append(" and ware.AGENCY_ID=:agencyId");
+// paramts.put("lengthAgencyId", param.getAgencyId());
paramts.put("agencyId", param.getAgencyId());
}
//浠撳簱绫诲瀷
@@ -51,7 +53,8 @@
}
if (param.getGoodsTemplateId() != null) {
sql.append(" AND goodsTemp.id=:goodsTemplateId");
- paramts.put("goodsTemplateId", param.getGoodsTemplateId()); }
+ paramts.put("goodsTemplateId", param.getGoodsTemplateId());
+ }
//鍒嗙被
if (param.getCategoryId() != null) {
sql.append(" AND cate.id=:categoryId");
@@ -64,9 +67,73 @@
sql.append(" AND cate.CLASSIFICATION=':costType'");
paramts.put("costType", costType);
}
+ if (param.getWarningType() != null) {
+ sql.append(" AND wareWarn.WARNING_TYPE=:warningType");
+ paramts.put("warningType", param.getWarningType());
+ }
- sql.append(" ORDER BY wareWarn.id DESC ");
+ sql.append(" ORDER BY wareWarn.DEAL_TIME DESC ");
return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
}
+
+ /**
+ * 鏌ヨ鎸囧畾浠撳簱鐨勫簱瀛樻槸鍚﹁秴棰勮
+ *
+ * @param warehouseType
+ * @param warehouseId
+ * @param baseModelId
+ */
+ private String CHECK_KUCUN_PREFIX = "SELECT warnConf.*,goods.goods_Num,CASE WHEN warnConf.LOWER_LIMIT>=goods.goods_Num THEN 2 WHEN warnConf.UPPER_LIMIT<=goods.goods_Num THEN 1 END AS WARNING_TYPE FROM (";
+ private String CHECK_KUCUN_CONFIG_PREFIX = "SELECT WAREHOUSE_TYPE,BASE_WAREHOUSE_ID,BASE_GOODS_MODELS_ID,LOWER_LIMIT,UPPER_LIMIT FROM WH_WARNING_CONFIG";
+ private String CHECK_KUCUN_CONFIG_WHERE = " WHERE 1=1";
+
+ private String CHECK_KUCUN_CONFIG_JOINTKUCUN = ") warnConf LEFT JOIN (";
+
+ private String CHECK_KUCUN_KUCUN_PREFIX = "SELECT WAREHOUSE_TYPE,WAREHOUSE_ID,BASE_GOODS_MODELS_ID,count(1) goods_Num FROM L_WH_GOODS";
+ private String CHECK_KUCUN_KUCUN_WHERE = " WHERE 1=1 and STATES=1";
+ private String CHECK_KUCUN_KUCUN_END = " GROUP BY BASE_GOODS_MODELS_ID)";
+
+ private String CHECK_KUCUN_END = "goods ON goods.BASE_GOODS_MODELS_ID=warnConf.BASE_GOODS_MODELS_ID AND goods.WAREHOUSE_TYPE=warnConf.WAREHOUSE_TYPE AND goods.BASE_GOODS_MODELS_ID=warnConf.BASE_GOODS_MODELS_ID WHERE (warnConf.LOWER_LIMIT>=goods.goods_Num OR warnConf.UPPER_LIMIT<=goods.goods_Num)";
+
+ public List<Map<String, Object>> checkKuCun(Short warehouseType, Long warehouseId, List<Long> baseModelIdList) {
+ StringBuilder checkKucunPrefix = new StringBuilder(CHECK_KUCUN_PREFIX);
+ StringBuilder checkKucunConfigPrefix = new StringBuilder(CHECK_KUCUN_CONFIG_PREFIX);
+ StringBuilder checkKucunConfigWhere = new StringBuilder(CHECK_KUCUN_CONFIG_WHERE);
+ StringBuilder checkKucunConfigJointkucun = new StringBuilder(CHECK_KUCUN_CONFIG_JOINTKUCUN);
+ StringBuilder checkKucunKucunPrefix = new StringBuilder(CHECK_KUCUN_KUCUN_PREFIX);
+ StringBuilder checkKucunKucunWhere = new StringBuilder(CHECK_KUCUN_KUCUN_WHERE);
+ StringBuilder checkKucunKucunEnd = new StringBuilder(CHECK_KUCUN_KUCUN_END);
+ StringBuilder checkKucunEnd = new StringBuilder(CHECK_KUCUN_END);
+
+ Map<String, Object> paramMap = new HashMap<>();
+ if (warehouseType != null) {
+ checkKucunConfigWhere.append(" and WAREHOUSE_TYPE =:ConfigWarehouseType");
+ paramMap.put("ConfigWarehouseType", warehouseType);
+ checkKucunKucunWhere.append(" and WAREHOUSE_TYPE =:KuCunWarehouseType");
+ paramMap.put("KuCunWarehouseType", warehouseType);
+ }
+ if (warehouseId != null) {
+ checkKucunConfigWhere.append(" and BASE_WAREHOUSE_ID =:ConfigWarehouseId");
+ paramMap.put("ConfigWarehouseId", warehouseId);
+ checkKucunKucunWhere.append(" and WAREHOUSE_ID =:KuCunWarehouseId");
+ paramMap.put("KuCunWarehouseId", warehouseId);
+ }
+ if (!CollectionUtils.isEmpty(baseModelIdList)) {
+ checkKucunConfigWhere.append(" and BASE_GOODS_MODELS_ID in(:ConfigBaseModelIds)");
+ paramMap.put("ConfigBaseModelIds", baseModelIdList);
+ checkKucunKucunWhere.append(" and BASE_GOODS_MODELS_ID in(:KuCunBaseModelIds)");
+ paramMap.put("KuCunBaseModelIds", baseModelIdList);
+ }
+
+ checkKucunPrefix.append(checkKucunConfigPrefix)
+ .append(checkKucunConfigWhere)
+ .append(checkKucunConfigJointkucun)
+ .append(checkKucunKucunPrefix)
+ .append(checkKucunKucunWhere)
+ .append(checkKucunKucunEnd)
+ .append(checkKucunEnd);
+ return select(checkKucunPrefix.toString(), paramMap, new MapperUtil());
+ }
+
}
--
Gitblit v1.9.1