From ca0565e53494417b3779759f8d3898e07bfd5929 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 14:09:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/jtwy' into sqd-hb
---
src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
index cc6292e..2ebc028 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
@@ -58,7 +58,7 @@
@Override
public IPage<SalesLedgerSchedulingDto> listPage(Page page, SalesLedgerSchedulingDto salesLedgerSchedulingDto) {
IPage<SalesLedgerSchedulingDto> list = salesLedgerSchedulingMapper.listPage(page, salesLedgerSchedulingDto);
- if(list.getTotal() == 0){
+ if(CollectionUtils.isEmpty(list.getRecords())){
return list;
}
Set<Long> collect = list.getRecords().stream().map(SalesLedgerSchedulingDto::getSalesLedgerProductId).collect(Collectors.toSet());
@@ -66,7 +66,6 @@
salesLedgerWorkLambdaQueryWrapper.in(SalesLedgerWork::getSalesLedgerProductId, collect)
.ne(SalesLedgerWork::getStatus, 1);
List<SalesLedgerWork> salesLedgerWorks = salesLedgerWorkMapper.selectList(salesLedgerWorkLambdaQueryWrapper);
- List<SalesLedgerSchedulingDto> list1 = new ArrayList<>();
list.getRecords().forEach(i -> {
// 鑾峰彇瀹屾垚鏁伴噺
i.setSuccessNum(salesLedgerWorks
@@ -85,13 +84,15 @@
}
// 鐘舵�� = 鏁伴噺鍜屽畬宸ユ暟閲忔瘮杈�
- if(i.getSchedulingNum().compareTo(new BigDecimal(0)) == 0){
- i.setStatus("鏈畬鎴�");
- } else if(i.getQuantity().compareTo(i.getSchedulingNum()) <= 0){
+ if(i.getSuccessNum().compareTo(new BigDecimal(0)) == 0){
+ i.setStatus("鏈紑濮�");
+ } else if(i.getQuantity().compareTo(i.getSuccessNum()) <= 0){
i.setStatus("宸插畬鎴�");
}else{
i.setStatus("鐢熶骇涓�");
}
+ // 杩涘害淇濈暀涓や綅灏忔暟
+ i.setProgress(i.getSchedulingNum().divide(i.getQuantity(),4,RoundingMode.CEILING).multiply(new BigDecimal(100)));
});
return list;
@@ -128,6 +129,13 @@
.filter(j -> j.getSalesLedgerProductId().equals(i.getSalesLedgerProductId()))
.map(SalesLedgerWork::getFinishedNum)
.reduce(BigDecimal.ZERO, BigDecimal::add));
+ if(i.getSuccessNum().compareTo(new BigDecimal(0)) == 0){
+ i.setStatus("鏈紑濮�");
+ } else if(i.getQuantity().compareTo(i.getSuccessNum()) <= 0){
+ i.setStatus("宸插畬鎴�");
+ }else{
+ i.setStatus("鐢熶骇涓�");
+ }
});
ExcelUtil<SalesLedgerSchedulingDto> util = new ExcelUtil<>(SalesLedgerSchedulingDto.class);
util.exportExcel(response, list, "鐢熶骇璁㈠崟");
@@ -190,10 +198,26 @@
i++;
continue;
}
+ String productionLine = "";
+ switch (name.get()){
+ case "鐐掓満1":
+ productionLine = "浜х嚎1";
+ break;
+ case "鐐掓満2":
+ productionLine = "浜х嚎2";
+ break;
+ case "鐐掓満3":
+ productionLine = "浜х嚎3";
+ break;
+ case "鐐掓満4":
+ productionLine = "浜х嚎4";
+ break;
+ }
SalesLedgerScheduling salesLedgerScheduling = SalesLedgerScheduling.builder()
.salesLedgerId(productionDispatchAddDto.getSalesLedgerId())
.salesLedgerProductId(productionDispatchAddDto.getSalesLedgerProductId())
.speculativeTradingName(name.get())
+ .productionLine(productionLine)
.schedulingUserId(sysUser.getUserId())
.schedulingUserName(sysUser.getNickName())
.schedulingNum(productionDispatchAddDto.getSchedulingNum())
@@ -285,12 +309,6 @@
@Override
public IPage<SalesLedgerSchedulingProcessDto> listPageProcess(Page page, SalesLedgerSchedulingProcessDto salesLedgerSchedulingDto) {
IPage<SalesLedgerSchedulingProcessDto> list = salesLedgerSchedulingMapper.listPageProcess(page, salesLedgerSchedulingDto);
-// Set<Long> collect = list.getRecords().stream().map(SalesLedgerSchedulingProcessDto::getId).collect(Collectors.toSet());
-// if(CollectionUtils.isEmpty(collect)) return list;
-// LambdaQueryWrapper<SalesLedgerWork> salesLedgerWorkLambdaQueryWrapper = new LambdaQueryWrapper<>();
-// salesLedgerWorkLambdaQueryWrapper.in(SalesLedgerWork::getSalesLedgerSchedulingId, collect)
-// .ne(SalesLedgerWork::getStatus, 1);
-// List<SalesLedgerWork> salesLedgerWorks = salesLedgerWorkMapper.selectList(salesLedgerWorkLambdaQueryWrapper);
list.getRecords().forEach(i -> {
// 璁＄畻鐢熶骇鎬婚噺 = 瑙勬牸 * 鏁伴噺 / 1000
String[] split = i.getSpecificationModel().split("\\*");
--
Gitblit v1.9.3