From 170c89b9b8e6d5c3117d53e7b38f782651ebfcde Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 22 十二月 2023 14:04:04 +0800
Subject: [PATCH] 物品统计表中总数量改为在库数量+报废数量
---
consum-base/src/main/java/com/consum/base/pojo/response/GoodsStatisticsInfoVO.java | 39 +++++++++++++++++++
consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java | 1
consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsStatisticsServiceImpl.java | 23 +++++++++--
3 files changed, 57 insertions(+), 6 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/GoodsStatisticsInfoVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/GoodsStatisticsInfoVO.java
new file mode 100644
index 0000000..b465960
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/pojo/response/GoodsStatisticsInfoVO.java
@@ -0,0 +1,39 @@
+package com.consum.base.pojo.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author asus
+ * @version 1.0
+ * @description: 鐗╁搧缁熻琛�
+ * @date 2023/12/22 13:52
+ */
+@NoArgsConstructor
+@Data
+@ApiModel
+public class GoodsStatisticsInfoVO {
+
+ @ApiModelProperty(value = "鏈烘瀯")
+ private String orgName;
+ @ApiModelProperty(value = "璋冩嫧鏁伴噺")
+ private Integer diaoBoNum;
+ @ApiModelProperty(value = "鎬绘暟閲�")
+ private Integer totalNum;
+ @ApiModelProperty(value = "鍦ㄥ簱鏁伴噺")
+ private Integer zaiKuNum;
+ @ApiModelProperty(value = "鐗╁搧鍨嬪彿绫诲埆锛圓绫�,B绫�..锛�")
+ private String costType;
+ @ApiModelProperty(value = "鎶ュ簾鏁伴噺")
+ private Integer baoFeiNum;
+ @ApiModelProperty(value = "鐗╁搧鍨嬪彿鍚嶇О")
+ private String baseGoodsModelsName;
+ @ApiModelProperty(value = "鐗╁搧缂栫爜")
+ private String goodsCode;
+ @ApiModelProperty(value = "浠撳簱/閮ㄩ棬鍚嶇О")
+ private String warehouseName;
+ @ApiModelProperty(value = "鐗╁搧妯℃澘鍚嶇О")
+ private String goodsTemplateName;
+}
diff --git a/consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java b/consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java
index cc0a57a..6603f98 100644
--- a/consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/core/LWhFormTransferCoreService.java
@@ -483,7 +483,6 @@
allChangModelList, null, dealTime);
}
log.info("璋冩嫧鍗曪細{} 鍏ュ簱瀹屾垚", whFormTransferId);
- return;
}
private static String GET_GOODSID_BY_FLOWID =
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsStatisticsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsStatisticsServiceImpl.java
index 15cb0ac..f4792e9 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsStatisticsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsStatisticsServiceImpl.java
@@ -1,13 +1,17 @@
package com.consum.base.service.impl;
-import com.consum.base.service.LWhGoodsStatisticsService;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import org.apache.commons.compress.utils.Lists;
import org.springframework.stereotype.Service;
+import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.query.LWhGoodsStatisQry;
+import com.consum.base.pojo.response.GoodsStatisticsInfoVO;
+import com.consum.base.service.LWhGoodsStatisticsService;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
@@ -35,6 +39,9 @@
@Override
public List getWhGoodsStatisList(LWhGoodsStatisQry param) {
+
+ List<GoodsStatisticsInfoVO> result = Lists.newArrayList();
+
StringBuilder sqlColumn = new StringBuilder(GET_WHGOODS_STATIS_LIST_COLUMN);
StringBuilder sqlCangKu = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_CANGKU);
StringBuilder sqlCangKuWhere = new StringBuilder(GET_WHGOODS_STATIS_LIST_T_CANGKU_WHERE);
@@ -98,10 +105,16 @@
StringBuilder sql = new StringBuilder();
sql.append(sqlColumn).append(sqlCangKu).append(sqlCangKuWhere).append(sqlCangKuEnd).append(sqlKuCun)
- .append(sqlKuCunWhere).append(sqlKuCunGoupBy)
+ .append(sqlKuCunWhere).append(sqlKuCunGoupBy).append(sqlEndWhere);
- .append(sqlEndWhere);
-
- return select(sql.toString(), paramts, new MapperUtil());
+ List<Map<String, Object>> select = select(sql.toString(), paramts, new MapperUtil());
+ select.forEach(item -> {
+ GoodsStatisticsInfoVO goodsStatisticsInfoVO = MapUtils.convertMapToObj(item, GoodsStatisticsInfoVO.class);
+ // 缁熻鎬绘暟鏀逛负锛氬湪搴撴暟閲�+鎶ュ簾鏁伴噺
+ goodsStatisticsInfoVO
+ .setTotalNum(goodsStatisticsInfoVO.getZaiKuNum() + goodsStatisticsInfoVO.getBaoFeiNum());
+ result.add(goodsStatisticsInfoVO);
+ });
+ return result;
}
}
--
Gitblit v1.9.1