From 3c3453f985cf5326fa5df98e2f1e6a2437834fb2 Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Tue, 26 Mar 2024 18:07:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=96=87=E4=BB=B6=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E5=AD=98=E5=82=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/process/OrderProcessController.java | 6 +++--- .../controller/admin/process/vo/OrderProcessPageReqVO.java | 2 +- .../controller/admin/process/vo/OrderProcessRespVO.java | 2 +- .../controller/admin/process/vo/OrderProcessSaveReqVO.java | 2 +- .../executor/dal/dataobject/process/OrderProcessDO.java | 2 +- .../executor/service/process/OrderProcessServiceImpl.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/OrderProcessController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/OrderProcessController.java index fe8527d37..00e3580c1 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/OrderProcessController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/OrderProcessController.java @@ -64,10 +64,10 @@ public class OrderProcessController { @GetMapping("/get") @Operation(summary = "获得生产单工序") - @Parameter(name = "id", description = "编号", required = true, example = "1024") + @Parameter(name = "orderId", description = "生产单编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('executor:order-process:query')") - public CommonResult getOrderProcess(@RequestParam("id") Long id) { - OrderProcessDO orderProcess = orderProcessService.getOrderProcess(id); + public CommonResult getOrderProcess(@RequestParam("orderId") Long orderId) { + OrderProcessDO orderProcess = orderProcessService.getOrderProcess(orderId); return success(BeanUtils.toBean(orderProcess, OrderProcessRespVO.class)); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessPageReqVO.java index dedefbf5d..338189327 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessPageReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessPageReqVO.java @@ -16,7 +16,7 @@ import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH public class OrderProcessPageReqVO extends PageParam { @Schema(description = "生产单号") - private Long orderNo; + private Long orderId; @Schema(description = "工序名", example = "张三") private String name; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessRespVO.java index 7b93aac6d..e4d460a55 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessRespVO.java @@ -19,7 +19,7 @@ public class OrderProcessRespVO { @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("生产单号") - private Long orderNo; + private Long orderId; @Schema(description = "工序名", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") @ExcelProperty("工序名") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessSaveReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessSaveReqVO.java index 1e9809224..c05a85b92 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessSaveReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/process/vo/OrderProcessSaveReqVO.java @@ -14,7 +14,7 @@ public class OrderProcessSaveReqVO { @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "生产单号不能为空") - private Long orderNo; + private Long orderId; @Schema(description = "工序名", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") @NotEmpty(message = "工序名不能为空") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java index dc0f06a35..015bbe559 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java @@ -30,7 +30,7 @@ public class OrderProcessDO extends BaseDO { /** * 生产单号 */ - private Long orderNo; + private Long orderId; /** * 工序名 */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessServiceImpl.java index 1e8f70ba7..3d0bd3c77 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessServiceImpl.java @@ -60,7 +60,7 @@ public class OrderProcessServiceImpl implements OrderProcessService { @Override public OrderProcessDO getOrderProcess(Long id) { - return orderProcessMapper.selectById(id); + return orderProcessMapper.selectOne("id", id); } } \ No newline at end of file