From b4adff68a07b783fc90da1c9370d8be5f383e700 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期三, 08 五月 2024 13:46:34 +0800
Subject: [PATCH] 20240528修改: bug41、42、43修改 领用单(分发单)，调拨单，流程优化
---
consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java
index 1df8590..aa72f33 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseGoodsTemplateServiceImpl.java
@@ -27,6 +27,7 @@
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.Collections;
import cn.hutool.core.convert.Convert;
@@ -58,8 +59,8 @@
// 鍒嗙被id
if (categoryId != null) {
- sql.append(" and category_id =:category_id ");
- paramts.put("category_id", categoryId);
+ sql.append(" and category_id =:categoryId ");
+ paramts.put("categoryId", categoryId);
}
sql.append(" and states =1 ");
@@ -236,7 +237,7 @@
*/
@Override
public BaseGoodsTemplate getByGoodsNameAndCategoryId(String goodsName, Long categoryId) {
- StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1 = 1 ");
+ StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE STATES != 3 ");
HashMap<String, Object> paramts = new HashMap<>();
// 鐗╁搧鍚嶇О
@@ -256,7 +257,7 @@
* @return
*/
- private static String QUERY_GOODSINFO_BY_MODELID =
+ private static final String QUERY_GOODSINFO_BY_MODELID =
"SELECT model.MODEL_NAME modelName,model.UNIT,temp.id goodsId, temp.GOODS_CODE goodsCode,temp.GOODS_NAME goodsName,temp.CLASSIFICATION classification,temp.CATEGORY_ID categoryId FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE temp ON model.GOODS_TEMPLATES_ID=temp.id WHERE 1=1 ";
@Override
@@ -269,7 +270,7 @@
}
List<Map<String, Object>> tempGoodsInfo = this.select(sqlStr.toString(), params);
if (CollectionUtils.isEmpty(tempGoodsInfo)) {
- return null;
+ return Collections.emptyMap();
}
return tempGoodsInfo.get(0);
}
@@ -334,7 +335,7 @@
* @return
*/
@Override
- public List<BaseGoodsTemplate> queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId, Short states,
+ public List<BaseGoodsTemplate> queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId, Integer states,
String goodsName) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_goods_template WHERE 1=1 ");
Map<String, Object> params = new HashMap<>();
--
Gitblit v1.9.1