Merge branch 'qms/develop' into qms/zhangke

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<Long, List<String>> userTaskMap = new LinkedHashMap<>();
@@ -1176,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());
@@ -1474,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<Long> taskResultIds) {
@@ -1493,7 +1514,9 @@ public class QmsIssueTicketControllerService {
 
         QmsIssueTicketToDo todoItem = new QmsIssueTicketToDo()
                 .setTicketId(issueTicketId)
-                .setHandlerUserId(handlerUserId);
+                .setHandlerUserId(handlerUserId)
+                .setHasProcessed(false)
+                .setIsRead(false);
         issueTicketToDoService.save(todoItem);
     }
 
@@ -3338,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) {

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())

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())

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())