From 3fd8d1f2e73a843acd330e8e8b84f5800f858407 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 10 十一月 2026 11:42:21 +0800
Subject: [PATCH] feat(seal): 印章详情视图与编辑删除接口
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java | 107 +++++++++++++++++++++++++----------------------------
1 files changed, 50 insertions(+), 57 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java
index e8ed301..6186aa8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java
@@ -95,7 +95,17 @@
}
private void createTransactionList(Long produceId, List<MesWmProductProduceLineDO> lines) {
+ // 鐢熶骇璁㈠崟 ID 鍐椾綑鍒版祦姘达紝渚夸簬鍑哄簱鍙拌处鎸夌敓浜ц鍗曡拷婧�
+ MesWmProductProduceDO produce = productProduceMapper.selectById(produceId);
+ Long workOrderId = produce != null ? produce.getWorkOrderId() : null;
for (MesWmProductProduceLineDO line : lines) {
+ if (MesWmQualityStatusEnum.FAIL.getStatus().equals(line.getQualityStatus())) {
+ // 涓嶅悎鏍间骇鍑轰繚鐣欒褰曪紝浜ょ敱涓嶅悎鏍煎搧澶勭悊锛屼笉鐢熸垚鍚堟牸搴撳瓨娴佹按銆�
+ continue;
+ }
+ if (!MesWmQualityStatusEnum.PASS.getStatus().equals(line.getQualityStatus())) {
+ throw exception(WM_PRODUCT_PRODUCE_QUALITY_PENDING);
+ }
// 1. 鏍¢獙姣忚鏄庣粏鏁伴噺涔嬪拰绛変簬琛屾暟閲�
List<MesWmProductProduceDetailDO> details = productProduceDetailService.getProductProduceDetailListByLineId(
line.getId());
@@ -111,7 +121,7 @@
.setQuantity(detail.getQuantity())
.setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
.setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
- .setBizType(MesBizTypeConstants.WM_PRODUCT_PRODUCE).setBizId(produceId)
+ .setBizType(MesBizTypeConstants.WM_PRODUCT_PRODUCE).setBizId(produceId).setWorkOrderId(workOrderId)
.setBizCode("").setBizLineId(line.getId()));
}
}
@@ -121,7 +131,7 @@
@Transactional(rollbackFor = Exception.class)
public MesWmProductProduceDO generateProductProduce(MesProFeedbackDO feedback, boolean checkFlag,
MesProFeedbackApproveReqVO approveReqVO) {
- // 0. 鏌ヨ鍏宠仈鐨勫伐鍗曪紙鐢ㄤ簬鑾峰彇 clientId 绛変俊鎭級
+ // 0. 鏌ヨ鍏宠仈鐨勫伐鍗曪紙鐢ㄤ簬鑾峰彇 clientId銆佷骇鍝佺瓑淇℃伅锛�
MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(feedback.getWorkOrderId());
// 1. 鍒涘缓浜у嚭鍗曞ご
@@ -135,6 +145,7 @@
// 2. 鑾峰彇鎴栫敓鎴愭壒娆★紙瀹℃壒璇锋眰涓殑鎵规灞炴�т紭鍏堬級
MesWmBatchGenerateReqVO batchReqVO = new MesWmBatchGenerateReqVO()
.setItemId(feedback.getItemId())
+ .setReelNo(workOrder != null ? workOrder.getReelNo() : null)
.setProduceDate(LocalDate.now().atStartOfDay()) // 鎴柇鍒板綋澶╅浂鐐癸紝纭繚鍚屼竴澶╃殑鎶ュ伐鐢熸垚鐩稿悓鎵规鍙�
.setExpireDate(feedback.getExpireDate())
.setWorkOrderId(feedback.getWorkOrderId())
@@ -160,68 +171,38 @@
Long batchId = batch != null ? batch.getId() : null;
String batchCode = batch != null ? batch.getCode() : null;
- WarehouseTarget outputTarget = resolveOutputTarget(feedback.getWorkOrderId(), feedback.getProcessId(), feedback.getItemId());
-
- // 3. 鏍规嵁鏄惁闇�瑕佹楠屽垎鏀鐞�
- if (checkFlag) {
- // 3.1 闇�瑕佹楠岋細鍒涘缓涓�鏉¤锛堣川閲忕姸鎬�=寰呮楠岋級锛屼笉鐢熸垚鏄庣粏
- MesWmProductProduceLineDO line = buildProduceLine(produce, feedback, batchId, batchCode,
- feedback.getFeedbackQuantity(), MesWmQualityStatusEnum.PENDING.getStatus());
- productProduceLineService.createProductProduceLine(line);
- // 娉ㄦ剰锛歝heckFlag=true 鏃朵笉鐢熸垚鏄庣粏琛岋紝绛� IPQC 妫�楠屽畬鎴愬悗鐢� splitPendingAndFinishProduce 鎸夎川閲忕粨鏋滄媶琛�+鐢熸垚鏄庣粏
- } else {
- // 3.2 鏃犻渶妫�楠岋細鎸夊悎鏍煎搧/涓嶅悎鏍煎搧鍚勭敓鎴愪竴琛� + 鏄庣粏
- BigDecimal qualifiedQty = ObjectUtil.defaultIfNull(feedback.getQualifiedQuantity(), BigDecimal.ZERO);
- BigDecimal unqualifiedQty = ObjectUtil.defaultIfNull(feedback.getUnqualifiedQuantity(), BigDecimal.ZERO);
- // 3.2.0 鍏滃簳锛氬悎鏍�/涓嶈壇鏁伴噺閮芥湭濉啓鏃讹紙鎶ュ伐鍙~鎶ュ伐鏁伴噺锛夛紝榛樿鏁村崟涓哄悎鏍煎搧
- if (qualifiedQty.compareTo(BigDecimal.ZERO) <= 0 && unqualifiedQty.compareTo(BigDecimal.ZERO) <= 0) {
- qualifiedQty = feedback.getFeedbackQuantity();
- }
- // 3.2.1 涓嶅悎鏍煎搧琛� + 鏄庣粏
- if (unqualifiedQty.compareTo(BigDecimal.ZERO) > 0) {
- MesWmProductProduceLineDO unqualifiedLine = buildProduceLine(produce, feedback, batchId, batchCode,
- unqualifiedQty, MesWmQualityStatusEnum.FAIL.getStatus());
- productProduceLineService.createProductProduceLine(unqualifiedLine);
- MesWmProductProduceDetailDO unqualifiedDetail = buildProduceDetail(produce, feedback, batchId, batchCode,
- unqualifiedLine.getId(), unqualifiedQty,
- outputTarget.warehouseId(), outputTarget.locationId(), outputTarget.areaId());
- productProduceDetailService.createProductProduceDetail(unqualifiedDetail);
- }
- // 3.2.2 鍚堟牸鍝佽 + 鏄庣粏
- if (qualifiedQty.compareTo(BigDecimal.ZERO) > 0) {
- MesWmProductProduceLineDO qualifiedLine = buildProduceLine(produce, feedback, batchId, batchCode,
- qualifiedQty, MesWmQualityStatusEnum.PASS.getStatus());
- productProduceLineService.createProductProduceLine(qualifiedLine);
- MesWmProductProduceDetailDO qualifiedDetail = buildProduceDetail(produce, feedback, batchId, batchCode,
- qualifiedLine.getId(), qualifiedQty,
- outputTarget.warehouseId(), outputTarget.locationId(), outputTarget.areaId());
- productProduceDetailService.createProductProduceDetail(qualifiedDetail);
- }
+ // 鍗婃垚鍝侊紙鎶ュ伐鐗╂枡 != 宸ュ崟鎴愬搧锛夋寜鐢熶骇 BOM 鐩存帴鑷姩鍏ュ簱锛屼笉绛夎川妫�銆佷笉璧板鎵癸紱
+ // 鎴愬搧浠嶇粺涓�寰呮锛岃川妫�鍚堟牸鍚庢墠鐢熸垚鍏ュ簱娴佹按銆�
+ boolean semiFinished = workOrder != null && feedback.getItemId() != null
+ && ObjUtil.notEqual(feedback.getItemId(), workOrder.getProductId());
+ MesWmProductProduceLineDO line = buildProduceLine(produce, feedback, batchId, batchCode,
+ feedback.getFeedbackQuantity(),
+ semiFinished ? MesWmQualityStatusEnum.PASS.getStatus() : MesWmQualityStatusEnum.PENDING.getStatus(),
+ workOrder != null ? workOrder.getReelNo() : null);
+ productProduceLineService.createProductProduceLine(line);
+ if (semiFinished) {
+ WarehouseTarget target = resolveOutputTarget(feedback.getWorkOrderId(), feedback.getProcessId(),
+ feedback.getItemId());
+ productProduceDetailService.createProductProduceDetail(MesWmProductProduceDetailDO.builder()
+ .produceId(produce.getId()).lineId(line.getId())
+ .itemId(feedback.getItemId()).quantity(feedback.getFeedbackQuantity())
+ .batchId(batchId).batchCode(batchCode).reelNo(line.getReelNo())
+ .warehouseId(target.warehouseId()).locationId(target.locationId()).areaId(target.areaId())
+ .build());
+ finishProductProduce(produce.getId());
}
return produce;
}
private MesWmProductProduceLineDO buildProduceLine(MesWmProductProduceDO produce, MesProFeedbackDO feedback,
Long batchId, String batchCode,
- BigDecimal quantity, Integer qualityStatus) {
+ BigDecimal quantity, Integer qualityStatus, String reelNo) {
return MesWmProductProduceLineDO.builder()
.produceId(produce.getId()).feedbackId(feedback.getId())
.itemId(feedback.getItemId()).quantity(quantity)
- .batchId(batchId).batchCode(batchCode)
+ .batchId(batchId).batchCode(batchCode).reelNo(reelNo)
.expireDate(feedback.getExpireDate()).lotNumber(feedback.getLotNumber())
.qualityStatus(qualityStatus)
- .build();
- }
-
- private MesWmProductProduceDetailDO buildProduceDetail(MesWmProductProduceDO produce, MesProFeedbackDO feedback,
- Long batchId, String batchCode,
- Long lineId, BigDecimal quantity,
- Long warehouseId, Long locationId, Long areaId) {
- return MesWmProductProduceDetailDO.builder()
- .produceId(produce.getId()).lineId(lineId)
- .itemId(feedback.getItemId()).quantity(quantity)
- .batchId(batchId).batchCode(batchCode)
- .warehouseId(warehouseId).locationId(locationId).areaId(areaId)
.build();
}
@@ -254,8 +235,20 @@
if (produce == null) {
throw exception(WM_PRODUCT_PRODUCE_NOT_EXISTS);
}
+ // 鍗婃垚鍝佸湪鎶ュ伐瀹℃壒鏃跺凡鑷姩鍏ュ簱锛堜骇鍑哄崟宸插畬鎴愶級锛岃川妫�瀹屾垚鏃朵笉鍐嶉噸澶嶆媶鍒嗗叆搴�
+ if (ObjUtil.equal(produce.getStatus(), MesWmProductProduceStatusEnum.FINISHED.getStatus())) {
+ return;
+ }
// 2. 閫氳繃 sourceLineId 鐩存帴瀹氫綅寰呮楠岃
MesWmProductProduceLineDO pendingLine = productProduceLineService.validateProductProduceLineExists(sourceLineId);
+ if (!ObjUtil.equal(pendingLine.getProduceId(), produce.getId())
+ || !ObjUtil.equal(pendingLine.getFeedbackId(), feedbackId)
+ || !ObjUtil.equal(pendingLine.getQualityStatus(), MesWmQualityStatusEnum.PENDING.getStatus())
+ || qualifiedQty == null || unqualifiedQty == null || pendingLine.getQuantity() == null
+ || qualifiedQty.signum() < 0 || unqualifiedQty.signum() < 0
+ || qualifiedQty.add(unqualifiedQty).compareTo(pendingLine.getQuantity()) != 0) {
+ throw exception(WM_PRODUCT_PRODUCE_INSPECTION_INVALID);
+ }
WarehouseTarget outputTarget = resolveOutputTarget(produce.getWorkOrderId(), produce.getProcessId(), pendingLine.getItemId());
// 3A. 鎯呭喌涓�锛氬瓨鍦ㄤ笉鍚堟牸鍝佹暟閲忥紝闇�瑕佹媶鍒嗚
@@ -265,14 +258,14 @@
.produceId(produce.getId()).feedbackId(feedbackId)
.itemId(pendingLine.getItemId()).quantity(unqualifiedQty)
.batchId(pendingLine.getBatchId()).batchCode(pendingLine.getBatchCode())
- .expireDate(pendingLine.getExpireDate()).lotNumber(pendingLine.getLotNumber())
+ .expireDate(pendingLine.getExpireDate()).lotNumber(pendingLine.getLotNumber()).reelNo(pendingLine.getReelNo())
.qualityStatus(MesWmQualityStatusEnum.FAIL.getStatus())
.build();
productProduceLineService.createProductProduceLine(unqualifiedLine);
productProduceDetailService.createProductProduceDetail(MesWmProductProduceDetailDO.builder()
.produceId(produce.getId()).lineId(unqualifiedLine.getId())
.itemId(pendingLine.getItemId()).quantity(unqualifiedQty)
- .batchId(pendingLine.getBatchId()).batchCode(pendingLine.getBatchCode())
+ .batchId(pendingLine.getBatchId()).batchCode(pendingLine.getBatchCode()).reelNo(pendingLine.getReelNo())
.warehouseId(outputTarget.warehouseId()).locationId(outputTarget.locationId()).areaId(outputTarget.areaId())
.build());
// 3A.2 鍚堟牸鍝侊細澶嶇敤鍘熷緟妫�琛岋紝鏇存柊鏁伴噺鍜岀姸鎬� + 鏄庣粏
@@ -283,7 +276,7 @@
productProduceDetailService.createProductProduceDetail(MesWmProductProduceDetailDO.builder()
.produceId(produce.getId()).lineId(pendingLine.getId())
.itemId(pendingLine.getItemId()).quantity(qualifiedQty)
- .batchId(pendingLine.getBatchId()).batchCode(pendingLine.getBatchCode())
+ .batchId(pendingLine.getBatchId()).batchCode(pendingLine.getBatchCode()).reelNo(pendingLine.getReelNo())
.warehouseId(outputTarget.warehouseId()).locationId(outputTarget.locationId()).areaId(outputTarget.areaId())
.build());
}
@@ -294,7 +287,7 @@
productProduceDetailService.createProductProduceDetail(MesWmProductProduceDetailDO.builder()
.produceId(produce.getId()).lineId(pendingLine.getId())
.itemId(pendingLine.getItemId()).quantity(pendingLine.getQuantity())
- .batchId(pendingLine.getBatchId()).batchCode(pendingLine.getBatchCode())
+ .batchId(pendingLine.getBatchId()).batchCode(pendingLine.getBatchCode()).reelNo(pendingLine.getReelNo())
.warehouseId(outputTarget.warehouseId()).locationId(outputTarget.locationId()).areaId(outputTarget.areaId())
.build());
}
--
Gitblit v1.9.3