mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
数据文件转换存储修改
This commit is contained in:
+3
-3
@@ -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) {
|
||||
OrderProcessDO orderProcess = orderProcessService.getOrderProcess(id);
|
||||
public CommonResult<OrderProcessRespVO> getOrderProcess(@RequestParam("orderId") Long orderId) {
|
||||
OrderProcessDO orderProcess = orderProcessService.getOrderProcess(orderId);
|
||||
return success(BeanUtils.toBean(orderProcess, OrderProcessRespVO.class));
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+1
-1
@@ -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("工序名")
|
||||
|
||||
+1
-1
@@ -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 = "工序名不能为空")
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@ public class OrderProcessDO extends BaseDO {
|
||||
/**
|
||||
* 生产单号
|
||||
*/
|
||||
private Long orderNo;
|
||||
private Long orderId;
|
||||
/**
|
||||
* 工序名
|
||||
*/
|
||||
|
||||
+1
-1
@@ -60,7 +60,7 @@ public class OrderProcessServiceImpl implements OrderProcessService {
|
||||
|
||||
@Override
|
||||
public OrderProcessDO getOrderProcess(Long id) {
|
||||
return orderProcessMapper.selectById(id);
|
||||
return orderProcessMapper.selectOne("id", id);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user