From 5ec8d62c24fc5844d1b88a91398178856ec76b12 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 08 五月 2025 15:46:17 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java | 31 ++++---------------------------
1 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
index 7029b83..0e40df7 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
@@ -160,8 +160,6 @@
String plantCode="FORTUNA";
/*瀹氫箟涓诲崟绫诲瀷涓洪挘閲戜富鍗�*/
String mainOrderType = "閽ｉ噾涓讳欢";
- /*瀹氫箟瀛愬崟绫诲瀷涓洪挘閲戝瓙鍗�*/
- String subOrderType = "閽ｉ噾瀛愪欢";
/*鐢熸垚鏂版壒娆″彿*/
String batchNum=getBatch();
/*鑾峰彇閽ｉ噾涓诲崟淇℃伅*/
@@ -187,17 +185,14 @@
}
}
}
-
-
-
-
}
+ /**
+ * 鏋勫缓闇�姹備俊鎭�
+ * */
private void getBomRequires(String plant, ApsBom bomLine, String batchNum, Date upLevelStartDate, ApsPlatePlan plan, List<ApsPlateStandardRequire> allRequires, Long level) {
String itemNumber = bomLine.getItemCode();
- String productivityModel_combined_batch = "鍚堟壒";
- String productivityModel_monopolize = "鐙崰";
/*鏋勫缓闇�姹備俊鎭�*/
ApsPlateStandardRequire require = new ApsPlateStandardRequire();
require.setId(IdUtil.getSnowflakeNextId());
@@ -242,7 +237,7 @@
afterStockAmount = remainderStock.subtract(deductionAmount);
require.setNetRequirement(BigDecimal.ZERO);
}
- bomStockDetailService.saveStorageAndDetail(storage, plan, bomLine, batchNum, deductionAmount, afterStockAmount);
+ bomStockDetailService.saveStorageAndDetail(storage, plan, bomLine, batchNum, deductionAmount, afterStockAmount,require.getId().toString());
}
}
@@ -288,7 +283,6 @@
require.setMatchState("寰呭尮閰�");
require.setMatchMode("宸ュ崟鍖归厤");
}
- require.setHasDelayRisk("鏃犻闄�");
/*浣跨敤瀛愪欢宸ュ崟杩涜闇�姹傚尮閰�*/
matchRequireAndSubPlan(require);
@@ -300,23 +294,6 @@
getBomRequires(plant, line, batchNum, require.getStartDate(), plan, allRequires, level + 1);
});
}
- }
-
- private BigDecimal getRouteLineTotalTime(ApsStandardProcessRouteHeader routeHeader, String productivityModel_monopolize, BigDecimal netRequirement) {
- ApsStandardProcessRouteLine routeLineParam = ApsStandardProcessRouteLine.builder()
- .routeId(routeHeader.getRouteId())
- .build();
- List<ApsStandardProcessRouteLine> apsStandardProcessRouteLines = ApsStandardProcessRouteLineMapper.selectApsStandardProcessRouteLineList(routeLineParam);
- /*宸ヨ壓璺嚎Line 鎬诲伐鏃�*/
- BigDecimal totalRouteTime = BigDecimal.ZERO;
- apsStandardProcessRouteLines.forEach(line -> {
- line.setRouteTime(line.getDesignCapacity());
- if (line.getProductivityModel().equals(productivityModel_monopolize)) {
- line.setRouteTime(line.getDesignCapacity().multiply(netRequirement));
- }
- totalRouteTime.add(line.getRouteTime());
- });
- return totalRouteTime;
}
/**
--
Gitblit v1.9.3