diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java index 38befdf72..b4ea190a7 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java @@ -1,6 +1,7 @@ package com.cf.imes.module.executor.controller.admin.plan; import com.cf.imes.framework.common.pojo.CommonResult; +import com.cf.imes.framework.operatelog.core.annotations.OperateLog; import com.cf.imes.module.executor.controller.admin.plan.vo.AddRemainReqVO; import com.cf.imes.module.executor.controller.admin.plan.vo.PlateOptimize; import com.cf.imes.module.executor.controller.admin.plan.vo.SavePlanPlateResult; @@ -46,6 +47,7 @@ public class OptimizePlanController { @PostMapping("savePlanPlateResult") @Operation(summary = "提交保存优化结果文件") + @OperateLog(logArgs = false) @PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')") public CommonResult savePlanPlateResult(SavePlanPlateResult result) { return CommonResult.success(optimizePlanService.savePlanPlateResult(result)); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SavePlanPlateResult.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SavePlanPlateResult.java index 0cd9a266e..c39344f24 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SavePlanPlateResult.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SavePlanPlateResult.java @@ -15,9 +15,11 @@ public class SavePlanPlateResult { @Schema(description = "排单id") private Long planId; + @Schema(description = "文件附件", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "文件附件不能为空") private MultipartFile placeOrder; + @Schema(description = "文件附件", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "文件附件不能为空") private MultipartFile placeData; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java index c4c03583e..8f3c25526 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java @@ -80,9 +80,11 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { FileCreateReqDTO fileCreateReqDTO = new FileCreateReqDTO(); fileCreateReqDTO.setContent(result.getPlaceData().getBytes()); + fileCreateReqDTO.setName(result.getPlaceData().getOriginalFilename()); String placeDateFileUrl = fileApi.createFile(fileCreateReqDTO).getCheckedData(); fileCreateReqDTO.setContent(result.getPlaceOrder().getBytes()); + fileCreateReqDTO.setName(result.getPlaceOrder().getOriginalFilename()); String placeOrderFileUrl = fileApi.createFile(fileCreateReqDTO).getCheckedData(); PlanDO updateDO = PlanDO.builder() @@ -90,7 +92,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { .placeDateFileUrl(placeOrderFileUrl) .placeOrderFileUrl(placeDateFileUrl) .build(); - planMapper.insert(updateDO); + planMapper.updateById(updateDO); } catch (IOException e) { throw exception(UNKNOWN);