From 0debf5b7bb0246eaef1397975cdb16f4adb9e8d9 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 29 十月 2026 14:36:31 +0800
Subject: [PATCH] refactor(inspection-order): 1.检验委托单绑定机制支持多次下单 2.合格率统计口径调整 3.外购铜导体推送入库MES增加米重 4.报告英文字段调整
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java
index e252218..4b910ca 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java
@@ -212,7 +212,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void unqualifiedHandlerOACallback(Long oaWorkId, String checkResult, JSONObject response) {
+ public void unqualifiedHandlerOACallback(Long oaWorkId, String checkResult,String endFlag, JSONObject response) {
// 娌℃湁杩欎釜灏辩粨鏉�
Long count1 = baseMapper.selectCount(Wrappers.<InsUnqualifiedHandler>lambdaQuery()
.eq(InsUnqualifiedHandler::getRequestId, Integer.valueOf(String.valueOf(oaWorkId))));
@@ -225,10 +225,12 @@
clcsMap.put("1","閫�璐�");
clcsMap.put("2","閮ㄥ垎閫�璐�");
clcsMap.put("3","闄嶇骇浣跨敤");
+ //娴佺▼缁撴潫鎵嶄慨鏀筼a鐘舵��
+ boolean hasChangeOaState = StringUtils.isNotBlank(endFlag) && endFlag.equals("1");
//oa鐘舵�侊細3閫氳繃 4椹冲洖
Integer oaState = "1".equals(checkResult) ? 3 : 4;
baseMapper.update(null, new LambdaUpdateWrapper<InsUnqualifiedHandler>()
- .set(InsUnqualifiedHandler::getOaState, oaState)
+ .set(hasChangeOaState,InsUnqualifiedHandler::getOaState, oaState)
.set(InsUnqualifiedHandler::getClassification,response.getString("flclassification"))
.eq(InsUnqualifiedHandler::getRequestId, Integer.valueOf(String.valueOf(oaWorkId))));
//淇濆瓨oa瀹℃壒娴佺▼璁板綍
@@ -343,6 +345,7 @@
if(isUpdated){
//鎺ㄩ�丱A
PushOADto pushOADto = new PushOADto();
+ pushOADto.setGroupId(unqualifiedHandlerDto.getGroupId());
pushOADto.setHandlerId(unqualifiedHandlerDto.getId());
pushOADto.setContract(unqualifiedHandlerDto.getContract());
pushOA(pushOADto);
--
Gitblit v1.9.3