From 5ddc232b8dffcb3402711874491df35fb1997d1d Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期六, 09 五月 2026 16:08:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 336 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 307 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
index 31affd2..344800c 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -14,14 +14,23 @@
import com.ruoyi.basic.utils.FileUtil;
import com.ruoyi.common.constant.StorageAttachmentConstants;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.production.bean.dto.ProductionOperationTaskDto;
import com.ruoyi.production.bean.dto.ProductionOrderDto;
import com.ruoyi.production.bean.vo.ProductionBomStructureVo;
+import com.ruoyi.production.bean.vo.ProductionOperationTaskVo;
import com.ruoyi.production.bean.vo.ProductionOrderPickVo;
import com.ruoyi.production.bean.vo.ProductionOrderVo;
import com.ruoyi.production.bean.vo.ProductionPlanVo;
+import com.ruoyi.production.bean.vo.ProductionOrderWorkOrderDetailVo;
import com.ruoyi.production.enums.ProductOrderStatusEnum;
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.*;
+import com.ruoyi.quality.mapper.QualityInspectFileMapper;
+import com.ruoyi.quality.mapper.QualityInspectMapper;
+import com.ruoyi.quality.mapper.QualityInspectParamMapper;
+import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.quality.pojo.QualityInspectFile;
+import com.ruoyi.quality.pojo.QualityInspectParam;
import com.ruoyi.production.service.ProductionOrderService;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
@@ -51,8 +60,12 @@
private final ProductionOrderBomMapper productionOrderBomMapper;
private final ProductionBomStructureMapper productionBomStructureMapper;
private final ProductionProductMainMapper productionProductMainMapper;
+ private final ProductionProductOutputMapper productionProductOutputMapper;
private final ProductionOrderPickMapper productionOrderPickMapper;
private final ProductionOrderPickRecordMapper productionOrderPickRecordMapper;
+ private final QualityInspectMapper qualityInspectMapper;
+ private final QualityInspectParamMapper qualityInspectParamMapper;
+ private final QualityInspectFileMapper qualityInspectFileMapper;
private final ProductionPlanMapper productionPlanMapper;
private final StockInventoryMapper stockInventoryMapper;
private final StorageAttachmentMapper storageAttachmentMapper;
@@ -69,6 +82,7 @@
@Override
public IPage<ProductionOrderVo> pageProductionOrder(Page<ProductionOrderDto> page, ProductionOrderDto dto) {
+ // 鍒嗛〉鏌ヨ鐢熶骇璁㈠崟
Page<ProductionOrderVo> result = (Page<ProductionOrderVo>) baseMapper.pageProductionOrder(page, dto);
fillProductImages(result.getRecords());
return result;
@@ -76,6 +90,7 @@
@Override
public List<ProductionOrderVo> listProductionOrder(ProductionOrderDto dto) {
+ // 鏌ヨ鐢熶骇璁㈠崟鍒楄〃
List<ProductionOrderVo> records = baseMapper.listProductionOrder(dto);
fillProductImages(records);
return records;
@@ -83,6 +98,7 @@
@Override
public ProductionOrderVo getProductionOrderInfo(Long id) {
+ // 鑾峰彇鐢熶骇璁㈠崟璇︽儏
ProductionOrderVo item = baseMapper.getProductionOrderInfo(id);
if (item == null) {
return null;
@@ -93,6 +109,7 @@
@Override
public boolean saveProductionOrder(ProductionOrder productionOrder) {
+ // 淇濆瓨鐢熶骇璁㈠崟
ProductionOrder oldOrder = productionOrder.getId() == null ? null : this.getById(productionOrder.getId());
// 涓嬪崟鍏ュ彛缁熶竴琛ラ綈鏉ユ簮鍗曟嵁銆佽鍒掑拰宸ヨ壓淇℃伅锛岄伩鍏嶅墠绔垎鍒紶澶氬瀛楁銆�
validateAndFillOrder(productionOrder, oldOrder);
@@ -124,6 +141,7 @@
@Override
public boolean removeProductionOrder(List<Long> ids) {
+ // 鍒犻櫎鐢熶骇璁㈠崟
if (ids == null || ids.isEmpty()) {
return false;
}
@@ -137,6 +155,7 @@
@Override
public Integer bindingRoute(ProductionOrderDto productionOrderDto) {
+ // 涓鸿鍗曠粦瀹氬伐鑹鸿矾绾�
if (productionOrderDto == null || productionOrderDto.getId() == null) {
throw new ServiceException("鐢熶骇璁㈠崟ID涓嶈兘涓虹┖");
}
@@ -180,6 +199,7 @@
@Override
public List<ProductionPlanVo> getSource(Long id) {
+ // 鏌ヨ璁㈠崟鍏宠仈鏉ユ簮璁″垝
ProductionOrder productionOrder = baseMapper.selectById(id);
if (productionOrder != null && productionOrder.getProductionPlanIds() != null) {
List<Long> planIds = parsePlanIds(productionOrder.getProductionPlanIds());
@@ -190,7 +210,9 @@
@Override
public int syncProductionOrderSnapshot(Long productionOrderId) {
+ // 鍚屾璁㈠崟宸ヨ壓銆佸伐搴忋�佸弬鏁板拰BOM蹇収
ProductionOrder productionOrder = this.getById(productionOrderId);
+ // 鍙傛暟涓庡墠缃潯浠舵牎楠�
if (productionOrder == null) {
throw new ServiceException("鐢熶骇璁㈠崟涓嶅瓨鍦�");
}
@@ -205,6 +227,7 @@
clearProductionSnapshot(productionOrderId);
ProductionOrderBom orderBom = syncProductionOrderBomSnapshot(productionOrder, technologyRouting);
+ //鐢熶骇璁㈠崟宸ヨ壓璺嚎琛�
ProductionOrderRouting orderRouting = new ProductionOrderRouting();
orderRouting.setProductionOrderId(productionOrder.getId());
orderRouting.setTechnologyRoutingId(technologyRouting.getId());
@@ -216,18 +239,25 @@
productionOrderRoutingMapper.insert(orderRouting);
int syncedParamCount = 0;
+ // 鏌ヨ骞跺噯澶囦笟鍔℃暟鎹�
List<TechnologyRoutingOperation> routingOperations = technologyRoutingOperationMapper.selectList(
Wrappers.<TechnologyRoutingOperation>lambdaQuery()
.eq(TechnologyRoutingOperation::getTechnologyRoutingId, technologyRouting.getId())
- .orderByAsc(TechnologyRoutingOperation::getDragSort)
- .orderByAsc(TechnologyRoutingOperation::getId));
+ .orderByDesc(TechnologyRoutingOperation::getDragSort)
+ .orderByDesc(TechnologyRoutingOperation::getId));
Map<Long, String> operationNameMap = technologyOperationMapper.selectBatchIds(
+ // 閬嶅巻澶勭悊鏁版嵁骞剁粍瑁呯粨鏋�
routingOperations.stream()
.map(TechnologyRoutingOperation::getTechnologyOperationId)
.filter(Objects::nonNull)
.collect(Collectors.toSet()))
.stream()
.collect(Collectors.toMap(TechnologyOperation::getId, TechnologyOperation::getName, (a, b) -> a));
+ Integer lastDragSort = routingOperations.stream()
+ .map(TechnologyRoutingOperation::getDragSort)
+ .filter(Objects::nonNull)
+ .max(Integer::compareTo)
+ .orElse(null);
for (TechnologyRoutingOperation sourceOperation : routingOperations) {
// 璁㈠崟宸ュ簭淇濆瓨鐨勬槸宸ヨ壓宸ュ簭蹇収锛屽悗缁姤宸ュ彧渚濊禆蹇収锛屼笉鍐嶇洿鎺ュ紩鐢ㄥ伐鑹轰富鏁版嵁銆�
ProductionOrderRoutingOperation targetOperation = new ProductionOrderRoutingOperation();
@@ -236,19 +266,24 @@
targetOperation.setOrderRoutingId(orderRouting.getId());
targetOperation.setProductModelId(sourceOperation.getProductModelId());
targetOperation.setDragSort(sourceOperation.getDragSort());
+ targetOperation.setIsProduction(sourceOperation.getIsProduction());
targetOperation.setIsQuality(sourceOperation.getIsQuality());
targetOperation.setOperationName(operationNameMap.get(sourceOperation.getTechnologyOperationId()));
targetOperation.setTechnologyOperationId(sourceOperation.getTechnologyOperationId());
+ targetOperation.setType(sourceOperation.getType());
productionOrderRoutingOperationMapper.insert(targetOperation);
- ProductionOperationTask task = new ProductionOperationTask();
- task.setTechnologyRoutingOperationId(targetOperation.getId());
- task.setProductionOrderId(productionOrder.getId());
- task.setPlanQuantity(defaultDecimal(productionOrder.getQuantity()));
- task.setCompleteQuantity(BigDecimal.ZERO);
- task.setWorkOrderNo(generateNextTaskNo());
- task.setStatus(2);
- productionOperationTaskMapper.insert(task);
+ boolean isLastOperation = lastDragSort != null && Objects.equals(sourceOperation.getDragSort(), lastDragSort);
+ if (isLastOperation || Boolean.TRUE.equals(targetOperation.getIsProduction())) {
+ ProductionOperationTask task = new ProductionOperationTask();
+ task.setProductionOrderRoutingOperationId(targetOperation.getId());
+ task.setProductionOrderId(productionOrder.getId());
+ task.setPlanQuantity(defaultDecimal(productionOrder.getQuantity()));
+ task.setCompleteQuantity(BigDecimal.ZERO);
+ task.setWorkOrderNo(generateNextTaskNo());
+ task.setStatus(2);
+ productionOperationTaskMapper.insert(task);
+ }
List<TechnologyRoutingOperationParam> sourceParams = technologyRoutingOperationParamMapper.selectList(
Wrappers.<TechnologyRoutingOperationParam>lambdaQuery()
@@ -279,6 +314,7 @@
}
private ProductionOrderBom syncProductionOrderBomSnapshot(ProductionOrder productionOrder, TechnologyRouting technologyRouting) {
+ // 鍚屾璁㈠崟BOM蹇収缁撴瀯
if (technologyRouting.getBomId() == null) {
return null;
}
@@ -286,10 +322,12 @@
if (technologyBom == null) {
throw new ServiceException("宸ヨ壓BOM涓嶅瓨鍦�");
}
+ // 鏌ヨ骞跺噯澶囦笟鍔℃暟鎹�
List<TechnologyBomStructure> structureList = technologyBomStructureMapper.selectList(
Wrappers.<TechnologyBomStructure>lambdaQuery()
.eq(TechnologyBomStructure::getBomId, technologyBom.getId())
.orderByAsc(TechnologyBomStructure::getId));
+ // 閬嶅巻澶勭悊鏁版嵁骞剁粍瑁呯粨鏋�
TechnologyBomStructure root = structureList.stream().filter(item -> item.getParentId() == null).findFirst().orElse(null);
BigDecimal orderQuantity = defaultDecimal(productionOrder.getQuantity());
@@ -300,6 +338,7 @@
orderBom.setRemark(technologyBom.getRemark());
orderBom.setBomNo(technologyBom.getBomNo());
orderBom.setVersion(technologyBom.getVersion());
+ // 鎸佷箙鍖栨垨杈撳嚭澶勭悊缁撴灉
productionOrderBomMapper.insert(orderBom);
Map<Long, Long> idMap = new HashMap<>();
@@ -321,16 +360,19 @@
}
private void clearProductionSnapshot(Long productionOrderId) {
- // 宸蹭骇鐢熼鏂欒褰曞悗绂佹閲嶅缓锛岄伩鍏嶅鏂�/鎶曟枡渚濇嵁涓庤鍗曞揩鐓ц劚鑺傘��
+ // 娓呯悊璁㈠崟宸茬敓鎴愮殑宸ヨ壓涓嶣OM蹇収鏁版嵁
boolean hasPickRecord = productionOrderPickRecordMapper.selectCount(
+ // 鏌ヨ骞跺噯澶囦笟鍔℃暟鎹�
Wrappers.<ProductionOrderPickRecord>lambdaQuery()
.eq(ProductionOrderPickRecord::getProductionOrderId, productionOrderId)) > 0;
+ // 鍙傛暟涓庡墠缃潯浠舵牎楠�
if (hasPickRecord) {
throw new ServiceException("鐢熶骇璁㈠崟宸插瓨鍦ㄩ鏂欒褰曪紝涓嶈兘閲嶆柊鐢熸垚蹇収");
}
List<Long> taskIds = productionOperationTaskMapper.selectList(
Wrappers.<ProductionOperationTask>lambdaQuery()
.eq(ProductionOperationTask::getProductionOrderId, productionOrderId))
+ // 閬嶅巻澶勭悊鏁版嵁骞剁粍瑁呯粨鏋�
.stream().map(ProductionOperationTask::getId).collect(Collectors.toList());
if (!taskIds.isEmpty()) {
// 宸叉湁鎶ュ伐璁板綍璇存槑璁㈠崟宸插紑宸ワ紝姝ゆ椂涓嶅厑璁稿啀閲嶅缓蹇収銆�
@@ -358,6 +400,7 @@
}
private LambdaQueryWrapper<ProductionOrder> buildQueryWrapper(ProductionOrderDto dto) {
+ // 鎸夋潯浠跺姩鎬佹瀯寤烘暟鎹簱鏌ヨ鏉′欢
ProductionOrder query = dto == null ? new ProductionOrder() : dto;
return Wrappers.<ProductionOrder>lambdaQuery()
.eq(query.getId() != null, ProductionOrder::getId, query.getId())
@@ -368,6 +411,7 @@
}
private String generateNextOrderNo() {
+ // 鐢熸垚涓嬩竴涓敓浜ц鍗曞彿
String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
String prefix = "SC" + datePrefix;
ProductionOrder latestOrder = this.getOne(Wrappers.<ProductionOrder>lambdaQuery()
@@ -386,6 +430,7 @@
}
private String generateNextTaskNo() {
+ // 鐢熸垚涓嬩竴涓敓浜у伐鍗曞彿
String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
String prefix = "GD" + datePrefix;
ProductionOperationTask lastTask = productionOperationTaskMapper.selectOne(
@@ -405,10 +450,12 @@
}
private BigDecimal defaultDecimal(BigDecimal value) {
+ // 灏嗙┖鏁伴噺鍏滃簳涓�0锛岄伩鍏嶇┖鎸囬拡寮傚父
return value == null ? BigDecimal.ZERO : value;
}
private void validateAndFillOrder(ProductionOrder productionOrder, ProductionOrder oldOrder) {
+ // 鏍￠獙璁㈠崟鍙傛暟骞惰ˉ榻愰粯璁ゅ��
if (productionOrder == null) {
throw new ServiceException("鐢熶骇璁㈠崟涓嶈兘涓虹┖");
}
@@ -441,7 +488,9 @@
}
private void fillFromProductionPlans(ProductionOrder productionOrder) {
+ // 浠庡叧鑱旂敓浜ц鍒掑洖濉鍗曞叧閿瓧娈�
List<Long> planIds = parsePlanIds(productionOrder.getProductionPlanIds());
+ // 鍙傛暟涓庡墠缃潯浠舵牎楠�
if (planIds.isEmpty()) {
return;
}
@@ -449,6 +498,13 @@
List<ProductionPlan> productionPlans = productionPlanMapper.selectBatchIds(planIds);
if (productionPlans.size() != planIds.size()) {
throw new ServiceException("閮ㄥ垎鐢熶骇璁″垝涓嶅瓨鍦�");
+ }
+ // 閬嶅巻澶勭悊鏁版嵁骞剁粍瑁呯粨鏋�
+ Map<Long, ProductionPlan> planMap = productionPlans.stream()
+ .collect(Collectors.toMap(ProductionPlan::getId, item -> item, (left, right) -> left));
+ ProductionPlan mainPlan = planMap.get(planIds.get(0));
+ if (mainPlan == null) {
+ throw new ServiceException("涓荤敓浜ц鍒掍笉瀛樺湪");
}
Set<Long> productModelIds = productionPlans.stream()
.map(ProductionPlan::getProductModelId)
@@ -459,7 +515,7 @@
if (productionPlans.stream().anyMatch(item -> item.getStatus() != null && item.getStatus() == 2)) {
throw new ServiceException("鎵�閫夌敓浜ц鍒掑凡涓嬪彂");
}
- ProductionPlan firstPlan = productionPlans.get(0);
+ ProductionPlan firstPlan = mainPlan;
if (productionOrder.getProductModelId() == null) {
productionOrder.setProductModelId(firstPlan.getProductModelId());
} else if (!Objects.equals(productionOrder.getProductModelId(), firstPlan.getProductModelId())) {
@@ -482,6 +538,7 @@
}
private void releaseProductionPlanIssueStatus(ProductionOrder productionOrder) {
+ // 鍥為��鐢熶骇璁″垝涓嬪彂鐘舵��
if (productionOrder == null) {
return;
}
@@ -494,6 +551,7 @@
//鐢熶骇璁㈠崟鍒犻櫎锛岀敓浜ц鍒掔殑宸蹭笅鍙戞暟閲忓搴斿彉鏇�
private void updatePlanIssuedFlag(List<Long> planIds, BigDecimal remainingAssignedQuantity) {
+ // 鏇存柊璁″垝涓嬪彂鏍囪鍜屼笅鍙戞暟閲�
if (planIds == null || planIds.isEmpty()) {
return;
}
@@ -523,6 +581,7 @@
}
private BigDecimal resolveRemainingQuantity(ProductionPlan plan) {
+ // 璁＄畻褰撳墠璁″垝鎴栬褰曠殑鍓╀綑鏁伴噺
if (plan == null) {
return BigDecimal.ZERO;
}
@@ -541,6 +600,7 @@
}
private int resolvePlanStatus(BigDecimal requiredQuantity, BigDecimal issuedQuantity) {
+ // 鏍规嵁闇�姹傞噺鍜屼笅鍙戦噺鎺ㄥ璁″垝鐘舵��
if (requiredQuantity == null || requiredQuantity.compareTo(BigDecimal.ZERO) <= 0) {
return 0;
}
@@ -551,6 +611,7 @@
}
private List<Long> parsePlanIds(String productionPlanIds) {
+ // 灏嗚鍒扞D瀛楃涓茶В鏋愪负Long鍒楄〃
if (productionPlanIds == null || productionPlanIds.trim().isEmpty()) {
return new ArrayList<>();
}
@@ -567,6 +628,7 @@
}
private String formatPlanIds(List<Long> planIds) {
+ // 灏嗚鍒扞D闆嗗悎鏍煎紡鍖栦负[1,2,3]瀛楃涓�
if (planIds == null || planIds.isEmpty()) {
return null;
}
@@ -577,6 +639,7 @@
}
private LocalDate resolvePlanCompleteDate(ProductionPlan productionPlan) {
+ // 瑙ｆ瀽璁″垝瀹屾垚鏃ユ湡
if (productionPlan == null) {
return null;
}
@@ -590,13 +653,16 @@
}
private int compareDecimal(BigDecimal left, BigDecimal right) {
+ // 瀹夊叏姣旇緝涓や釜鏁伴噺鍊煎ぇ灏�
return defaultDecimal(left).compareTo(defaultDecimal(right));
}
private void fillProductImages(List<ProductionOrderVo> records) {
+ // 濉厖浜у搧鍥剧墖
if (records == null || records.isEmpty()) {
return;
}
+ // 閬嶅巻澶勭悊鏁版嵁骞剁粍瑁呯粨鏋�
List<Long> productModelIds = records.stream()
.map(ProductionOrderVo::getProductModelId)
.filter(Objects::nonNull)
@@ -606,6 +672,7 @@
return;
}
+ // 鏌ヨ骞跺噯澶囦笟鍔℃暟鎹�
List<StorageAttachment> attachments = storageAttachmentMapper.selectList(
Wrappers.<StorageAttachment>lambdaQuery()
.in(StorageAttachment::getRecordId, productModelIds)
@@ -648,6 +715,7 @@
}
private StorageBlobVO toStorageBlobVO(StorageBlob blob) {
+ // 灏嗗瓨鍌ㄦ枃浠跺璞¤浆鎹负VO
StorageBlobVO vo = BeanUtil.copyProperties(blob, StorageBlobVO.class);
vo.setPreviewURL(fileUtil.buildSignedPreviewUrl(vo));
vo.setDownloadURL(fileUtil.buildSignedDownloadUrl(vo));
@@ -655,11 +723,208 @@
}
@Override
+ public ProductionOrderWorkOrderDetailVo getWorkOrderReportInspectDetail(ProductionOrderDto dto) {
+ // 鑾峰彇宸ュ崟璁㈠崟鎶ュ伐璐ㄦ鏄庣粏
+ Long productionOrderId = resolveProductionOrderId(dto);
+ ProductionOrderVo orderInfo = getProductionOrderInfo(productionOrderId);
+ // 鍙傛暟涓庡墠缃潯浠舵牎楠�
+ if (orderInfo == null) {
+ throw new ServiceException("鐢熶骇璁㈠崟涓嶅瓨鍦�");
+ }
+
+ ProductionOrderWorkOrderDetailVo detailVo = new ProductionOrderWorkOrderDetailVo();
+ detailVo.setProductionOrder(orderInfo);
+
+ ProductionOperationTaskDto taskQuery = new ProductionOperationTaskDto();
+ taskQuery.setProductionOrderId(productionOrderId);
+ IPage<ProductionOperationTaskVo> workOrderPage = productionOperationTaskMapper.pageProductionOperationTask(
+ new Page<ProductionOperationTaskVo>(1, -1), taskQuery);
+ List<ProductionOperationTaskVo> workOrderList = workOrderPage == null || workOrderPage.getRecords() == null
+ ? Collections.emptyList()
+ // 閬嶅巻澶勭悊鏁版嵁骞剁粍瑁呯粨鏋�
+ : workOrderPage.getRecords().stream()
+ .filter(Objects::nonNull)
+ .sorted(Comparator.comparing(ProductionOperationTaskVo::getId, Comparator.nullsLast(Comparator.naturalOrder())))
+ .toList();
+ if (workOrderList.isEmpty()) {
+ detailVo.setWorkOrderList(Collections.emptyList());
+ return detailVo;
+ }
+
+ List<Long> workOrderIdList = workOrderList.stream()
+ .map(ProductionOperationTaskVo::getId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ List<ProductionProductMain> reportMainList = workOrderIdList.isEmpty()
+ ? Collections.emptyList()
+ // 鏌ヨ骞跺噯澶囦笟鍔℃暟鎹�
+ : productionProductMainMapper.selectList(
+ Wrappers.<ProductionProductMain>lambdaQuery()
+ .in(ProductionProductMain::getProductionOperationTaskId, workOrderIdList)
+ .orderByAsc(ProductionProductMain::getId));
+ Map<Long, List<ProductionProductMain>> reportMainByWorkOrderMap = new LinkedHashMap<>();
+ for (ProductionProductMain reportMain : reportMainList) {
+ if (reportMain == null || reportMain.getProductionOperationTaskId() == null) {
+ continue;
+ }
+ reportMainByWorkOrderMap.computeIfAbsent(reportMain.getProductionOperationTaskId(), key -> new ArrayList<>()).add(reportMain);
+ }
+
+ List<Long> reportMainIdList = reportMainList.stream()
+ .map(ProductionProductMain::getId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ Map<Long, List<ProductionProductOutput>> reportOutputMap = new LinkedHashMap<>();
+ Map<Long, List<ProductionOrderRoutingOperationParam>> reportParamMap = new LinkedHashMap<>();
+ Map<Long, List<QualityInspect>> inspectMap = new LinkedHashMap<>();
+ Map<Long, List<QualityInspectParam>> inspectParamMap = new LinkedHashMap<>();
+ Map<Long, List<QualityInspectFile>> inspectFileMap = new LinkedHashMap<>();
+ if (!reportMainIdList.isEmpty()) {
+ List<ProductionProductOutput> reportOutputList = productionProductOutputMapper.selectList(
+ Wrappers.<ProductionProductOutput>lambdaQuery()
+ .in(ProductionProductOutput::getProductionProductMainId, reportMainIdList)
+ .orderByAsc(ProductionProductOutput::getId));
+ for (ProductionProductOutput reportOutput : reportOutputList) {
+ if (reportOutput == null) {
+ continue;
+ }
+ Long reportMainId = reportOutput.getProductionProductMainId() != null
+ ? reportOutput.getProductionProductMainId()
+ : reportOutput.getProductMainId();
+ if (reportMainId == null) {
+ continue;
+ }
+ reportOutputMap.computeIfAbsent(reportMainId, k -> new ArrayList<>()).add(reportOutput);
+ }
+
+ List<ProductionOrderRoutingOperationParam> reportParamList = productionOrderRoutingOperationParamMapper.selectList(
+ Wrappers.<ProductionOrderRoutingOperationParam>lambdaQuery()
+ .in(ProductionOrderRoutingOperationParam::getProductionProductMainId, reportMainIdList)
+ .orderByAsc(ProductionOrderRoutingOperationParam::getId));
+ for (ProductionOrderRoutingOperationParam reportParam : reportParamList) {
+ if (reportParam == null || reportParam.getProductionProductMainId() == null) {
+ continue;
+ }
+ reportParamMap.computeIfAbsent(reportParam.getProductionProductMainId(), k -> new ArrayList<>()).add(reportParam);
+ }
+
+ List<QualityInspect> inspectList = qualityInspectMapper.selectList(
+ Wrappers.<QualityInspect>lambdaQuery()
+ .in(QualityInspect::getProductMainId, reportMainIdList)
+ .orderByAsc(QualityInspect::getId));
+ for (QualityInspect inspect : inspectList) {
+ if (inspect == null || inspect.getProductMainId() == null) {
+ continue;
+ }
+ inspectMap.computeIfAbsent(inspect.getProductMainId(), key -> new ArrayList<>()).add(inspect);
+ }
+
+ List<Long> inspectIdList = inspectList.stream()
+ .map(QualityInspect::getId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ if (!inspectIdList.isEmpty()) {
+ List<QualityInspectParam> inspectParamList = qualityInspectParamMapper.selectList(
+ Wrappers.<QualityInspectParam>lambdaQuery()
+ .in(QualityInspectParam::getInspectId, inspectIdList)
+ .orderByAsc(QualityInspectParam::getId));
+ for (QualityInspectParam inspectParam : inspectParamList) {
+ if (inspectParam == null || inspectParam.getInspectId() == null) {
+ continue;
+ }
+ inspectParamMap.computeIfAbsent(inspectParam.getInspectId(), k -> new ArrayList<>()).add(inspectParam);
+ }
+
+ List<QualityInspectFile> inspectFileList = qualityInspectFileMapper.selectList(
+ Wrappers.<QualityInspectFile>lambdaQuery()
+ .in(QualityInspectFile::getInspectId, inspectIdList)
+ .orderByAsc(QualityInspectFile::getId));
+ for (QualityInspectFile inspectFile : inspectFileList) {
+ if (inspectFile == null || inspectFile.getInspectId() == null) {
+ continue;
+ }
+ inspectFileMap.computeIfAbsent(inspectFile.getInspectId(), k -> new ArrayList<>()).add(inspectFile);
+ }
+ }
+ }
+
+ List<ProductionOrderWorkOrderDetailVo.WorkOrderDetail> workOrderDetailList = new ArrayList<>();
+ for (ProductionOperationTaskVo workOrder : workOrderList) {
+ ProductionOrderWorkOrderDetailVo.WorkOrderDetail workOrderDetail = new ProductionOrderWorkOrderDetailVo.WorkOrderDetail();
+ workOrderDetail.setWorkOrder(workOrder);
+
+ List<ProductionProductMain> workOrderReportMainList = reportMainByWorkOrderMap.getOrDefault(workOrder.getId(), Collections.emptyList());
+ if (workOrderReportMainList.isEmpty()) {
+ workOrderDetail.setReportList(Collections.emptyList());
+ workOrderDetail.setInspectList(Collections.emptyList());
+ workOrderDetailList.add(workOrderDetail);
+ continue;
+ }
+
+ List<ProductionOrderWorkOrderDetailVo.ReportDetail> reportDetailList = new ArrayList<>();
+ List<ProductionOrderWorkOrderDetailVo.InspectDetail> inspectDetailList = new ArrayList<>();
+ for (ProductionProductMain reportMain : workOrderReportMainList) {
+ Long reportMainId = reportMain.getId();
+
+ ProductionOrderWorkOrderDetailVo.ReportDetail reportDetail = new ProductionOrderWorkOrderDetailVo.ReportDetail();
+ reportDetail.setReportMain(reportMain);
+ reportDetail.setWorkHour(reportMain.getWorkHour());
+ reportDetail.setReportOutputList(reportOutputMap.getOrDefault(reportMainId, Collections.emptyList()));
+ reportDetail.setReportParamList(reportParamMap.getOrDefault(reportMainId, Collections.emptyList()));
+ reportDetailList.add(reportDetail);
+
+ List<QualityInspect> reportInspectList = inspectMap.getOrDefault(reportMainId, Collections.emptyList());
+ for (QualityInspect inspect : reportInspectList) {
+ ProductionOrderWorkOrderDetailVo.InspectDetail inspectDetail = new ProductionOrderWorkOrderDetailVo.InspectDetail();
+ inspectDetail.setReportId(reportMainId);
+ inspectDetail.setReportNo(reportMain.getProductNo());
+ inspectDetail.setReportMain(reportMain);
+ inspectDetail.setWorkHour(reportMain.getWorkHour());
+ inspectDetail.setInspect(inspect);
+ inspectDetail.setInspectParamList(inspectParamMap.getOrDefault(inspect.getId(), Collections.emptyList()));
+ inspectDetail.setInspectFileList(inspectFileMap.getOrDefault(inspect.getId(), Collections.emptyList()));
+ inspectDetailList.add(inspectDetail);
+ }
+ }
+
+ workOrderDetail.setReportList(reportDetailList);
+ workOrderDetail.setInspectList(inspectDetailList);
+ workOrderDetailList.add(workOrderDetail);
+ }
+
+ detailVo.setWorkOrderList(workOrderDetailList);
+ return detailVo;
+ }
+
+ private Long resolveProductionOrderId(ProductionOrderDto dto) {
+ // 浠庡叆鍙備腑瑙ｆ瀽鐢熶骇璁㈠崟ID骞舵牎楠�
+ if (dto == null) {
+ throw new ServiceException("璇蜂紶鍏ョ敓浜ц鍗旾D鎴栫敓浜ц鍗曞彿");
+ }
+ if (dto.getId() != null) {
+ return dto.getId();
+ }
+ if (dto.getNpsNo() == null || dto.getNpsNo().trim().isEmpty()) {
+ throw new ServiceException("璇蜂紶鍏ョ敓浜ц鍗旾D鎴栫敓浜ц鍗曞彿");
+ }
+ ProductionOrder productionOrder = baseMapper.selectOne(
+ Wrappers.<ProductionOrder>lambdaQuery()
+ .eq(ProductionOrder::getNpsNo, dto.getNpsNo().trim())
+ .last("limit 1"));
+ if (productionOrder == null || productionOrder.getId() == null) {
+ throw new ServiceException("鐢熶骇璁㈠崟涓嶅瓨鍦�");
+ }
+ return productionOrder.getId();
+ }
+
+ @Override
public List<ProductionOrderPickVo> pick(Long productionOrderId) {
+ // 鏌ヨ璁㈠崟棰嗘枡銆佹姇鏂欎笌閫�鏂欐槑缁�
if (productionOrderId == null) {
return Collections.emptyList();
}
+ // 鏌ヨ骞跺噯澶囦笟鍔℃暟鎹�
ProductionOrderBom orderBom = productionOrderBomMapper.selectOne(
Wrappers.<ProductionOrderBom>lambdaQuery()
.eq(ProductionOrderBom::getProductionOrderId, productionOrderId)
@@ -674,6 +939,7 @@
return Collections.emptyList();
}
+ // 閬嶅巻澶勭悊鏁版嵁骞剁粍瑁呯粨鏋�
List<Long> productModelIds = bomStructureList.stream()
.map(ProductionBomStructureVo::getProductModelId)
.filter(Objects::nonNull)
@@ -698,28 +964,40 @@
}
}
- List<ProductionOrderPickVo> result = new ArrayList<>(bomStructureList.size());
+ Map<String, ProductionOrderPickVo> mergedPickMap = new LinkedHashMap<>();
for (ProductionBomStructureVo structure : bomStructureList) {
if (structure == null || structure.getProductModelId() == null) {
continue;
}
Long productModelId = structure.getProductModelId();
- ProductionOrderPickVo vo = new ProductionOrderPickVo();
- vo.setProductModelId(productModelId);
- vo.setOperationName(structure.getOperationName());
- vo.setTechnologyOperationId(structure.getTechnologyOperationId());
- vo.setProductName(structure.getProductName());
- vo.setModel(structure.getModel());
- vo.setDemandedQuantity(defaultDecimal(structure.getDemandedQuantity()));
- vo.setUnit(structure.getUnit());
- List<String> batchNoList = stockBatchNoMap.get(productModelId) == null
- ? Collections.emptyList()
- : new ArrayList<>(stockBatchNoMap.get(productModelId));
- vo.setBatchNoList(batchNoList);
- vo.setStockQuantity(stockQuantityMap.getOrDefault(productModelId, BigDecimal.ZERO));
- vo.setBom(true);
- result.add(vo);
+ String mergeKey = String.valueOf(structure.getTechnologyOperationId()) + "#" + productModelId;
+ ProductionOrderPickVo vo = mergedPickMap.get(mergeKey);
+ if (vo == null) {
+ vo = new ProductionOrderPickVo();
+ vo.setProductModelId(productModelId);
+ vo.setOperationName(structure.getOperationName());
+ vo.setTechnologyOperationId(structure.getTechnologyOperationId());
+ vo.setProductName(structure.getProductName());
+ vo.setModel(structure.getModel());
+ vo.setDemandedQuantity(BigDecimal.ZERO);
+ vo.setUnit(structure.getUnit());
+ List<String> batchNoList = stockBatchNoMap.get(productModelId) == null
+ ? Collections.emptyList()
+ : new ArrayList<>(stockBatchNoMap.get(productModelId));
+ vo.setBatchNoList(batchNoList);
+ vo.setStockQuantity(stockQuantityMap.getOrDefault(productModelId, BigDecimal.ZERO));
+ vo.setBom(true);
+ mergedPickMap.put(mergeKey, vo);
+ }
+ vo.setDemandedQuantity(defaultDecimal(vo.getDemandedQuantity()).add(defaultDecimal(structure.getDemandedQuantity())));
}
- return result;
+ return new ArrayList<>(mergedPickMap.values());
+ }
+
+ @Override
+ public int updateOrder(ProductionOrderDto productionOrderDto) {
+ // 鏇存柊鐢熶骇璁㈠崟涓绘暟鎹�
+ productionOrderDto.setStatus(5);
+ return baseMapper.updateById(productionOrderDto);
}
}
--
Gitblit v1.9.3