From 741918a903e17b2ec7522556d2c043b8d35dd8a1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 15 六月 2026 17:42:58 +0800
Subject: [PATCH] 生产取消bom,不合格管理定制化
---
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 205 ++++++++++++---------------------------------------
1 files changed, 48 insertions(+), 157 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 9973d98..c62a17e 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -16,9 +16,7 @@
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;
@@ -34,8 +32,6 @@
import com.ruoyi.production.service.ProductionOrderService;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
-import com.ruoyi.stock.mapper.StockInventoryMapper;
-import com.ruoyi.stock.pojo.StockInventory;
import com.ruoyi.technology.mapper.*;
import com.ruoyi.technology.pojo.*;
import lombok.RequiredArgsConstructor;
@@ -44,6 +40,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -57,17 +54,13 @@
private final ProductionOrderRoutingOperationMapper productionOrderRoutingOperationMapper;
private final ProductionOrderRoutingOperationParamMapper productionOrderRoutingOperationParamMapper;
private final ProductionOperationTaskMapper productionOperationTaskMapper;
- private final ProductionOrderBomMapper productionOrderBomMapper;
- private final ProductionBomStructureMapper productionBomStructureMapper;
+ private final ProductionOrderMapper productionOrderMapper;
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;
private final StorageBlobMapper storageBlobMapper;
private final SalesLedgerMapper salesLedgerMapper;
@@ -76,12 +69,11 @@
private final TechnologyRoutingOperationMapper technologyRoutingOperationMapper;
private final TechnologyRoutingOperationParamMapper technologyRoutingOperationParamMapper;
private final TechnologyOperationMapper technologyOperationMapper;
- private final TechnologyBomMapper technologyBomMapper;
- private final TechnologyBomStructureMapper technologyBomStructureMapper;
private final FileUtil fileUtil;
@Override
public IPage<ProductionOrderVo> pageProductionOrder(Page<ProductionOrderDto> page, ProductionOrderDto dto) {
+ // 鍒嗛〉鏌ヨ鐢熶骇璁㈠崟
Page<ProductionOrderVo> result = (Page<ProductionOrderVo>) baseMapper.pageProductionOrder(page, dto);
fillProductImages(result.getRecords());
return result;
@@ -89,6 +81,7 @@
@Override
public List<ProductionOrderVo> listProductionOrder(ProductionOrderDto dto) {
+ // 鏌ヨ鐢熶骇璁㈠崟鍒楄〃
List<ProductionOrderVo> records = baseMapper.listProductionOrder(dto);
fillProductImages(records);
return records;
@@ -96,6 +89,7 @@
@Override
public ProductionOrderVo getProductionOrderInfo(Long id) {
+ // 鑾峰彇鐢熶骇璁㈠崟璇︽儏
ProductionOrderVo item = baseMapper.getProductionOrderInfo(id);
if (item == null) {
return null;
@@ -106,11 +100,12 @@
@Override
public boolean saveProductionOrder(ProductionOrder productionOrder) {
+ // 淇濆瓨鐢熶骇璁㈠崟
ProductionOrder oldOrder = productionOrder.getId() == null ? null : this.getById(productionOrder.getId());
// 涓嬪崟鍏ュ彛缁熶竴琛ラ綈鏉ユ簮鍗曟嵁銆佽鍒掑拰宸ヨ壓淇℃伅锛岄伩鍏嶅墠绔垎鍒紶澶氬瀛楁銆�
validateAndFillOrder(productionOrder, oldOrder);
if (productionOrder.getNpsNo() == null || productionOrder.getNpsNo().trim().isEmpty()) {
- productionOrder.setNpsNo(generateNextOrderNo());
+ productionOrder.setNpsNo(generateNextOrderNo(productionOrder.getCreateTime() != null ? productionOrder.getCreateTime() : LocalDateTime.now()));
}
if (productionOrder.getCompleteQuantity() == null) {
productionOrder.setCompleteQuantity(BigDecimal.ZERO);
@@ -137,6 +132,7 @@
@Override
public boolean removeProductionOrder(List<Long> ids) {
+ // 鍒犻櫎鐢熶骇璁㈠崟
if (ids == null || ids.isEmpty()) {
return false;
}
@@ -150,6 +146,7 @@
@Override
public Integer bindingRoute(ProductionOrderDto productionOrderDto) {
+ // 涓鸿鍗曠粦瀹氬伐鑹鸿矾绾�
if (productionOrderDto == null || productionOrderDto.getId() == null) {
throw new ServiceException("鐢熶骇璁㈠崟ID涓嶈兘涓虹┖");
}
@@ -193,6 +190,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());
@@ -214,9 +212,7 @@
if (technologyRouting == null) {
throw new ServiceException("宸ヨ壓璺嚎涓嶅瓨鍦�");
}
- // 璁㈠崟蹇収鎸夆�滃厛娓呭悗寤衡�濆鐞嗭紝淇濊瘉宸ヨ壓璺嚎銆佸伐搴忋�佸弬鏁般�丅OM 鍏ㄩ儴鏉ヨ嚜鍚屼竴鐗堟湰銆�
clearProductionSnapshot(productionOrderId);
- ProductionOrderBom orderBom = syncProductionOrderBomSnapshot(productionOrder, technologyRouting);
ProductionOrderRouting orderRouting = new ProductionOrderRouting();
orderRouting.setProductionOrderId(productionOrder.getId());
@@ -224,8 +220,6 @@
orderRouting.setProductModelId(technologyRouting.getProductModelId());
orderRouting.setProcessRouteCode(technologyRouting.getProcessRouteCode());
orderRouting.setDescription(technologyRouting.getDescription());
- orderRouting.setBomId(technologyRouting.getBomId());
- orderRouting.setOrderBomId(orderBom == null ? null : orderBom.getId());
productionOrderRoutingMapper.insert(orderRouting);
int syncedParamCount = 0;
@@ -234,6 +228,7 @@
.eq(TechnologyRoutingOperation::getTechnologyRoutingId, technologyRouting.getId())
.orderByDesc(TechnologyRoutingOperation::getDragSort)
.orderByDesc(TechnologyRoutingOperation::getId));
+ BigDecimal orderQuantity = defaultDecimal(productionOrder.getQuantity());
Map<Long, String> operationNameMap = technologyOperationMapper.selectBatchIds(
routingOperations.stream()
.map(TechnologyRoutingOperation::getTechnologyOperationId)
@@ -247,7 +242,6 @@
.max(Integer::compareTo)
.orElse(null);
for (TechnologyRoutingOperation sourceOperation : routingOperations) {
- // 璁㈠崟宸ュ簭淇濆瓨鐨勬槸宸ヨ壓宸ュ簭蹇収锛屽悗缁姤宸ュ彧渚濊禆蹇収锛屼笉鍐嶇洿鎺ュ紩鐢ㄥ伐鑹轰富鏁版嵁銆�
ProductionOrderRoutingOperation targetOperation = new ProductionOrderRoutingOperation();
targetOperation.setProductionOrderId(productionOrder.getId());
targetOperation.setTechnologyRoutingOperationId(sourceOperation.getId());
@@ -258,6 +252,7 @@
targetOperation.setIsQuality(sourceOperation.getIsQuality());
targetOperation.setOperationName(operationNameMap.get(sourceOperation.getTechnologyOperationId()));
targetOperation.setTechnologyOperationId(sourceOperation.getTechnologyOperationId());
+ targetOperation.setType(sourceOperation.getType());
productionOrderRoutingOperationMapper.insert(targetOperation);
boolean isLastOperation = lastDragSort != null && Objects.equals(sourceOperation.getDragSort(), lastDragSort);
@@ -265,7 +260,7 @@
ProductionOperationTask task = new ProductionOperationTask();
task.setProductionOrderRoutingOperationId(targetOperation.getId());
task.setProductionOrderId(productionOrder.getId());
- task.setPlanQuantity(defaultDecimal(productionOrder.getQuantity()));
+ task.setPlanQuantity(orderQuantity);
task.setCompleteQuantity(BigDecimal.ZERO);
task.setWorkOrderNo(generateNextTaskNo());
task.setStatus(2);
@@ -277,7 +272,6 @@
.eq(TechnologyRoutingOperationParam::getTechnologyRoutingOperationId, sourceOperation.getId())
.orderByAsc(TechnologyRoutingOperationParam::getId));
for (TechnologyRoutingOperationParam sourceParam : sourceParams) {
- // 宸ュ簭鎵ц鍙傛暟鍚屾牱鍋氬揩鐓э紝閬垮厤宸ヨ壓鍙傛暟璋冩暣褰卞搷宸蹭笅杈捐鍗曘��
ProductionOrderRoutingOperationParam targetParam = new ProductionOrderRoutingOperationParam();
targetParam.setProductionOrderId(productionOrder.getId());
targetParam.setProductionOrderRoutingOperationId(targetOperation.getId());
@@ -300,62 +294,12 @@
return syncedParamCount;
}
- private ProductionOrderBom syncProductionOrderBomSnapshot(ProductionOrder productionOrder, TechnologyRouting technologyRouting) {
- if (technologyRouting.getBomId() == null) {
- return null;
- }
- TechnologyBom technologyBom = technologyBomMapper.selectById(technologyRouting.getBomId());
- 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());
-
- ProductionOrderBom orderBom = new ProductionOrderBom();
- orderBom.setProductionOrderId(productionOrder.getId());
- orderBom.setBomId(Long.valueOf(technologyBom.getId()));
- orderBom.setProductModelId(root != null ? root.getProductModelId() : productionOrder.getProductModelId());
- orderBom.setRemark(technologyBom.getRemark());
- orderBom.setBomNo(technologyBom.getBomNo());
- orderBom.setVersion(technologyBom.getVersion());
- productionOrderBomMapper.insert(orderBom);
-
- Map<Long, Long> idMap = new HashMap<>();
- for (TechnologyBomStructure source : structureList) {
- // 瀛愯妭鐐� parentId 闇�瑕佹槧灏勬垚鏂板揩鐓ц妭鐐� id锛屾墠鑳戒繚鐣欏師濮� BOM 灞傜骇銆�
- ProductionBomStructure target = new ProductionBomStructure();
- target.setProductionOrderId(productionOrder.getId());
- target.setProductionOrderBomId(orderBom.getId());
- target.setParentId(source.getParentId() == null ? null : idMap.get(source.getParentId()));
- target.setProductModelId(source.getProductModelId());
- target.setTechnologyOperationId(source.getOperationId());
- target.setUnitQuantity(source.getUnitQuantity());
- target.setDemandedQuantity(source.getUnitQuantity().multiply(orderQuantity));
- target.setUnit(source.getUnit());
- productionBomStructureMapper.insert(target);
- idMap.put(source.getId(), target.getId());
- }
- return orderBom;
- }
-
private void clearProductionSnapshot(Long productionOrderId) {
- // 宸蹭骇鐢熼鏂欒褰曞悗绂佹閲嶅缓锛岄伩鍏嶅鏂�/鎶曟枡渚濇嵁涓庤鍗曞揩鐓ц劚鑺傘��
- 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()) {
- // 宸叉湁鎶ュ伐璁板綍璇存槑璁㈠崟宸插紑宸ワ紝姝ゆ椂涓嶅厑璁稿啀閲嶅缓蹇収銆�
boolean started = productionProductMainMapper.selectCount(
Wrappers.<ProductionProductMain>lambdaQuery()
.in(ProductionProductMain::getProductionOperationTaskId, taskIds)) > 0;
@@ -371,15 +315,10 @@
.eq(ProductionOrderRoutingOperation::getProductionOrderId, productionOrderId));
productionOrderRoutingMapper.delete(Wrappers.<ProductionOrderRouting>lambdaQuery()
.eq(ProductionOrderRouting::getProductionOrderId, productionOrderId));
- productionBomStructureMapper.delete(Wrappers.<ProductionBomStructure>lambdaQuery()
- .eq(ProductionBomStructure::getProductionOrderId, productionOrderId));
- productionOrderBomMapper.delete(Wrappers.<ProductionOrderBom>lambdaQuery()
- .eq(ProductionOrderBom::getProductionOrderId, productionOrderId));
- productionOrderPickMapper.delete(Wrappers.<ProductionOrderPick>lambdaQuery()
- .eq(ProductionOrderPick::getProductionOrderId, productionOrderId));
}
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())
@@ -389,8 +328,10 @@
.orderByDesc(ProductionOrder::getId);
}
- private String generateNextOrderNo() {
- String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ private String generateNextOrderNo(LocalDateTime createTime) {
+ // 鐢熸垚涓嬩竴涓敓浜ц鍗曞彿
+ LocalDate localDate = createTime.toLocalDate();
+ String datePrefix = localDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
String prefix = "SC" + datePrefix;
ProductionOrder latestOrder = this.getOne(Wrappers.<ProductionOrder>lambdaQuery()
.likeRight(ProductionOrder::getNpsNo, prefix)
@@ -408,6 +349,7 @@
}
private String generateNextTaskNo() {
+ // 鐢熸垚涓嬩竴涓敓浜у伐鍗曞彿
String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
String prefix = "GD" + datePrefix;
ProductionOperationTask lastTask = productionOperationTaskMapper.selectOne(
@@ -427,10 +369,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("鐢熶骇璁㈠崟涓嶈兘涓虹┖");
}
@@ -463,7 +407,9 @@
}
private void fillFromProductionPlans(ProductionOrder productionOrder) {
+ // 浠庡叧鑱旂敓浜ц鍒掑洖濉鍗曞叧閿瓧娈�
List<Long> planIds = parsePlanIds(productionOrder.getProductionPlanIds());
+ // 鍙傛暟涓庡墠缃潯浠舵牎楠�
if (planIds.isEmpty()) {
return;
}
@@ -472,6 +418,7 @@
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));
@@ -510,6 +457,7 @@
}
private void releaseProductionPlanIssueStatus(ProductionOrder productionOrder) {
+ // 鍥為��鐢熶骇璁″垝涓嬪彂鐘舵��
if (productionOrder == null) {
return;
}
@@ -522,6 +470,7 @@
//鐢熶骇璁㈠崟鍒犻櫎锛岀敓浜ц鍒掔殑宸蹭笅鍙戞暟閲忓搴斿彉鏇�
private void updatePlanIssuedFlag(List<Long> planIds, BigDecimal remainingAssignedQuantity) {
+ // 鏇存柊璁″垝涓嬪彂鏍囪鍜屼笅鍙戞暟閲�
if (planIds == null || planIds.isEmpty()) {
return;
}
@@ -551,6 +500,7 @@
}
private BigDecimal resolveRemainingQuantity(ProductionPlan plan) {
+ // 璁＄畻褰撳墠璁″垝鎴栬褰曠殑鍓╀綑鏁伴噺
if (plan == null) {
return BigDecimal.ZERO;
}
@@ -569,6 +519,7 @@
}
private int resolvePlanStatus(BigDecimal requiredQuantity, BigDecimal issuedQuantity) {
+ // 鏍规嵁闇�姹傞噺鍜屼笅鍙戦噺鎺ㄥ璁″垝鐘舵��
if (requiredQuantity == null || requiredQuantity.compareTo(BigDecimal.ZERO) <= 0) {
return 0;
}
@@ -579,6 +530,7 @@
}
private List<Long> parsePlanIds(String productionPlanIds) {
+ // 灏嗚鍒扞D瀛楃涓茶В鏋愪负Long鍒楄〃
if (productionPlanIds == null || productionPlanIds.trim().isEmpty()) {
return new ArrayList<>();
}
@@ -595,6 +547,7 @@
}
private String formatPlanIds(List<Long> planIds) {
+ // 灏嗚鍒扞D闆嗗悎鏍煎紡鍖栦负[1,2,3]瀛楃涓�
if (planIds == null || planIds.isEmpty()) {
return null;
}
@@ -605,6 +558,7 @@
}
private LocalDate resolvePlanCompleteDate(ProductionPlan productionPlan) {
+ // 瑙ｆ瀽璁″垝瀹屾垚鏃ユ湡
if (productionPlan == null) {
return null;
}
@@ -618,13 +572,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)
@@ -634,6 +591,7 @@
return;
}
+ // 鏌ヨ骞跺噯澶囦笟鍔℃暟鎹�
List<StorageAttachment> attachments = storageAttachmentMapper.selectList(
Wrappers.<StorageAttachment>lambdaQuery()
.in(StorageAttachment::getRecordId, productModelIds)
@@ -676,6 +634,7 @@
}
private StorageBlobVO toStorageBlobVO(StorageBlob blob) {
+ // 灏嗗瓨鍌ㄦ枃浠跺璞¤浆鎹负VO
StorageBlobVO vo = BeanUtil.copyProperties(blob, StorageBlobVO.class);
vo.setPreviewURL(fileUtil.buildSignedPreviewUrl(vo));
vo.setDownloadURL(fileUtil.buildSignedDownloadUrl(vo));
@@ -684,8 +643,10 @@
@Override
public ProductionOrderWorkOrderDetailVo getWorkOrderReportInspectDetail(ProductionOrderDto dto) {
+ // 鑾峰彇宸ュ崟璁㈠崟鎶ュ伐璐ㄦ鏄庣粏
Long productionOrderId = resolveProductionOrderId(dto);
ProductionOrderVo orderInfo = getProductionOrderInfo(productionOrderId);
+ // 鍙傛暟涓庡墠缃潯浠舵牎楠�
if (orderInfo == null) {
throw new ServiceException("鐢熶骇璁㈠崟涓嶅瓨鍦�");
}
@@ -699,11 +660,12 @@
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())))
- .collect(Collectors.toList());
- if (workOrderList == null || workOrderList.isEmpty()) {
+ .toList();
+ if (workOrderList.isEmpty()) {
detailVo.setWorkOrderList(Collections.emptyList());
return detailVo;
}
@@ -714,6 +676,7 @@
.collect(Collectors.toList());
List<ProductionProductMain> reportMainList = workOrderIdList.isEmpty()
? Collections.emptyList()
+ // 鏌ヨ骞跺噯澶囦笟鍔℃暟鎹�
: productionProductMainMapper.selectList(
Wrappers.<ProductionProductMain>lambdaQuery()
.in(ProductionProductMain::getProductionOperationTaskId, workOrderIdList)
@@ -744,12 +707,10 @@
if (reportOutput == null) {
continue;
}
- Long reportMainId = reportOutput.getProductionProductMainId() != null
- ? reportOutput.getProductionProductMainId()
- : reportOutput.getProductMainId();
- if (reportMainId == null) {
+ if (reportOutput.getProductionProductMainId() == null) {
continue;
}
+ Long reportMainId = reportOutput.getProductionProductMainId();
reportOutputMap.computeIfAbsent(reportMainId, k -> new ArrayList<>()).add(reportOutput);
}
@@ -824,6 +785,7 @@
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);
@@ -834,6 +796,7 @@
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()));
@@ -851,6 +814,7 @@
}
private Long resolveProductionOrderId(ProductionOrderDto dto) {
+ // 浠庡叆鍙備腑瑙ｆ瀽鐢熶骇璁㈠崟ID骞舵牎楠�
if (dto == null) {
throw new ServiceException("璇蜂紶鍏ョ敓浜ц鍗旾D鎴栫敓浜ц鍗曞彿");
}
@@ -871,81 +835,8 @@
}
@Override
- public List<ProductionOrderPickVo> pick(Long productionOrderId) {
- if (productionOrderId == null) {
- return Collections.emptyList();
- }
-
- ProductionOrderBom orderBom = productionOrderBomMapper.selectOne(
- Wrappers.<ProductionOrderBom>lambdaQuery()
- .eq(ProductionOrderBom::getProductionOrderId, productionOrderId)
- .orderByDesc(ProductionOrderBom::getId)
- .last("limit 1"));
- if (orderBom == null || orderBom.getId() == null) {
- return Collections.emptyList();
- }
-
- List<ProductionBomStructureVo> bomStructureList = productionBomStructureMapper.pickByBomId(orderBom.getId());
- if (bomStructureList == null || bomStructureList.isEmpty()) {
- return Collections.emptyList();
- }
-
- List<Long> productModelIds = bomStructureList.stream()
- .map(ProductionBomStructureVo::getProductModelId)
- .filter(Objects::nonNull)
- .distinct()
- .collect(Collectors.toList());
- Map<Long, BigDecimal> stockQuantityMap = new HashMap<>();
- Map<Long, LinkedHashSet<String>> stockBatchNoMap = new HashMap<>();
- if (!productModelIds.isEmpty()) {
- List<StockInventory> stockList = stockInventoryMapper.selectList(
- Wrappers.<StockInventory>lambdaQuery()
- .in(StockInventory::getProductModelId, productModelIds));
- for (StockInventory stockItem : stockList) {
- if (stockItem == null || stockItem.getProductModelId() == null) {
- continue;
- }
- Long productModelId = stockItem.getProductModelId();
- stockQuantityMap.merge(productModelId, defaultDecimal(stockItem.getQualitity()), BigDecimal::add);
- String batchNo = stockItem.getBatchNo();
- if (batchNo != null && !batchNo.trim().isEmpty()) {
- stockBatchNoMap.computeIfAbsent(productModelId, key -> new LinkedHashSet<>()).add(batchNo);
- }
- }
- }
-
- Map<String, ProductionOrderPickVo> mergedPickMap = new LinkedHashMap<>();
- for (ProductionBomStructureVo structure : bomStructureList) {
- if (structure == null || structure.getProductModelId() == null) {
- continue;
- }
- Long productModelId = structure.getProductModelId();
- 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 new ArrayList<>(mergedPickMap.values());
- }
-
- @Override
public int updateOrder(ProductionOrderDto productionOrderDto) {
+ // 鏇存柊鐢熶骇璁㈠崟涓绘暟鎹�
productionOrderDto.setStatus(5);
return baseMapper.updateById(productionOrderDto);
}
--
Gitblit v1.9.3