From dc7e0180c54cb5576030585983502cb256eeee14 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期四, 20 六月 2024 22:05:39 +0800 Subject: [PATCH] 1、大理片笼进出片任务逻辑初次提交:单元测试已完成,待优化 2、删除重复无用的钢化小片表、玻璃小片表 3、删除玻璃小片mapper层接口多继承无用父类 4、调整按照工程号获取优化详情表内的宽高 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml index 1ef2f3f..072185f 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml @@ -2,7 +2,12 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper"> - <select id="querySitToUpGlass" resultType="java.lang.String"> + <resultMap id="bigStorageDTO" type="com.mes.bigstorage.entity.BigStorageDTO"> + <result column="REMAIN_WIDTH" property="width"/> + <result column="GLASS_COUNT" property="glassCount"/> + </resultMap> + + <select id="querySitToUpGlass" resultType="java.lang.Integer"> select t.line from ( select line, @@ -10,9 +15,17 @@ SUM(case task_state when 2 then 1 else 0 end) as real_count from big_storage_cage_feed_task where task_state in (1, 2) + and target_slot is null group by line ) t 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> </mapper> -- Gitblit v1.8.0