From 3ca1cefd9bed863131ee3f684ff127bd7ac877aa Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 05 八月 2026 11:35:16 +0800
Subject: [PATCH] feat(ai): 优化AI知识文档处理功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java | 87 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 81 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
index 6f36f8c..64d5383 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
@@ -28,6 +28,10 @@
import cn.iocoder.yudao.module.mes.service.wm.itemconsume.MesWmItemConsumeService;
import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceLineService;
import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceService;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
+import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemBatchConfigApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemBatchConfigRespDTO;
import cn.iocoder.yudao.module.mes.api.mps.MesProMpsApi;
import cn.iocoder.yudao.module.mes.api.mps.dto.MesProMpsRespDTO;
import cn.iocoder.yudao.module.mes.api.event.ProductionFinishedEvent;
@@ -40,6 +44,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -80,6 +85,10 @@
private MesMdAutoCodeRecordService autoCodeRecordService;
@Resource
private ApplicationEventPublisher eventPublisher;
+ @Resource
+ private MesMdmItemService mdmItemService;
+ @Resource
+ private MdmItemBatchConfigApi itemBatchConfigApi;
@Override
public Long createFeedback(MesProFeedbackSaveReqVO createReqVO) {
@@ -161,9 +170,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean approveFeedback(Long id) {
+ public boolean approveFeedback(MesProFeedbackApproveReqVO reqVO) {
// 1.1 鏍￠獙瀛樺湪 + 瀹℃壒涓姸鎬�
- MesProFeedbackDO feedback = validateFeedbackStatusApproving(id);
+ MesProFeedbackDO feedback = validateFeedbackStatusApproving(reqVO.getId());
// 1.2 鏍￠獙鎶ュ伐鏁伴噺 > 0
if (feedback.getFeedbackQuantity() == null
|| feedback.getFeedbackQuantity().compareTo(BigDecimal.ZERO) <= 0) {
@@ -201,7 +210,7 @@
}
// 5. 鍏堟洿鏂版姤宸ョ姸鎬佷负宸插畬鎴愶紙纭繚 checkAndFinishMps 妫�鏌ユ椂褰撳墠鎶ュ伐宸叉爣璁板畬鎴愶級
- feedbackMapper.updateById(new MesProFeedbackDO().setId(id)
+ feedbackMapper.updateById(new MesProFeedbackDO().setId(reqVO.getId())
.setStatus(MesProFeedbackStatusEnum.FINISHED.getStatus())
.setUncheckQuantity(BigDecimal.ZERO));
@@ -209,13 +218,13 @@
if (checkFlag) {
// 6.1 闇�瑕佹楠岋細鐢熸垚浜у嚭鍗曪紙璐ㄩ噺鐘舵��=寰呮楠岋級锛屾洿鏂版姤宸ョ姸鎬佷负寰呮楠岋紝绛夎川妫�瀹屾垚鍥炶皟鍚庡啀鍏ュ簱
// 瀹屾垚鏃跺洖璋冭锛歁esQcIpqcServiceImpl#finishIpqc 鈫� splitPendingAndFinishProduce + updateProFeedbackWhenIpqcFinish
- productProduceService.generateProductProduce(feedback, true);
- feedbackMapper.updateById(new MesProFeedbackDO().setId(id)
+ productProduceService.generateProductProduce(feedback, true, reqVO);
+ feedbackMapper.updateById(new MesProFeedbackDO().setId(reqVO.getId())
.setStatus(MesProFeedbackStatusEnum.UNCHECK.getStatus()));
return false;
} else {
// 6.2 鏃犻渶妫�楠岋細鐢熸垚浜у嚭鍗曪紙鎸夊悎鏍�/涓嶅悎鏍兼媶琛岋級锛岀洿鎺ュ畬鎴愬叆搴�
- MesWmProductProduceDO produce = productProduceService.generateProductProduce(feedback, false);
+ MesWmProductProduceDO produce = productProduceService.generateProductProduce(feedback, false, reqVO);
productProduceService.finishProductProduce(produce.getId());
// 鍏抽敭宸ュ簭锛氭洿鏂颁换鍔� + 宸ュ崟鐨勫凡鐢熶骇鏁伴噺锛涢潪鍏抽敭宸ュ簭锛氬彧鏇存柊浠诲姟鐨勫凡鐢熶骇鏁伴噺锛堝伐鍗曞彧鐪嬪叧閿伐搴忎骇鍑猴級
if (keyFlag) {
@@ -480,4 +489,70 @@
updateTaskAndWorkOrderByFeedback(feedback);
}
+ @Override
+ public MesProFeedbackBatchCheckRespVO checkBatchRequirements(Long feedbackId) {
+ MesProFeedbackDO feedback = validateFeedbackExists(feedbackId);
+ MesProFeedbackBatchCheckRespVO respVO = new MesProFeedbackBatchCheckRespVO();
+
+ // 1. 妫�鏌ョ墿鏂欐槸鍚﹀惎鐢ㄦ壒娆＄鐞�
+ MesMdmItemDO item = mdmItemService.getItem(feedback.getItemId());
+ if (item == null || Boolean.FALSE.equals(item.getIsBatchManaged())) {
+ respVO.setNeedBatchInput(false);
+ respVO.setIsBatchManaged(false);
+ return respVO;
+ }
+ respVO.setIsBatchManaged(true);
+
+ // 2. 鑾峰彇鎵规閰嶇疆
+ MdmItemBatchConfigRespDTO config = itemBatchConfigApi.getItemBatchConfig(feedback.getItemId());
+ if (config == null) {
+ respVO.setNeedBatchInput(false);
+ return respVO;
+ }
+
+ // 3. 濉厖閰嶇疆鏍囧織
+ respVO.setProduceDateFlag(config.getProduceDateFlag());
+ respVO.setExpireDateFlag(config.getExpireDateFlag());
+ respVO.setReceiptDateFlag(config.getReceiptDateFlag());
+ respVO.setVendorFlag(config.getVendorFlag());
+ respVO.setClientFlag(config.getClientFlag());
+ respVO.setSalesOrderCodeFlag(config.getSalesOrderCodeFlag());
+ respVO.setPurchaseOrderCodeFlag(config.getPurchaseOrderCodeFlag());
+ respVO.setWorkOrderFlag(config.getWorkOrderFlag());
+ respVO.setTaskFlag(config.getTaskFlag());
+ respVO.setWorkstationFlag(config.getWorkstationFlag());
+ respVO.setToolFlag(config.getToolFlag());
+ respVO.setMoldFlag(config.getMoldFlag());
+ respVO.setLotNumberFlag(config.getLotNumberFlag());
+ respVO.setQualityStatusFlag(config.getQualityStatusFlag());
+
+ // 4. 鍒ゆ柇鍝簺瀛楁宸茶嚜鍔ㄥ～鍏咃紙鎶ュ伐鍜岀敓浜ц繃绋嬩腑蹇呯劧鏈夊�肩殑瀛楁锛�
+ List<String> autoFilled = new ArrayList<>();
+ // 鐢熶骇鏃ユ湡锛氬鎵规椂鑷姩鍙栧綋澶�
+ autoFilled.add("produceDate");
+ // 鐢熶骇宸ュ崟锛氫粠鎶ュ伐璁板綍鑾峰彇
+ autoFilled.add("workOrderId");
+ // 鐢熶骇浠诲姟锛氫粠鎶ュ伐璁板綍鑾峰彇
+ autoFilled.add("taskId");
+ // 宸ヤ綔绔欙細浠庢姤宸ヨ褰曡幏鍙�
+ autoFilled.add("workstationId");
+ respVO.setAutoFilledFields(autoFilled);
+
+ // 5. 鍒ゆ柇鏄惁闇�瑕佸脊绐楋細瀛樺湪蹇呭～浣嗘棤娉曡嚜鍔ㄥ～鍏呯殑瀛楁
+ boolean needBatchInput = false;
+ if (Boolean.TRUE.equals(config.getExpireDateFlag())) needBatchInput = true;
+ if (Boolean.TRUE.equals(config.getReceiptDateFlag())) needBatchInput = true;
+ if (Boolean.TRUE.equals(config.getVendorFlag())) needBatchInput = true;
+ if (Boolean.TRUE.equals(config.getClientFlag())) needBatchInput = true;
+ if (Boolean.TRUE.equals(config.getSalesOrderCodeFlag())) needBatchInput = true;
+ if (Boolean.TRUE.equals(config.getPurchaseOrderCodeFlag())) needBatchInput = true;
+ if (Boolean.TRUE.equals(config.getToolFlag())) needBatchInput = true;
+ if (Boolean.TRUE.equals(config.getMoldFlag())) needBatchInput = true;
+ if (Boolean.TRUE.equals(config.getLotNumberFlag())) needBatchInput = true;
+ if (Boolean.TRUE.equals(config.getQualityStatusFlag())) needBatchInput = true;
+ respVO.setNeedBatchInput(needBatchInput);
+
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3