From 609818970fb1e7ae59b2535752a5ea063aa229b0 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期六, 06 七月 2024 15:05:52 +0800 Subject: [PATCH] 1:大理片 新增计算最大宽度:避免高度大于宽度 计算出错 2、磨边前卧式理片新增最小尺寸校验 3、下片修复下片逻辑异常,新增配置 人工下片的最大尺寸 最小尺寸 直通任务的最大尺寸 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml index a0a5902..2776022 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml @@ -21,11 +21,21 @@ where t.total_count = t.real_count </select> <select id="querySitToUpRemainWidth" resultMap="bigStorageDTO"> - SELECT cast(5000 - sum(width + 20) as INT) as REMAIN_WIDTH, - count(glass_id) as GLASS_COUNT - FROM big_storage_cage_feed_task - WHERE line = #{line} - AND task_state in (1, 2) + SELECT CAST + (5000 - SUM(MAX_LENGTH + #{glassGap}) AS INT) AS REMAIN_WIDTH, + COUNT(GLASS_ID) AS GLASS_COUNT + FROM ( + SELECT GLASS_ID, + CASE + + WHEN WIDTH >= HEIGHT THEN + WIDTH + ELSE HEIGHT + END MAX_LENGTH + FROM BIG_STORAGE_CAGE_FEED_TASK + WHERE LINE = 2002 + AND TASK_STATE IN (1, 2) + ) T </select> </mapper> -- Gitblit v1.8.0