From d724176dbcf033a096d7dcbd864c05485f021fbb Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 17 十二月 2025 08:30:56 +0800
Subject: [PATCH] 1、 钢化前钢化出片逻辑调整,避免卧转立信号对调度任务的影响 2、修改出片方式,当玻璃未在关系表时,默认出一片 3、中空新增进片线路校验,避免钢化重复报工

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineerScheduling/service/impl/EngineerSchedulingServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineerScheduling/service/impl/EngineerSchedulingServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineerScheduling/service/impl/EngineerSchedulingServiceImpl.java
index 54f793f..b80f04b 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineerScheduling/service/impl/EngineerSchedulingServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineerScheduling/service/impl/EngineerSchedulingServiceImpl.java
@@ -25,14 +25,16 @@
     @Override
     public List<EngineerScheduling> listByState() {
         QueryWrapper<EngineerScheduling> wrapper = new QueryWrapper<>();
-        wrapper.lt("type", 3);
+        wrapper.lt("type", 3)
+                .eq("state", 100);
         return baseMapper.selectList(wrapper);
     }
 
     @Override
     public List<EngineerScheduling> queryByType(Integer type) {
         QueryWrapper<EngineerScheduling> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("type", type);
+        queryWrapper.eq("type", type)
+                .orderByAsc("id");
         return baseMapper.selectList(queryWrapper);
     }
 

--
Gitblit v1.8.0