From 7b55a115c1d4a294c7e62521f6819ef94de4a656 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 08 十二月 2025 18:02:12 +0800
Subject: [PATCH] yys 采购自动入库
---
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 3 +++
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 18 ++++++++++++++++++
src/main/java/com/ruoyi/procurementrecord/dto/Details.java | 2 +-
3 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
index d0ff36a..25dd607 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -135,6 +135,9 @@
approveProcess.setApproveUserCurrentId(approveNode1.getApproveNodeUserId());
approveProcess.setApproveUserCurrentName(approveNode1.getApproveNodeUser());
}
+ if(approveProcess.getApproveStatus().equals(2) || approveProcess.getApproveStatus().equals(3) || approveProcess.getApproveStatus().equals(4)){
+ approveProcess.setApproveOverTime(new Date());
+ }
approveProcessMapper.updateById(approveProcess);
// 缁戝畾闄勪欢
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/Details.java b/src/main/java/com/ruoyi/procurementrecord/dto/Details.java
index b2e5a21..c12efed 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/Details.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/Details.java
@@ -10,7 +10,7 @@
*/
@Data
public class Details {
- private Integer id;
+ private Integer id; //浜у搧id
private BigDecimal inboundQuantity;
private BigDecimal warnNum;
}
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index e5a64fd..6a41de5 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -24,6 +24,9 @@
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.other.pojo.TempFile;
+import com.ruoyi.procurementrecord.dto.Details;
+import com.ruoyi.procurementrecord.dto.ProcurementAddDto;
+import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
@@ -43,6 +46,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@@ -109,6 +113,9 @@
}
return purchaseLedgerMapper.selectList(queryWrapper);
}
+
+ @Autowired
+ private ProcurementRecordService procurementRecordService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -244,6 +251,7 @@
}
// 鎵ц鎻掑叆鎿嶄綔
if (!insertList.isEmpty()) {
+ List<Details> details = new ArrayList<>();
for (SalesLedgerProduct salesLedgerProduct : insertList) {
salesLedgerProduct.setType(type);
Date entryDate = purchaseLedger.getEntryDate();
@@ -251,7 +259,17 @@
LocalDateTime localDateTime = entryDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
salesLedgerProduct.setRegisterDate(localDateTime);
salesLedgerProductMapper.insert(salesLedgerProduct);
+ Details details1 = new Details();
+ details1.setId(salesLedgerProduct.getId().intValue());
+ details1.setInboundQuantity(salesLedgerProduct.getQuantity());
+ details1.setWarnNum(salesLedgerProduct.getWarnNum());
+ details.add(details1);
}
+ // 鏂板閲囪喘鍏ュ簱
+ ProcurementAddDto dto = new ProcurementAddDto();
+ dto.setDetails(details);
+ dto.setNickName("瀛欏啀绾�");
+ procurementRecordService.add(dto);
}
// 璁＄畻鎬诲惈绋庨噾棰�
--
Gitblit v1.9.3