root/wq-wms-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:添加结构车间配送定时器

Browse Source
This commit is contained in:
zhangzq
2026-06-29 20:34:26 +08:00
parent f4066e7a0d
commit 92c9df2ee5
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.java
View File

@@ -30,26 +30,7 @@ public interface SchBasePointMapper extends BaseMapper<SchBasePoint> {
*/
List<SchBasePoint> getAllUnlockAbnormalPoints();
@Select("SELECT p.*\n" +
"FROM sch_base_point p\n" +
"WHERE p.is_used = 1\n" +
" AND p.region_code IN \n" +
" <foreach collection='regions' item='region' open='(' separator=',' close=')'>\n" +
" #{region}\n" +
" </foreach>\n" +
" AND NOT EXISTS (\n" +
" SELECT 1\n" +
" FROM sch_base_task t\n" +
" WHERE t.is_delete = 0\n" +
" AND t.task_status <= '20'\n" +
" AND (\n" +
" t.point_code1 = p.point_code\n" +
" OR t.point_code2 = p.point_code\n" +
" OR t.point_code3 = p.point_code\n" +
" OR t.point_code4 = p.point_code\n" +
" )\n" +
" )\n" +
"ORDER BY p.point_code")
List<SchBasePoint> selectIdlePoint(@Param("regions") List<String> regions);
/**

21
nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBasePointMapper.xml
View File

@@ -63,4 +63,25 @@
</where>
ORDER BY p.region_code, p.point_code, p.point_type
</select>
<select id="selectIdlePoint" resultType="org.nl.wms.sch_manage.service.dao.SchBasePoint">
SELECT p.*
FROM sch_base_point p
WHERE p.is_used = 1
<if test="regions != null and regions.size() > 0">
AND p.region_code IN
<foreach collection="regions" item="region" open="(" separator="," close=")">
#{region}
</foreach>
</if>
AND NOT EXISTS (
SELECT 1
FROM sch_base_task t
WHERE t.is_delete = 0
AND t.task_status &lt;= '20'
AND (
t.point_code1 = p.point_code
OR t.point_code2 = p.point_code)
)
ORDER BY p.point_code
</select>
</mapper>