“linengliang”
2024-01-11 73739df48132de6d98a8f22047a37decd9c78c56
维修添加实际用料
已修改2个文件
17 ■■■■ 文件已修改
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderActualMaterialController.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderActualMaterialController.java
@@ -269,7 +269,16 @@
        }
        return Result.error("出库单不存在");
    }
    @PostMapping(value = "/addNew")
    public Result<String> addNew(@RequestBody List<RepairOrderActualMaterial> list) {
        if(list.size()!=0){
            String id = list.get(0).getRepairOrderId();
            repairOrderActualMaterialService.remove(new QueryWrapper<RepairOrderActualMaterial>().eq("repair_order_id",id));
            repairOrderActualMaterialService.saveBatch(list);
            return Result.OK("添加成功");
        }else {
            return Result.error("添加失败");
        }
    }
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
@@ -1551,10 +1551,10 @@
         List<RepairOrderActualWorkHours> hoursList = repairOrderActualWorkHoursService.list(new QueryWrapper<RepairOrderActualWorkHours>().eq("repair_order_id",id).eq("del_flag",0));
         List<RepairOrderActualWorkHours> mainStuff = repairOrderActualWorkHoursService.list(new QueryWrapper<RepairOrderActualWorkHours>().eq("repair_order_id",id).eq("del_flag",0).eq("principal_contractor","1"));
         if(hoursList.size()<2){
             return Result.error("操作失败,请至少添加两个承修人");
             return Result.error("操作失败,请至少添加两个承修人,并且设置一个主承修人");
         }
         if(mainStuff.size()!=1){
             return Result.error("操作失败,请添加主承修人,有且只有一个");
             return Result.error("操作失败,请设置主承修人,有且只有一个");
         }
         if(StringUtils.isNotBlank(repairOrder.getProjectMaintenanceOrderId())){
             //判断项目性维修子表状态