From cf6b1cf6fa8f7784c6d7c64b7326d4662bc3d4b3 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 14 十月 2025 17:39:06 +0800
Subject: [PATCH] yys 1.智能排产 2.物料看板 3.报表分析
---
main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java b/main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java
index ad63a6c..ff3ec62 100644
--- a/main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java
+++ b/main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java
@@ -14,6 +14,7 @@
import com.ruoyi.business.mapper.PendingInventoryMapper;
import com.ruoyi.business.mapper.PurchaseRegistrationMapper;
import com.ruoyi.business.service.PurchaseRegistrationService;
+import com.ruoyi.business.utils.OrderUtils;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
@@ -62,7 +63,7 @@
.map(CoalInfo::getId)
.collect(Collectors.toList());
- // 缁勮鏌ヨ鏉′欢锛氱叅绉岻D鍦ㄥ尮閰嶇殑鍒楄〃涓� 鎴� 渚涘簲鍟嗗悕绉板尮閰�
+ // 缁勮鏌ヨ鏉′欢锛氱叅绉岻D鍦ㄥ尮閰嶇殑鍒楄〃涓�
queryWrapper.and(w -> {
if (!matchedCoalIds.isEmpty()) {
w.in(PurchaseRegistration::getCoalId, matchedCoalIds).or();
@@ -95,6 +96,9 @@
}
purchaseRegistration.setSupplierName(supply.getSupplierName());
if (Objects.isNull(purchaseRegistrationDto.getId())) {
+ // 鐢熸垚閲囪喘鍗曞彿
+ String pr = OrderUtils.countTodayByCreateTime(purchaseRegistrationMapper, "PR");
+ purchaseRegistration.setPurchaseNumber(pr);
// 鏂板閲囪喘鐧昏
purchaseRegistration.setRegistrationDate(LocalDate.now());
int insertCount = purchaseRegistrationMapper.insert(purchaseRegistration);
@@ -102,6 +106,7 @@
// 閲囪喘鐧昏鎴愬姛锛屽悓姝ュ垱寤哄緟鍏ュ簱璁板綍
PendingInventory pendingInventory = createPendingInventory(purchaseRegistration);
pendingInventory.setSupplierName(supply.getSupplierName());
+ pendingInventory.setPurchaseNumber(pr);
return pendingInventoryMapper.insert(pendingInventory);
}
return insertCount;
@@ -127,6 +132,7 @@
pendingInventory.setPurchaseId(purchaseRegistration.getId());
pendingInventory.setCoalId(purchaseRegistration.getCoalId());
pendingInventory.setInventoryQuantity(purchaseRegistration.getPurchaseQuantity());
+ pendingInventory.setType(purchaseRegistration.getType());
return pendingInventory;
}
--
Gitblit v1.9.3