数据文件转换存储修改

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<OrderProcessRespVO> getOrderProcess(@RequestParam("id") Long id) {
+    public CommonResult<OrderProcessRespVO> getOrderProcess(@RequestParam("orderId") Long orderId) {
-        OrderProcessDO orderProcess = orderProcessService.getOrderProcess(id);
+        OrderProcessDO orderProcess = orderProcessService.getOrderProcess(orderId);
         return success(BeanUtils.toBean(orderProcess, OrderProcessRespVO.class));
     }
 

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;

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("工序名")

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 = "工序名不能为空")

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;
     /**
      * 工序名
      */

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);
     }
 
 }