From 6f88e39b13f09decfdac0d31887a4e7c34629fc6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 06 八月 2024 08:47:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownStorageCageDetailsMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownStorageCageDetailsMapper.xml b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownStorageCageDetailsMapper.xml
index 10024bb..ee9090e 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownStorageCageDetailsMapper.xml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownStorageCageDetailsMapper.xml
@@ -28,7 +28,7 @@
FROM DOWN_STORAGE_CAGE_DETAILS
WHERE STATE = 100
and (FLOW_CARD_ID, LAYER) not in (
- select FLOW_CARD_ID, LAYER from down_workstation where workstation_id in
+ select FLOW_CARD_ID, LAYER from down_workstation where flow_card_id is not null and workstation_id not in
<foreach collection="workList" item="item" open='(' close=')' separator=','>
#{item}
</foreach>
--
Gitblit v1.8.0