From d0a809ce7f0b729552f77cb32e22b506f8234b79 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 23 七月 2025 10:32:38 +0800
Subject: [PATCH] yys 修改生产模块bug
---
src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java | 5 -----
src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java | 27 +++++++++++----------------
2 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java b/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java
index 2959e4d..38a2469 100644
--- a/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java
+++ b/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java
@@ -72,11 +72,6 @@
private LocalDate schedulingDate;
/**
- *
- */
- private Integer status;
-
- /**
* 鍒涘缓鑰�
*/
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java
index e565d49..bf35f8a 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java
@@ -79,10 +79,19 @@
@Override
public int productionReportUpdate(ProductionReportDto productionReportDto) {
- SalesLedgerWork salesLedgerWork = salesLedgerWorkMapper.selectById(productionReportDto.getId());
- if(salesLedgerWork == null) throw new RuntimeException("鎶ュ伐鏁版嵁涓嶅瓨鍦�");
+ SalesLedgerProductionAccounting salesLedgerProductionAccounting = salesLedgerProductionAccountingMapper.selectById(productionReportDto.getId());
+ if(salesLedgerProductionAccounting == null) throw new RuntimeException("鎶ュ伐鏁版嵁涓嶅瓨鍦�");
SysUser sysUser = sysUserMapper.selectUserById(productionReportDto.getSchedulingUserId());
if(sysUser == null) throw new RuntimeException("鐢熶骇浜轰笉瀛樺湪");
+ salesLedgerProductionAccounting.setFinishedNum(productionReportDto.getFinishedNum());
+ salesLedgerProductionAccounting.setSchedulingUserId(sysUser.getUserId());
+ salesLedgerProductionAccounting.setSchedulingUserName(sysUser.getNickName());
+ salesLedgerProductionAccounting.setSchedulingDate(LocalDate.parse(productionReportDto.getSchedulingDate(), DateTimeFormatter.ISO_LOCAL_DATE));
+ salesLedgerProductionAccountingMapper.updateById(salesLedgerProductionAccounting);
+
+ // 鏇存柊鎶ュ伐鏁版嵁
+ SalesLedgerWork salesLedgerWork = salesLedgerWorkMapper.selectById(salesLedgerProductionAccounting.getSalesLedgerWorkId());
+ if(salesLedgerWork == null) throw new RuntimeException("鎶ュ伐鏁版嵁涓嶅瓨鍦�");
salesLedgerWork.setFinishedNum(productionReportDto.getFinishedNum());
if(salesLedgerWork.getSchedulingNum().compareTo(salesLedgerWork.getFinishedNum()) <= 0){
salesLedgerWork.setStatus(3);
@@ -93,20 +102,6 @@
salesLedgerWork.setSchedulingUserName(sysUser.getNickName());
salesLedgerWork.setSchedulingDate(LocalDate.parse(productionReportDto.getSchedulingDate(), DateTimeFormatter.ISO_LOCAL_DATE));
salesLedgerWorkMapper.updateById(salesLedgerWork);
-
- // 鏇存柊鏍哥畻鏁版嵁
- LambdaQueryWrapper<SalesLedgerProductionAccounting> salesLedgerProductionAccountingLambdaQueryWrapper = new LambdaQueryWrapper<>();
- salesLedgerProductionAccountingLambdaQueryWrapper.eq(SalesLedgerProductionAccounting::getSalesLedgerWorkId, salesLedgerWork.getId())
- .orderByDesc(SalesLedgerProductionAccounting::getCreateTime)
- .last("limit 1");
- SalesLedgerProductionAccounting salesLedgerProductionAccounting = salesLedgerProductionAccountingMapper.selectOne(salesLedgerProductionAccountingLambdaQueryWrapper);
- if(salesLedgerProductionAccounting != null){
- salesLedgerProductionAccounting.setFinishedNum(productionReportDto.getFinishedNum());
- salesLedgerProductionAccounting.setSchedulingUserId(sysUser.getUserId());
- salesLedgerProductionAccounting.setSchedulingUserName(sysUser.getNickName());
- salesLedgerProductionAccounting.setSchedulingDate(LocalDate.parse(productionReportDto.getSchedulingDate(), DateTimeFormatter.ISO_LOCAL_DATE));
- salesLedgerProductionAccountingMapper.updateById(salesLedgerProductionAccounting);
- }
return 0;
}
--
Gitblit v1.9.3