From e4efff6637f4d598a7efdfca8b62fbb4c3286b02 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期四, 22 五月 2025 15:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireServiceImpl.java | 46 +++++++++++++++++-----------------------------
1 files changed, 17 insertions(+), 29 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireServiceImpl.java
index e6b8cd9..a7653f6 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateStandardRequireServiceImpl.java
@@ -1,29 +1,27 @@
package com.aps.core.service.impl.ApsPlate;
-import java.math.BigDecimal;
-import java.util.*;
-
import cn.hutool.core.util.IdUtil;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.security.utils.DictUtils;
import com.aps.common.security.utils.SecurityUtils;
-import com.aps.core.domain.*;
-import com.aps.core.domain.ApsPlate.ApsPlatePlan;
-import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomOrderDetail;
-import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomStockDetail;
+import com.aps.core.domain.ApsBom;
+import com.aps.core.domain.ApsMaterialStorageManagement;
+import com.aps.core.domain.ApsPlate.*;
+import com.aps.core.domain.ApsStandardProcessRouteLine;
import com.aps.core.mapper.*;
-import com.aps.core.service.*;
import com.aps.core.service.ApsPlate.*;
+import com.aps.core.service.IApsBomService;
+import com.aps.core.service.IApsMaterialStorageManagementService;
+import com.aps.core.service.IApsStandardProcessRouteLineService;
import com.aps.system.api.domain.SysDictData;
import jakarta.annotation.Resource;
-import com.aps.core.domain.ApsPlate.ApsPlateStandardRequire;
-import com.aps.core.mapper.ApsPlateStandardRequireMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
+import java.math.BigDecimal;
+import java.util.*;
/**
* 閽ｉ噾宸ュ崟鏍囧噯闇�姹係ervice涓氬姟灞傚鐞�
@@ -39,29 +37,17 @@
private ApsPlateStandardRequireMapper apsPlateStandardRequireMapper;
@Resource
- private ApsPlateStandardRequireBatchMapper requireBatchMapper;
-
- @Resource
ApsPlatePlanMapper platePlanMapper;
@Resource
- ApsBomHeaderMapper bomHeaderMapper;
- @Resource
IApsBomService bomLineService;
-
- @Resource
- ApsMaterialStorageManagementMapper itemStorageMapper;
@Resource
ApsPlateStandardRequireBomStockDetailMapper plateBomStockDetailMapper;
@Resource
IApsPlateStandardRequireBomStockDetailService bomStockDetailService;
- @Resource
- ApsStandardProcessRouteHeaderMapper standardProcessRouteHeaderMapper;
- @Resource
- ApsStandardProcessRouteLineMapper ApsStandardProcessRouteLineMapper;
@Resource
ApsPlateStandardRequireBomOrderDetailMapper plateBomOrderDetailMapper;
@@ -76,10 +62,11 @@
IApsStandardProcessRouteLineService routeLineService;
@Resource
- IApsPlateStandardRequireBatchService requireBatchService;
+ IApsPlateStandardRequireErrorService requireErrorService;
@Resource
private IApsMaterialStorageManagementService storageManagementService;
-
+ @Resource
+ IApsPlateStandardRequireBatchService requireBatchService;
/**
* 鏌ヨ閽ｉ噾宸ュ崟鏍囧噯闇�姹�
*
@@ -167,9 +154,7 @@
@Transactional
@Override
public void generatorPlan(String batchNum){
-
- /*鍒濆鍖栨暟鎹�*/
- requireBatchService.initRequireBatch();
+ requireBatchService.initRequireBatch(batchNum);
/*瀹氫箟宸ュ巶涓哄崡閫� */
String plantCode="FORTUNA";
/*鑾峰彇閽ｉ噾涓诲崟淇℃伅*/
@@ -296,7 +281,10 @@
if (itemStorageOpt.isPresent()) {
ApsMaterialStorageManagement itemStorage=itemStorageOpt.get();
- BigDecimal remainderStock =itemStorage.getRemainderStock();
+ BigDecimal remainderStock =BigDecimal.ZERO;
+ if(null!=itemStorage.getRemainderStock()){
+ remainderStock = itemStorage.getRemainderStock();
+ }
/*璁＄畻鍑�闇�姹� 榛樿=闇�姹傛暟閲�*/
if (remainderStock.compareTo(BigDecimal.ZERO) == 0) {
require.setNetRequirement(require.getBomUseAmount());
--
Gitblit v1.9.3