From dddbcf6700997e3c49be89da7a73e4c0e5a264fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 16 Jun 2026 11:44:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor(inproduceorder):=20=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E5=85=A5=E5=BA=93=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=A1=B9=E7=9A=84=E6=A3=80=E9=AA=8C=E7=8A=B6=E6=80=81=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除了对检验状态为0或2的项目进行移除的逻辑 - 保留所有检验状态的入库生产订单项返回给前端 - 简化了订单项查询后的数据处理流程 --- .../com/nflg/wms/admin/controller/InProduceOrderController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java index 5efbf257..5a9cfd13 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java @@ -474,7 +474,6 @@ public class InProduceOrderController extends BaseController { List items = produceOrderItemService.lambdaQuery() .eq(WmsInProduceOrderItem::getOrderId, order.getId()) .list(); - items.removeIf(item -> Objects.equals(0, item.getInspectionStatus()) || Objects.equals(item.getInspectionStatus(), 2)); return ApiResult.success( items.stream() .map(item -> new NoScanItemVO() From 534a2af69534dac43292e5d95974697c5cda3908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 16 Jun 2026 11:50:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor(inspection):=20=E7=AE=80=E5=8C=96?= =?UTF-8?q?=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了检测方法类型的条件判断分支 - 统一了事务同步处理流程 - 简化了不合格数量检查和工单发起逻辑 - 保留了异步回调服务调用的核心功能 - 优化了代码结构提高可维护性 --- ...comingInspectionTaskControllerService.java | 40 +++++-------------- 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java index 855e1b25..473b14a1 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java @@ -1180,38 +1180,18 @@ public class IncomingInspectionTaskControllerService { updateWrapper.update(); - long testingMethodId = dictionaryItemService.getIdByCode("InspectionStandardTestingMethod", "Full"); - if (Objects.equals(task.getTestingMethodDictItemId(), testingMethodId)) { - //全检 - if (TransactionSynchronizationManager.isSynchronizationActive()) { - TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { - @Override - public void afterCommit() { - wmsIncomingInspectionTaskCallbackService.processAsync(task.getId(), (short) 0); - } - }); - } else { - wmsIncomingInspectionTaskCallbackService.processAsync(task.getId(), (short) 0); - } - if (task.getUnqualifiedQty() > 0) { - issueTicketControllerService.initiate(task.getId()); - } - } else { - //抽样 - if (request.getQualified()) { - if (TransactionSynchronizationManager.isSynchronizationActive()) { - TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { - @Override - public void afterCommit() { - wmsIncomingInspectionTaskCallbackService.processAsync(task.getId(), (short) 0); - } - }); - } else { + if (task.getUnqualifiedQty() > 0) { + issueTicketControllerService.initiate(task.getId()); + } + if (TransactionSynchronizationManager.isSynchronizationActive()) { + TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { + @Override + public void afterCommit() { wmsIncomingInspectionTaskCallbackService.processAsync(task.getId(), (short) 0); } - } else { - issueTicketControllerService.initiate(task.getId()); - } + }); + } else { + wmsIncomingInspectionTaskCallbackService.processAsync(task.getId(), (short) 0); } }