From 6f45f4a29ce38525f3f9e3931bcedfc77bde765e Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 24 六月 2023 18:07:43 +0800
Subject: [PATCH] 出入库流程优化-入库详单优化
---
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5503.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5503.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5503.java
index b272758..eeb8091 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5503.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5503.java
@@ -23,6 +23,8 @@
import java.util.Map;
/**
+ * 浠撳簱鑳借�楁煡璇�
+ *
* @Author:YAN
*/
@Service
@@ -52,19 +54,29 @@
if (null == param.getStartTime()) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
}
- param.setEndTime(DateUtil.getNextZero(param.getEndTime()));
+ if (null != param.getEndTime()) {
+ param.setEndTime(DateUtil.getNextZero(param.getEndTime()));
+ }
param.setCompanyId(phone35AuthUser.getCompanyId());
List<DtoEnergy> energyList = phone35Mapper.getEnergy(param);
Map<String, DtoEnergy> energyMap = new HashMap<>();
+ DtoEnergy dtoEnergy;
for (DtoEnergy data : energyList) {
- //todo
-// if (null == energyMap.get(data.getDepotId())) {
-// String depotName = phone35Util.getDepotName(phone35AuthUser.getCompanyId(), data.getDepotId());
-// data.setDepotName(depotName);
-// energyMap.put(data.getDepotId(), data);
-// }
+ if (null == energyMap.get(data.getDepotId())) {
+ String depotName = phone35Util.getDepotName(phone35AuthUser.getCompanyId(), data.getDepotId());
+ data.setDepotName(depotName);
+ data.setEndEs(data.getEs());
+ data.setStartEs(data.getEs());
+ energyMap.put(data.getDepotId(), data);
+ } else {
+ dtoEnergy = energyMap.get(data.getDepotId());
+ dtoEnergy.setStartEs(data.getEs());
+ dtoEnergy.setEpSum(data.getEpSum() + dtoEnergy.getEpSum());
+ dtoEnergy.setEqSum(data.getEqSum() + dtoEnergy.getEqSum());
+ dtoEnergy.setEsSum(data.getEsSum() + dtoEnergy.getEsSum());
+ }
}
- List<DtoEnergy> list = new ArrayList<>();
- return null;
+ List<DtoEnergy> list = new ArrayList<>(energyMap.values());
+ return PhoneRespUtil.success(list, req);
}
}
--
Gitblit v1.9.3