chenlu
2024-03-01 371d61c46561b76a0d8f559f352864bd94dfd6ad
获取历史工序
4个文件已修改
30 ■■■■■ 已修改文件
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/target/classes/mapper/pp/ReportingWork.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
@@ -34,4 +34,6 @@
    List<Map<String,String>> historyDeviceMp(String historyProcess, String process);
    List<Map<String,String>> historyTeamsMp(String historyProcess, String process);
    List<Map<String,String>> SelectHistoryProcessMp(String historyProcess, String process);
}
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -88,6 +88,8 @@
        map.put("historyDevice",reportingWorkMapper.historyDeviceMp(historyProcess,process));
        //历史报工工序班组
        map.put("historyTeams",reportingWorkMapper.historyTeamsMp(historyProcess,process));
        //历史工序
        map.put("historyProcess",reportingWorkMapper.SelectHistoryProcessMp(historyProcess,process));
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -169,4 +169,17 @@
          AND POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))
    </select>
    <select id="SelectHistoryProcessMp">
        SELECT
            distinct
            bd.basic_name AS basic_category
        FROM
            sd.basic_data AS bd
                LEFT JOIN `basic_data_produce` AS bdp ON bd.id = bdp.basic_category
        WHERE
            bd.basic_category = "process"
          AND bdp.basic_type = "teamsgroups"
          AND POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))
    </select>
</mapper>
north-glass-erp/target/classes/mapper/pp/ReportingWork.xml
@@ -169,4 +169,17 @@
          AND POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))
    </select>
    <select id="SelectHistoryProcessMp">
        SELECT
            distinct
            bd.basic_name AS basic_category
        FROM
            sd.basic_data AS bd
                LEFT JOIN `basic_data_produce` AS bdp ON bd.id = bdp.basic_category
        WHERE
            bd.basic_category = "process"
          AND bdp.basic_type = "teamsgroups"
          AND POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))
    </select>
</mapper>