From 75aaca3a95314be8c384df18dba23c661dea742c Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期一, 27 十一月 2023 19:05:38 +0800
Subject: [PATCH] feat:
---
consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java | 82 +++++++++++++++++++++++++++++------------
1 files changed, 58 insertions(+), 24 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 2030a00..4aa7b31 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
@@ -1,10 +1,12 @@
package com.consum.base.service;
+import com.consum.base.core.utils.MapperUtil;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.jdbc.service.BaseServiceImpl;
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;
@@ -13,7 +15,6 @@
/**
* @ClassName LWhGoodsService
-
* @Date 2023/10/24
* @Description
* @Version 1.0
@@ -32,7 +33,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<>();
@@ -70,9 +71,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) {
@@ -84,7 +86,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) {
@@ -95,7 +97,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);
}
@@ -109,7 +111,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;
@@ -118,10 +120,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
@@ -132,7 +150,9 @@
* @param goodsModelNum 鍙栧嚭鐨勬暟閲�
* @return
*/
- private static String QUERY_SCRAPPED_GOODS_PREFIX = "SELECT goods.id FROM L_WH_GOODS goods LEFT JOIN (SELECT t2.*FROM (SELECT max(DEAL_TIME) DEAL_TIME,WH_GOODS_ID FROM L_GOODS_USER_RECORD GROUP BY WH_GOODS_ID) t1 LEFT JOIN L_GOODS_USER_RECORD t2 ON t1.DEAL_TIME=t2.DEAL_TIME AND t1.WH_GOODS_ID=t2.WH_GOODS_ID) useRecord ON goods.id=useRecord.WH_GOODS_ID WHERE 1=1";
+
+ private static String QUERY_SCRAPPED_GOODS_PREFIX_1 = "SELECT goods.id FROM L_WH_GOODS goods LEFT JOIN L_GOODS_USER_RECORD useRecord ON goods.id=useRecord.WH_GOODS_ID AND useRecord.LAST_RECORD=1 WHERE 1=1 ";
+ private static String QUERY_SCRAPPED_GOODS_PREFIX_2 = " AND goods.id IN (SELECT lwgrd.WH_GOODS_ID FROM L_WAREHOUSE_FLOW flow LEFT JOIN L_WH_GOODS_RECORD lwgr ON lwgr.WAREHOUSE_FLOW_ID=flow.id LEFT JOIN L_WH_GOODS_RECORD_DETAILS lwgrd ON lwgrd.WH_GOODS_RECORD_ID=lwgr.id WHERE flow.THIS_TYPE=4 AND flow.BUSINESS_FORM_ID=:transBusinessId)";
private static String QUERY_SCRAPPED_GOODS_END = " ORDER BY goods.PRICE DESC,goods.PROCURE_DATE ASC,goods.id";
public List<Map<String, Object>> queryScrappedGoods(Integer warehouseType,
@@ -145,7 +165,7 @@
if (warehouseType == null) {
warehouseType = 0;
}
- StringBuilder sql = new StringBuilder(QUERY_SCRAPPED_GOODS_PREFIX);
+ StringBuilder sql = new StringBuilder(QUERY_SCRAPPED_GOODS_PREFIX_1);
Map<String, Object> paramts = new HashMap<>();
if (warehouseType != null) {
sql.append(" AND goods.WAREHOUSE_TYPE=:warehouseType");
@@ -154,10 +174,6 @@
if (warehouseId != null) {
sql.append(" AND goods.WAREHOUSE_ID=:warehouseId");
paramts.put("warehouseId", warehouseId);
- }
- if (transBusinessId != null) {
- sql.append(" and useRecord.TRANS_BUSINESS_ID=:transBusinessId");
- paramts.put("transBusinessId", transBusinessId);
}
if (StringUtils.isNotEmpty(nowUserName)) {
sql.append(" AND useRecord.NOW_USER_NAME=:nowUserName");
@@ -171,12 +187,19 @@
sql.append(" AND goods.STATES=:states");
paramts.put("states", states);
}
- return select(sql.append(QUERY_SCRAPPED_GOODS_END).append(" limit").append(goodsModelNum).toString(), paramts);
+ if (transBusinessId != null) {
+ sql.append(QUERY_SCRAPPED_GOODS_PREFIX_2);
+ paramts.put("transBusinessId", transBusinessId);
+ }
+ sql.append(QUERY_SCRAPPED_GOODS_END);
+ if (goodsModelNum != null) {
+ sql.append(" limit ").append(goodsModelNum);
+ }
+ return select(sql.toString(), paramts);
}
/**
- * 鏌ヨ鎶ュ簾鐗╁搧
- * 榛樿浼樺厛鎶ュ簾鏈�楂樹环鐨勭墿鍝�
+ * 鏌ヨ鎶ュ簾鐗╁搧 榛樿浼樺厛鎶ュ簾鏈�楂樹环鐨勭墿鍝�
*
* @param warehouseType
* @param warehouseId
@@ -194,7 +217,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;
}
@@ -211,12 +235,12 @@
* @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) {
+ if (warehouseType != null) {
sql.append(", WAREHOUSE_TYPE=?");
params.add(warehouseType);
}
@@ -233,10 +257,20 @@
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());
}
+ private static String GOODS_NUM_PRICE = "SELECT t.tenantId,count(id) total_Num,count(CASE WHEN STATES=2 THEN 1 END) xia_fa_num,IFNULL(round(sum(PRICE)/1000000,2),0) total_price,IFNULL(ROUND(count(CASE WHEN STATES=2 THEN 1 END)/count(id),4),0)*100 AS zhan_you_percent,count(CASE COST_TYPE WHEN 1 THEN 1 END) a_total_Num,count(CASE COST_TYPE WHEN 2 THEN 1 END) b_total_Num,count(CASE COST_TYPE WHEN 3 THEN 1 END) c_total_Num FROM (SELECT tCangKu.tenantId,tKuCun.id,tKuCun.STATES,tKuCun.COST_TYPE,tKuCun.price FROM (SELECT tenant.id tenantId,tenant.NAME AS org_name,ware.*FROM fin_sys_tenant tenant RIGHT JOIN ( SELECT 0 WAREHOUSE_TYPE,id,AGENCY_ID,WAREHOUSE_NAME FROM BASE_WAREHOUSE UNION ALL SELECT 1 WAREHOUSE_TYPE,id,TENANT_ID AGENCY_ID,`NAME` WAREHOUSE_NAME FROM fin_sys_tenant_department) ware ON tenant.id=ware.AGENCY_ID WHERE 1=1 ";
+ private static String GOODS_NUM_PRICE_END = ") tCangKu LEFT JOIN L_WH_GOODS tKuCun ON tCangKu.WAREHOUSE_TYPE=tKuCun.WAREHOUSE_TYPE AND tCangKu.id=tKuCun.WAREHOUSE_ID AND tKuCun.STATES BETWEEN 1 AND 2) t GROUP BY t.tenantId";
+
+ //鏈烘瀯
+ public List<Map<String, Object>> getGoodsNumPrice(Long agencyId) {
+ StringBuilder sql = new StringBuilder(GOODS_NUM_PRICE);
+ Map<String, Object> paramts = new HashMap<>();
+ sql.append(" and tenant.id=:agencyId");
+ paramts.put("agencyId", agencyId);
+ return select(sql.append(GOODS_NUM_PRICE_END).toString(), paramts, new MapperUtil());
+ }
}
--
Gitblit v1.9.1