From 5c891d8d2c206dfd2aa6daf59579eb2b6843dcc0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 01 四月 2026 18:00:37 +0800
Subject: [PATCH] fix:1.采购/销售入库去掉审批 2.返工下载附件内容变更 3.生产/库存入库生产日期添加 4.仓库导入导出字段优化
---
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
index 4179275..c2d8519 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -107,15 +107,17 @@
return AjaxResult.error("鍙傛暟閿欒");
}
// 寰呭鏍镐笉鍙紪杈�
- if(staffSalaryMain1.getStatus() > 2){
- return AjaxResult.error("寰呭鏍镐笉鍙紪杈�");
- }
+// if(staffSalaryMain1.getStatus() > 3){
+// return AjaxResult.error("寰呭鏍镐笉鍙紪杈�");
+// }
staffSalaryMainMapper.updateById(staffSalaryMain);
- staffSalaryDetailMapper.delete(new LambdaQueryWrapper<StaffSalaryDetail>().eq(StaffSalaryDetail::getMainId, staffSalaryMain.getId()));
- staffSalaryMain.getStaffSalaryDetailList().forEach(detail -> {
- detail.setMainId(staffSalaryMain.getId());
- });
- staffSalaryDetailService.saveBatch(staffSalaryMain.getStaffSalaryDetailList());
+ if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(staffSalaryMain.getStaffSalaryDetailList())){
+ staffSalaryDetailMapper.delete(new LambdaQueryWrapper<StaffSalaryDetail>().eq(StaffSalaryDetail::getMainId, staffSalaryMain.getId()));
+ staffSalaryMain.getStaffSalaryDetailList().forEach(detail -> {
+ detail.setMainId(staffSalaryMain.getId());
+ });
+ staffSalaryDetailService.saveBatch(staffSalaryMain.getStaffSalaryDetailList());
+ }
// 鍜岃储鍔¤仈鍔紝鏂板鏀嚭
if(staffSalaryMain.getStatus().equals(5)){
AccountExpense accountExpense = new AccountExpense();
--
Gitblit v1.9.3