From 438c1612a0b0b212e21d25249ccdebac6a326842 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期六, 15 十一月 2025 15:27:08 +0800
Subject: [PATCH] 小数点保留后两位
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 76 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index 626d2d4..e2b0562 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -9,11 +9,14 @@
import com.vincent.rsf.server.api.entity.dto.PoItemsDto;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
import com.vincent.rsf.server.api.service.ReportMsgService;
+import com.vincent.rsf.server.common.utils.DateUtils;
+import com.vincent.rsf.server.manager.controller.dto.DashboardDto;
+import com.vincent.rsf.server.manager.controller.dto.StockTrandDto;
+import com.vincent.rsf.server.manager.controller.dto.StockTransItemDto;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.AsnExceStatus;
-import com.vincent.rsf.server.manager.enums.POExceStatus;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,6 +30,9 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.text.DateFormat;
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -59,6 +65,10 @@
private PurchaseService purchaseService;
@Autowired
private PurchaseItemService purchaseItemService;
+ @Autowired
+ private AsnOrderService asnOrderService;
+ @Autowired
+ private TaskService taskService;
@Override
public boolean notifyInspect(List<WkOrder> orders) {
@@ -289,7 +299,7 @@
}
PurchaseItem service = purchaseItemService.getById(item.getId());
- Double qty = Math.round((service.getQty() + item.getAnfme()) * 10000) / 10000.0;
+ Double qty = Math.round((service.getQty() + item.getAnfme()) * 100) / 100.0;
if (qty.compareTo(service.getAnfme()) > 0) {
throw new CoolException("鏂板缓鍗曟嵁鏁伴噺涓嶈兘澶т簬璁″垝鏁伴噺锛侊紒");
}
@@ -316,7 +326,7 @@
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
- Double toQty = Math.round((purchaseItem.getQty() + item.getAnfme()) * 10000) / 10000.0;
+ Double toQty = Math.round((purchaseItem.getQty() + item.getAnfme()) * 100) / 100.0;
purchaseItem.setQty(toQty);
if (!purchaseItemService.updateById(purchaseItem)) {
throw new CoolException("PO鍗曟槑缁嗕慨鏀瑰け璐ワ紒锛�");
@@ -329,7 +339,7 @@
throw new CoolException(("Asn鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒"));
}
//浠诲姟鎵ц瀹屾垚锛屼慨鏀瑰凡瀹屾垚鏁伴噺鍜孭O鍗曟墽琛岀姸鎬�
- Double qty = Math.round((sum + purchase.getQty()) * 10000) / 10000.0;
+ Double qty = Math.round((sum + purchase.getQty()) * 100) / 100.0;
purchase.setQty(qty)
.setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
@@ -363,7 +373,7 @@
list.forEach(item -> {
PurchaseItem purchaseItem = purchaseItemService.getById(item.getPoDetlId());
if (!Objects.isNull(purchaseItem)) {
- Double minusQty = Math.round((purchaseItem.getQty() - item.getAnfme()) * 10000) / 10000.0;
+ Double minusQty = Math.round((purchaseItem.getQty() - item.getAnfme()) * 100) / 100.0;
purchaseItem.setQty(minusQty);
if (!purchaseItemService.updateById(purchaseItem)) {
throw new CoolException("PO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
@@ -376,7 +386,7 @@
Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>()
.eq(Purchase::getCode, list.stream().findFirst().get().getPoCode()));
if (!Objects.isNull(purchase)) {
- Double qty = Math.round((purchase.getQty() - sum) * 10000) / 10000.0;
+ Double qty = Math.round((purchase.getQty() - sum) * 100) / 100.0;
purchase.setQty(qty)
.setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
@@ -392,7 +402,6 @@
throw new CoolException("浠诲姟涓崟鎹笉鍙垹闄わ紒锛�");
}
-
if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
.in(WkOrderItem::getOrderId, ids))) {
// throw new CoolException("Details Delete Fail");
@@ -402,6 +411,65 @@
}
/**
+ * 鑾峰彇棣栭〉琛ㄥご鏁版嵁
+ * @return
+ */
+ @Override
+ public R getDashbord() {
+ DashboardDto dto = new DashboardDto();
+ //鑾峰彇鍏ュ簱鏁伴噺
+ DashboardDto trandDto = this.baseMapper.getDashbord(OrderType.ORDER_IN.type, TaskType.TASK_TYPE_IN.type + "");
+ dto.setInAnf(trandDto.getAnfme()).setTaskIn(trandDto.getRealAnfme()).setTotalIn(trandDto.getAnfme() + trandDto.getRealAnfme());
+
+ //鑾峰彇鍑哄簱鍗曟暟閲�
+ DashboardDto outTrand = this.baseMapper.getDashbord(OrderType.ORDER_OUT.type, TaskType.TASK_TYPE_OUT.type + "");
+ dto.setOutAnf(outTrand.getAnfme()).setTaskOut(outTrand.getRealAnfme()).setTotalOut(outTrand.getAnfme() + outTrand.getRealAnfme());
+
+ //鑾峰彇鎵ц涓换鍔℃暟閲�
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<>());
+ if (!tasks.isEmpty()) {
+ dto.setTaskQty(tasks.size());
+ }
+ return R.ok().add(dto);
+ }
+
+ /**
+ * 鑾峰彇鍑哄叆搴撹秼鍔�
+ * @return
+ */
+ @Override
+ public R getStockTrand() {
+ List<String> days = DateUtils.getLastMonthDays("yyyy-MM-dd");
+ LambdaQueryWrapper<StockStatistic> queryWrapper = new LambdaQueryWrapper<StockStatistic>()
+ .in(StockStatistic::getTaskType, Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type));
+ List<StockTransItemDto> items = this.baseMapper.getStockTrand(queryWrapper);
+ if (items.isEmpty()) {
+ return R.ok();
+ }
+ List<StockTransItemDto> stockDtos = new ArrayList<>();
+ days.forEach(day -> {
+ StockTransItemDto itemDto = new StockTransItemDto();
+ itemDto.setInQty(0).setOutQty(0).setOutAnfme(0).setOutAnfme(0);
+ items.forEach(item -> {
+ if (item.getOrderTime().equals(day)) {
+ BeanUtils.copyProperties(item, itemDto);
+ }
+ });
+ itemDto.setOrderTime(day);
+ stockDtos.add(itemDto);
+ });
+
+ //鑾峰彇鏈�澶у��
+ Optional<Integer> max = stockDtos.stream().map(StockTransItemDto::getInQty).filter(Objects::nonNull).max(Comparator.naturalOrder());
+ Optional<Integer> maxOut = stockDtos.stream().map(StockTransItemDto::getOutQty).filter(Objects::nonNull).max(Comparator.naturalOrder());
+ int maxed = Math.max(max.orElse(Integer.MIN_VALUE), maxOut.orElse(Integer.MIN_VALUE));
+
+ StockTrandDto trandDto = new StockTrandDto();
+ trandDto.setMaxQty(maxed).setTrandItem(stockDtos);
+ return R.ok().add(trandDto);
+ }
+
+ /**
* @param
* @return
* @author Ryan
--
Gitblit v1.9.1