From 7b1e81892d6e9d938c424e84745e3a8fc68e01bf Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 17 三月 2025 10:08:15 +0800
Subject: [PATCH] 修改流程卡打印异形显示

---
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index fd6fd90..3e80ef7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -250,7 +250,7 @@
             reportingWork.setReportingWorkTime(localDateTime);
         }
         //鏄惁绾胯ˉ 1鐜拌ˉ 0鏈幇琛�
-        int isPatch = (int) reportingWorkJson.get("isPatch");
+        int isPatch = (reportingWorkJson.get("isPatch") != null) ? (int) reportingWorkJson.get("isPatch") : 0;
 
         reportingWork.setNextProcess(orderProcessDetailMapper.selectNextProcess(processIdStr[0],processIdStr[1],reportingWork.getThisProcess()));
         //涓昏〃鎻掑叆
@@ -272,6 +272,9 @@
                     if (!damageDetail.getResponsibleProcess().equals(reportingWork.getThisProcess()) && qualityInsStatus==2) {
                         damageDetail.setQualityInsStatus(1);
                     }
+                    if (isPatch == 1){
+                        damageDetail.setQualityInsStatus(2);
+                    }
                     damageDetailsMapper.insert(damageDetail);
                 });
             }

--
Gitblit v1.8.0