From e6aa5a0c250ca9d2585253c38fb0a3ac6426fdbf Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Mon, 15 Jun 2026 14:21:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?pqc=E5=B7=A5=E5=8D=95=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QmsIssueTicketControllerService.java | 11 +++++++++-- ...QmsIssueTicketProcessControllerService.java | 18 ++++++++++++++---- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java index 2c8adec8..c71222ab 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java @@ -291,7 +291,12 @@ public class QmsIssueTicketControllerService { .set(QmsIssueTicket::getUpdateTime, now) .update(); - issueTicketToDoService.processed(ticket.getId()); + issueTicketToDoService.lambdaUpdate() + .eq(QmsIssueTicketToDo::getTicketId, ticket.getId()) + .eq(QmsIssueTicketToDo::getHandlerUserId, ticket.getCreateUserId()) + .eq(QmsIssueTicketToDo::getHasProcessed, false) + .set(QmsIssueTicketToDo::getHasProcessed, true) + .update(); // 5. 按处理人分组合并不合格项ID Map> userTaskMap = new LinkedHashMap<>(); @@ -1493,7 +1498,9 @@ public class QmsIssueTicketControllerService { QmsIssueTicketToDo todoItem = new QmsIssueTicketToDo() .setTicketId(issueTicketId) - .setHandlerUserId(handlerUserId); + .setHandlerUserId(handlerUserId) + .setHasProcessed(false) + .setIsRead(false); issueTicketToDoService.save(todoItem); } diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java index 158337c7..c95c75d8 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java @@ -480,16 +480,26 @@ public class QmsIssueTicketProcessControllerService { public void submitPqcHandler(QmsIssueTicketProcessDraftQO request, QmsIssueTicket ticket, QmsIssueTicketProcess process, LocalDateTime now, Long currentUserId, String currentUserName) { - // 1. 保存数据（调用draftUnified） - issueTicketProcessMeasureControllerService.draftUnified(request); - QmsIssueTicketProcess latestProcess = issueTicketProcessService.getById(process.getId()); Short approvalStatus = request.getApprovalStatus() != null ? request.getApprovalStatus() - : latestProcess.getApprovalStatus(); + : process.getApprovalStatus(); VUtil.trueThrowBusinessError(approvalStatus == null).throwMessage("提交时审批状态不能为空"); VUtil.trueThrowBusinessError(approvalStatus != 0 && approvalStatus != 1) .throwMessage("不支持的审批状态"); + if (approvalStatus == 0) { + // 1. 保存数据（调用draftUnified） + issueTicketProcessMeasureControllerService.draftUnified(request); + } else { + issueTicketProcessService.lambdaUpdate() + .eq(QmsIssueTicketProcess::getId, process.getId()) + .set(QmsIssueTicketProcess::getApprovalStatus, approvalStatus) + .set(request.getApprovalOpinion() != null, QmsIssueTicketProcess::getApprovalOpinion, request.getApprovalOpinion()) + .set(QmsIssueTicketProcess::getApprovalUserId, currentUserId) + .set(QmsIssueTicketProcess::getApprovalUserName, currentUserName) + .update(); + } + // 2. 写入审批时间 issueTicketProcessService.lambdaUpdate() .eq(QmsIssueTicketProcess::getId, process.getId()) From ff243b74dae132c8be730ea5ae2efa94d09d7060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 15 Jun 2026 14:25:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(transfer):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=8D=95=E6=8D=AEID=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=92=8C=E8=AE=A2=E5=8D=95=E5=85=B3=E8=81=94=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 为WmsTransferCompanyItem和WmsTransferFactoryItem添加雪花算法ID生成 - 修复调拨公司和工厂控制器中的订单ID关联错误 - 移除多余的分号提高代码整洁性 --- .../nflg/wms/admin/controller/TransferCompanyController.java | 3 ++- .../nflg/wms/admin/controller/TransferFactoryController.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java index 714cf9a4..e66d8797 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java @@ -172,6 +172,7 @@ public class TransferCompanyController extends BaseController { lockVOS.addAll(itemLocks); } else { WmsTransferCompanyItem data = Convert.convert(WmsTransferCompanyItem.class, item); + data.setId(IdUtil.getSnowflakeNextId()); data.setOrderId(order.getId()); data.setLeft(data.getNum()); transferCompanyItemService.save(data); @@ -642,7 +643,7 @@ public class TransferCompanyController extends BaseController { if (CollectionUtil.isNotEmpty(item.getDatas())) { item.getDatas().forEach(data -> { temRecords.add(new TransferCompanyNoScanRecord() - .setOrderId(request.getId()) + .setOrderId(order.getId()) .setItemId(item.getOrderItemId()) .setNum(data.getNum()) .setBatchNo(data.getBatchNo()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java index edf95118..aa31d05b 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java @@ -119,7 +119,6 @@ public class TransferFactoryController extends BaseController { @Resource private TransferFactoryNoScanRecordRespository transferFactoryNoScanRecordRespository; - ; /** * 查询SAP领料订单数据 @@ -171,6 +170,7 @@ public class TransferFactoryController extends BaseController { lockVOS.addAll(itemLocks); } else { WmsTransferFactoryItem data = Convert.convert(WmsTransferFactoryItem.class, item); + data.setId(IdUtil.getSnowflakeNextId()); data.setOrderId(order.getId()); data.setLeft(data.getNum()); transferFactoryItemService.save(data); @@ -674,7 +674,7 @@ public class TransferFactoryController extends BaseController { if (CollectionUtil.isNotEmpty(item.getDatas())) { item.getDatas().forEach(data -> { temRecords.add(new TransferFactoryNoScanRecord() - .setOrderId(request.getId()) + .setOrderId(order.getId()) .setItemId(item.getOrderItemId()) .setNum(data.getNum()) .setBatchNo(data.getBatchNo()) From 71d8178fd7fc6b73941290df585b044cfec1e0f1 Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Mon, 15 Jun 2026 14:47:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QmsIssueTicketControllerService.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java index c71222ab..1155f804 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java @@ -1181,6 +1181,7 @@ public class QmsIssueTicketControllerService { vo.setProjectNo(ticket.getProjectNo()); vo.setIncidentType(ticket.getIncidentType()); vo.setExceptionCode(ticket.getExceptionCode()); + vo.setImpactQuantity(ticket.getImpactQuantity()); vo.setSourceType(ticket.getSourceType()); vo.setCreateUserName(ticket.getCreateUserName()); vo.setCreateTime(ticket.getCreateTime()); @@ -1479,6 +1480,21 @@ public class QmsIssueTicketControllerService { filteredTaskResultIds ); } + + issueTicketToDoService.lambdaUpdate() + .eq(QmsIssueTicketToDo::getTicketId, entity.getId()) + .eq(QmsIssueTicketToDo::getHandlerUserId, entity.getCreateUserId()) + .eq(QmsIssueTicketToDo::getHasProcessed, false) + .set(QmsIssueTicketToDo::getHasProcessed, true) + .update(); + + issueTicketService.lambdaUpdate() + .eq(QmsIssueTicket::getId, entity.getId()) + .set(QmsIssueTicket::getStatus, (short) 1) + .set(QmsIssueTicket::getUpdateUserId, userId) + .set(QmsIssueTicket::getUpdateUserName, userName) + .set(QmsIssueTicket::getUpdateTime, now) + .update(); } private void addIssueTicketProcessAndTodo(Long issueTicketId, Long handlerUserId, List taskResultIds) { @@ -3345,7 +3361,11 @@ public class QmsIssueTicketControllerService { .set(QmsIssueTicket::getUpdateTime, now) .update(); - issueTicketToDoService.processed(ticket.getId()); + issueTicketToDoService.lambdaUpdate() + .eq(QmsIssueTicketToDo::getTicketId, ticket.getId()) + .eq(QmsIssueTicketToDo::getHasProcessed, false) + .set(QmsIssueTicketToDo::getHasProcessed, true) + .update(); // PDI工单关闭时：创建新任务单，复制内容，不合格项改为合格 if (ticket.getSourceType() != null && ticket.getSourceType() == 1 && ticket.getSourceId() != null) {