From 1342f568f4b6470efdfc69be7bb153e2b12762f9 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 31 三月 2026 17:00:57 +0800
Subject: [PATCH] feat:1.销售，采购，库存，质检模块产品添加批号，供应商 2.销售产品关联批号，供应商递归查询
---
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