From e9e88eefcc8abd2b1e187d28c7666e80307e97cc Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 09 五月 2026 14:59:33 +0800
Subject: [PATCH] 不合格处理：切换新的OA流程
---
inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml | 1 +
ruoyi-admin-ztns/src/main/resources/application-ztns.yml | 4 ++--
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedHandler.java | 6 ++++++
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedHandler.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedHandler.java
index 7004dce..ff0ee98 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedHandler.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedHandler.java
@@ -128,4 +128,10 @@
@ApiModelProperty("oa闄勪欢url鍦板潃")
private String fileUrl;
+ /**
+ * 鏄惁鏄棫鏁版嵁
+ */
+ @ApiModelProperty("鏄惁鏄棫鏁版嵁")
+ private Boolean isOldData;
+
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index 9d256d3..621ddeb 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -1765,7 +1765,7 @@
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(insOrder.getIfsInventoryId());
//鏌ヨ闆朵欢灞炴��
IfsPartPropsRecord ifsPartPropsRecord = ifsPartPropsRecordMapper.selectOne(Wrappers.<IfsPartPropsRecord>lambdaQuery()
- .eq(IfsPartPropsRecord::getIfsInventoryId, ifsInventoryQuantity.getId()));
+ .eq(IfsPartPropsRecord::getIfsInventoryId, ifsInventoryQuantity.getId()).last("limit 1"));
if (Objects.nonNull(ifsPartPropsRecord)) {
enterFactoryReport.setOuterColor(StringUtils.equals(ifsPartPropsRecord.getOuterColor(),"/")?ifsPartPropsRecord.getInsulationColor():ifsPartPropsRecord.getOuterColor());
}
diff --git a/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml b/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml
index cb4bee9..d4b8e4a 100644
--- a/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml
@@ -94,6 +94,7 @@
iuh.file_url,
iuh.headline,
iuh.ins_order_id,
+ iuh.is_old_data,
coa.operation
from
ins_unqualified_handler iuh
diff --git a/ruoyi-admin-ztns/src/main/resources/application-ztns.yml b/ruoyi-admin-ztns/src/main/resources/application-ztns.yml
index 1e038ad..7458948 100644
--- a/ruoyi-admin-ztns/src/main/resources/application-ztns.yml
+++ b/ruoyi-admin-ztns/src/main/resources/application-ztns.yml
@@ -132,8 +132,8 @@
oa:
oaHost: http://192.168.0.49:8000/oa_workflowrequest.asmx?wsdl
prodIp: http://192.168.21.53:7002/lims
- unqualifiedProcessId: 715114 #ZTNS鍩烵A娴佺▼id
- unqualifiedProcessIdByKJNS: 861617 #KJNS鍩烵A娴佺▼id
+ unqualifiedProcessId: 898113 #ZTNS鍩烵A娴佺▼id
+ unqualifiedProcessIdByKJNS: 898113 #KJNS鍩烵A娴佺▼id
# 浼佷笟寰俊鎺ㄩ��
wechat:
--
Gitblit v1.9.3