XiaoRuby
2023-09-09 08b73231454d852f1af710fa039a4d5376e764d9
MOM系统-9-09
已修改4个文件
10 ■■■■ 文件已修改
inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
@@ -39,7 +39,7 @@
    @PostMapping("/addRawInspects")
    public Result addRawInspects(@RequestHeader("token") String token,@Validated @RequestBody RawInspectVo rawInspectVo) throws Exception {
        Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
        return Result.success(rawInspectService.addRawInspects(data.get("id").replaceAll("\"", ""), rawInspectVo));
        return Result.success("提交成功!",rawInspectService.addRawInspects(data.get("id").replaceAll("\"", ""), rawInspectVo));
    }
    @ApiOperation(value = "分页查询原材料检验单列表")
inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java
@@ -27,7 +27,7 @@
    IPage<Map<String, Object>> selectRawInspectsList(Page<Object> page, String formTime, String code, Integer insState, String name);
    //根据原材料检验单id查看详情
    List<Map<String, Object>> selectRawInspectsListById(Integer id);
    Map<String, Object> selectRawInspectsListById(Integer id);
}
inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
@@ -39,7 +39,7 @@
     * @param id
     * @return
     */
    List<Map<String,Object>> selectRawInspectsListById(Integer id);
    Map<String, Object> selectRawInspectsListById(Integer id);
    /**
     * 更新检验状态
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
@@ -93,7 +93,7 @@
        }).collect(Collectors.toList());
        //检验项目批量添加
        rawInsProductService.saveBatch(rawInsProductList);
        return "新增检验单成功!";
        return rawInspect.getId().toString();
    }
@@ -105,7 +105,7 @@
    //根据检验单id查询原材料检验单详情
    @Override
    public List<Map<String, Object>> selectRawInspectsListById(Integer id) {
    public Map<String, Object> selectRawInspectsListById(Integer id) {
        return rawInspectMapper.selectRawInspectsListById(id);
    }