From 29f942cefe9d9f4272332eec0276f2c5a60d9d9e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 08 一月 2025 09:13:42 +0800
Subject: [PATCH] 添加自动下片机打印标签功能

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index a4659c7..b42a3c0 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -61,6 +61,7 @@
     public List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure) {
         LambdaQueryWrapper<Damage> damageSelectWrapper = new LambdaQueryWrapper<>();
         damageSelectWrapper.between(Damage::getDamageTime, startTime, endTime);
+        damageSelectWrapper.ne(Damage::getStatus, 7);
         if (type != 0) {
             damageSelectWrapper.eq(Damage::getType, type);
         }
@@ -71,9 +72,8 @@
             damageSelectWrapper.eq(Damage::getWorkingProcedure, workingProcedure);
         }
         List<Damage> damageList = baseMapper.selectList(damageSelectWrapper);
-
         for (Damage damage : damageList) {
-            damage.setStatus(2);
+            damage.setStatus(3);
         }
         return baseMapper.selectList(damageSelectWrapper);
     }
@@ -134,7 +134,7 @@
                 }
             }
             reportingWorkDetails.add(reportingWorkDetail);
-            reportingWorkDetail.setDamageDetailsList(damageDetailses);
+            reportingWorkDetail.setDamageDetails(damageDetailses);
             sendToERP(reportingWork, reportingWorkDetails);
         }
     }

--
Gitblit v1.8.0