chenlu
2025-09-17 c5baf278581cebec3e18fab79b0c22189538bd3d
mes报工基础数据接口
4个文件已修改
44 ■■■■■ 已修改文件
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
@@ -194,4 +194,14 @@
    public Result saveWorkStorage( @RequestBody Map<String,Object>  object){
        return Result.seccess(reportingWorkService.saveWorkStorage(object));
    }}
    }
    @ApiOperation("Mes报工基础数据")
    @PostMapping  ("/mesBasicData")
    public Result mesBasicData()  {
        return  Result.seccess(reportingWorkService.mesBasicDataSv());
    }
}
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
@@ -106,4 +106,8 @@
    Integer selectReviewedState(String reportingWorkId);
    List<ReportingWork> qualityReviewSearchMp();
    List<BasicDataProduce> mesSelectWorkBasicDeviceMp();
    List<Map<String,String>> mesSelectWorkBasicTeamsMp();
}
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -1259,4 +1259,20 @@
            //List<Map<String, Object>> flowCard = reportingWorkMapper.getStorageData();
            //finishedGoodsInventoryService.addSelectWarehousing(object);
            return null;
        }}
        }
    public Map<String, Object> mesBasicDataSv() {
        Map<String, Object> map = new HashMap<>();
        //工序
        map.put("process",flowCardMapper.getProcessNameList());
        //设备下拉框
        map.put("device", reportingWorkMapper.mesSelectWorkBasicDeviceMp());
        //班组下拉框
        map.put("teams", reportingWorkMapper.mesSelectWorkBasicTeamsMp());
        //次破类型
        map.put("breakageType", reportingWorkMapper.selectBasicNameByType("breakagetype"));
        //次破原因
        map.put("breakageReason", reportingWorkMapper.selectBasicNameByType("breakagereason"));
        return map;
    }
}
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -1114,4 +1114,14 @@
        GROUP BY rw.reporting_work_id
        ORDER BY rw.reporting_work_id desc
    </select>
    <select id="mesSelectWorkBasicDeviceMp">
        SELECT bdp.id,bdp.basic_type,bdp.basic_name, 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="device" and bd.basic_name = #{process}
    </select>
    <select id="mesSelectWorkBasicTeamsMp">
        select id,login_name,user_name,address from erp_user_info.`user`
    </select>
</mapper>