From e65e3c1a492714364483b892bd3fa01adb643191 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 25 十一月 2023 13:40:40 +0800
Subject: [PATCH] feat: 人员角色编辑
---
consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java b/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
index ea3b9ea..32b6f70 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
@@ -5,6 +5,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -31,7 +32,7 @@
*/
private static String query_Goods_Model_Num = "SELECT COUNT(1) from L_WH_GOODS where 1=1";
- public int queryGoodsModelNum(Integer warehouseType, Long warehouseId, Long baseGoodsModelsId, Short states, Short buyType) {
+ public int queryGoodsModelNum(Integer warehouseType, Long warehouseId, Long baseGoodsModelsId, Integer states, Integer buyType) {
StringBuilder sql = new StringBuilder(query_Goods_Model_Num);
Map<String, Object> paramts = new HashMap<>();
@@ -69,9 +70,10 @@
* @param goodsModelNum 鍙栧嚭鐨勬暟閲�
* @return
*/
- private static String QUERY_OUT_GOODS_ID = "SELECT*FROM L_WH_GOODS WHERE 1=1";
+ private static String QUERY_OUT_GOODS_ID = "SELECT * FROM L_WH_GOODS WHERE 1=1";
- public List<Map<String, Object>> queryOutGoods(Integer warehouseType, Long warehouseId, Long baseGoodsModelsId, Short states, Short buyType, Integer goodsModelNum) {
+ public List<Map<String, Object>> queryOutGoods(Integer warehouseType, Long warehouseId, Long baseGoodsModelsId, Integer states, Integer buyType,
+ Integer goodsModelNum) {
StringBuilder sql = new StringBuilder(QUERY_OUT_GOODS_ID);
Map<String, Object> paramts = new HashMap<>();
if (warehouseType != null) {
@@ -83,7 +85,7 @@
paramts.put("warehouseId", warehouseId);
}
if (baseGoodsModelsId != null) {
- sql.append(" and BASE_GOODS_TEMPLATE_ID=:baseGoodsModelsId");
+ sql.append(" and BASE_GOODS_MODELS_ID=:baseGoodsModelsId");
paramts.put("baseGoodsModelsId", baseGoodsModelsId);
}
if (states != null) {
@@ -94,7 +96,7 @@
sql.append(" and BUY_TYPE=:buyType");
paramts.put("buyType", buyType);
}
- return select(sql.append(" limit").append(goodsModelNum).toString(), paramts);
+ return select(sql.append(" limit ").append(goodsModelNum).toString(), paramts);
}
@@ -108,7 +110,7 @@
* @param goodsModelNum 鍙栧嚭鐨勬暟閲�
* @return
*/
- public List<Long> queryOutGoodsId(Integer warehouseType, Long warehouseId, Long baseGoodsModelsId, Short states, Short buyType, Integer goodsModelNum) {
+ public List<Long> queryOutGoodsId(Integer warehouseType, Long warehouseId, Long baseGoodsModelsId, Integer states, Integer buyType, Integer goodsModelNum) {
List<Map<String, Object>> outGoods = queryOutGoods(warehouseType, warehouseId, baseGoodsModelsId, states, buyType, goodsModelNum);
if (CollectionUtils.isEmpty(outGoods)) {
return null;
@@ -117,10 +119,26 @@
return whGoodsIds;
}
+ private static String QUERY_GOODS_PRICE_BY_ID = "SELECT sum(PRICE)totalPrice from L_WH_GOODS goods where 1=1";
+
+ public long queryGoodsPriceById(List<Long> goodsIds) {
+ StringBuilder sql = new StringBuilder(QUERY_GOODS_PRICE_BY_ID);
+ Map<String, Object> paramts = new HashMap<>();
+ if (!CollectionUtils.isEmpty(goodsIds)) {
+ sql.append(" and id in(:goodsIds)");
+ paramts.put("goodsIds", goodsIds);
+ }
+ List<Map<String, Object>> map = this.select(sql.toString(), paramts);
+ if (CollectionUtils.isEmpty(map)) {
+ return 0;
+ }
+ BigDecimal totalPrice = (BigDecimal) map.get(0).get("totalPrice");
+ return totalPrice.longValue();
+ }
+
/**
- * 鏌ヨ鎶ュ簾鐗╁搧
- * 榛樿浼樺厛鎶ュ簾鏈�楂樹环鐨勭墿鍝�
+ * 鏌ヨ鎶ュ簾鐗╁搧 榛樿浼樺厛鎶ュ簾鏈�楂樹环鐨勭墿鍝�
*
* @param warehouseType
* @param warehouseId
@@ -174,14 +192,13 @@
}
sql.append(QUERY_SCRAPPED_GOODS_END);
if (goodsModelNum != null) {
- sql.append(" limit").append(goodsModelNum);
+ sql.append(" limit ").append(goodsModelNum);
}
return select(sql.toString(), paramts);
}
/**
- * 鏌ヨ鎶ュ簾鐗╁搧
- * 榛樿浼樺厛鎶ュ簾鏈�楂樹环鐨勭墿鍝�
+ * 鏌ヨ鎶ュ簾鐗╁搧 榛樿浼樺厛鎶ュ簾鏈�楂樹环鐨勭墿鍝�
*
* @param warehouseType
* @param warehouseId
@@ -199,7 +216,8 @@
Long baseGoodsModelsId,
Short states,
Integer goodsModelNum) {
- List<Map<String, Object>> outGoods = queryScrappedGoods(warehouseType, warehouseId, transBusinessId, nowUserName, baseGoodsModelsId, states, goodsModelNum);
+ List<Map<String, Object>> outGoods = queryScrappedGoods(warehouseType, warehouseId, transBusinessId, nowUserName, baseGoodsModelsId, states,
+ goodsModelNum);
if (CollectionUtils.isEmpty(outGoods)) {
return null;
}
@@ -216,9 +234,9 @@
* @param toWarehouseName
* @return
*/
- private static String MOD_GOODS_TRANSFERING_PREFIX = "update L_WH_GOODS set";
+ private static String MOD_GOODS_TRANSFERING_PREFIX = "update L_WH_GOODS set ";
- public int modGoodsTransfering(List<Long> whGoods, Integer warehouseType, Long toWarehouseId, String toWarehouseName, Short states) {
+ public int modGoodsTransfering(List<Long> whGoods, Integer warehouseType, Long toWarehouseId, String toWarehouseName, Integer states) {
StringBuilder sql = new StringBuilder(MOD_GOODS_TRANSFERING_PREFIX);
ArrayList<Object> params = new ArrayList<>();
if (toWarehouseId != null) {
@@ -238,8 +256,7 @@
params.add(states);
}
sql.deleteCharAt(22);
- sql.append(" where id in(?)");
- params.add(whGoods);
+ sql.append(" where id in(").append(StringUtils.join(whGoods, ",")).append(")");
return update(sql.toString(), params.toArray());
}
--
Gitblit v1.9.1