From c9788110fb195f5eae9b63a8816c545018f98919 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Fri, 19 Jul 2024 09:40:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=8D=95=E5=8F=82=E6=95=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/plan/vo/PlanRespVO.java | 6 +- .../executor/dal/dataobject/plan/PlanDO.java | 24 +++---- .../optimizeplan/OptimizePlanServiceImpl.java | 69 ++++++++++--------- .../service/plan/PlanServiceImpl.java | 2 +- 4 files changed, 51 insertions(+), 50 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanRespVO.java index 30deb9c86..3dd72074f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanRespVO.java @@ -34,9 +34,9 @@ public class PlanRespVO { @ExcelProperty("排单状态：0 新单，1 板材已申请，2 开料中，3 已开料") private Integer status; - @Schema(description = "是否支付：0 否，1 是", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("是否支付：0 否，1 是") - private Boolean isPay; +// @Schema(description = "是否支付：0 否，1 是", requiredMode = Schema.RequiredMode.REQUIRED) +// @ExcelProperty("是否支付：0 否，1 是") +// private Boolean isPay; @Schema(description = "机台 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16707") @ExcelProperty("机台 ID") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plan/PlanDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plan/PlanDO.java index e5e2f490b..508d4b30b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plan/PlanDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plan/PlanDO.java @@ -49,10 +49,10 @@ public class PlanDO extends BaseDO { * 排单状态：0 新单，1 板材已申请，2 开料中，3 已开料 */ private Integer status; - /** - * 是否支付：0 否，1 是 - */ - private Boolean isPay; +// /** +// * 是否支付：0 否，1 是 +// */ +// private Boolean isPay; /** * 机台 ID */ @@ -65,14 +65,14 @@ public class PlanDO extends BaseDO { * 生产单号 */ private String orderNos; - /** - * 排单优化文件地址 - */ - private String placeDateFileUrl; - /** - * 排单优化文件地址 - */ - private String placeOrderFileUrl; +// /** +// * 排单优化文件地址 +// */ +// private String placeDateFileUrl; +// /** +// * 排单优化文件地址 +// */ +// private String placeOrderFileUrl; /** * 备注 */ 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 0e371c3d3..918a0fc26 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 @@ -165,40 +165,41 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { @Override public Boolean savePlanPlateResult(SavePlanPlateResult result) { - PlanDO planDO = planMapper.selectById(result.getPlanId()); - if (Objects.isNull(planDO)) { - throw exception(PLAN_NOT_EXISTS); - } - try { - String placeDateFileUrlSource = planDO.getPlaceDateFileUrl(); - String placeOrderFileUrlSource = planDO.getPlaceOrderFileUrl(); - if (StrUtil.isNotBlank(placeDateFileUrlSource)) { - fileApi.deleteFileByPath(placeDateFileUrlSource).checkError(); - } - if (StrUtil.isNotBlank(placeOrderFileUrlSource)) { - fileApi.deleteFileByPath(placeOrderFileUrlSource).checkError(); - } - 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() - .id(result.getPlanId()) - .placeDateFileUrl(placeOrderFileUrl) - .placeOrderFileUrl(placeDateFileUrl) - .build(); - planMapper.updateById(updateDO); - - } catch (IOException e) { - throw exception(UNKNOWN); - } - return Boolean.TRUE; + return null; +// PlanDO planDO = planMapper.selectById(result.getPlanId()); +// if (Objects.isNull(planDO)) { +// throw exception(PLAN_NOT_EXISTS); +// } +// try { +// String placeDateFileUrlSource = planDO.getPlaceDateFileUrl(); +// String placeOrderFileUrlSource = planDO.getPlaceOrderFileUrl(); +// if (StrUtil.isNotBlank(placeDateFileUrlSource)) { +// fileApi.deleteFileByPath(placeDateFileUrlSource).checkError(); +// } +// if (StrUtil.isNotBlank(placeOrderFileUrlSource)) { +// fileApi.deleteFileByPath(placeOrderFileUrlSource).checkError(); +// } +// 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() +// .id(result.getPlanId()) +// .placeDateFileUrl(placeOrderFileUrl) +// .placeOrderFileUrl(placeDateFileUrl) +// .build(); +// planMapper.updateById(updateDO); +// +// } catch (IOException e) { +// throw exception(UNKNOWN); +// } +// return Boolean.TRUE; } @Override diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java index 94c95e732..e32646fb8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java @@ -159,7 +159,7 @@ public class PlanServiceImpl implements PlanService { validatePlanExists(updateReqVO.getId()); // 更新 PlanDO plan = BeanUtils.toBean(updateReqVO, PlanDO.class); - plan.setIsPay(Boolean.FALSE); + planMapper.updateById(plan); }