bingbo
2023-11-27 56c81870c0cf2e7cc2916da746f05aa637ce6b77
加减钢筋笼库存 带记录
已修改3个文件
53 ■■■■■ 文件已修改
hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/bigscreen/mapper/BigScreenMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/bigscreen/service/impl/ProduceListenServiceImpl.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/screen/src/main/resources/mapping/BigScreenMapper.xml 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/bigscreen/mapper/BigScreenMapper.java
@@ -34,4 +34,8 @@
    void insertAudioGroup(AudioGroup audioGroup);
    List<AudioGroup> queryGroups();
    List<HashMap<String,Object>> querySteelMake();
    List<HashMap<String,Object>> queryRestInfo();
}
hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/bigscreen/service/impl/ProduceListenServiceImpl.java
@@ -45,11 +45,17 @@
        map.put("pipePlanActual",yearCountList);
        //月度生产计划和实际完成
        List<PipeMonthPlanActual> pipeMonthPlanActuals = bigScreenMapper.pipeMonthPlanActual(companyId);
        map.put("pipeMonthPlanActual",pipeMonthPlanActuals);
        //List<PipeMonthPlanActual> pipeMonthPlanActuals = bigScreenMapper.pipeMonthPlanActual(companyId);
        //map.put("pipeMonthPlanActual",pipeMonthPlanActuals);
        //原料消耗 周月
        List<MaterialWeekAndMonth> materialWeekAndMonths = bigScreenMapper.materialWeekMonth(companyId);
        map.put("materialWeekAndMonths",materialWeekAndMonths);
        //List<MaterialWeekAndMonth> materialWeekAndMonths = bigScreenMapper.materialWeekMonth(companyId);
        //map.put("materialWeekAndMonths",materialWeekAndMonths);
        //钢筋消耗
        List<HashMap<String,Object>> steelUseList = bigScreenMapper.querySteelMake();
        map.put("steelUse",steelUseList);
        //缓存区
        List<HashMap<String,Object>> restInfo = bigScreenMapper.queryRestInfo();
        map.put("restInfo",restInfo);
        //水养池
        List<WaterCulInfo> culInfoList = bigScreenMapper.WaterCulInfo(companyId);
        map.put("waterCulInfo",culInfoList);
hd/pipe/screen/src/main/resources/mapping/BigScreenMapper.xml
@@ -237,5 +237,40 @@
        select id,group_id as groupId,group_name as groupName from t_audio_groups
    </select>
    <!--钢筋总消耗,周消耗,月消耗-->
    <select id="querySteelMake" resultType="hashmap">
        select steel.steel_id,CONCAT(steel.steel_name,'-',steel_model) as steelName,
               case when a.totalStock is NULL then 0 else a.totalStock end as totalStock,
               case when b.weekStock is NULL then 0 else b.weekStock end as weekStock,
               case when c.monthStock is NULL then 0 else c.monthStock end as monthStock
        from sys_steel steel
                 left join
             (
                 select ssr.steel_id,sum(ssr.change_stock) as totalStock from sys_steel_record ssr
                 where ssr.stock_type = 2
                 group by ssr.steel_id
             ) a on steel.steel_id = a.steel_id
                 left join
             (
                 select ssr.steel_id,sum(ssr.change_stock) as weekStock from sys_steel_record ssr
                 where ssr.stock_type = 2 and YEAR(SYSDATE()) = YEAR(ssr.create_time) and WEEK(sysdate(),1) = WEEK(ssr.create_time,1)
        group by ssr.steel_id
            ) b on steel.steel_id = b.steel_id
            left join
            (
            select ssr.steel_id,sum(ssr.change_stock) as monthStock from sys_steel_record ssr
            where ssr.stock_type = 2 and YEAR(SYSDATE()) = YEAR(ssr.create_time) and MONTH(SYSDATE()) = MONTH(ssr.create_time)
            group by ssr.steel_id
            ) c on steel.steel_id = c.steel_id
    </select>
    <!--获取静养区-->
    <select id="queryRestInfo" resultType="hashmap">
        select sd.device_id as deviceId,sd.device_name as deviceName,(select tem from t_rest_data trd where trd.device_id = sd.device_id order by check_time desc limit 1) as tem
        from sys_device sd where sd.produce_order = '静养'
    </select>
</mapper>