diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsApply.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsApply.java index 773f939..00cfcc1 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsApply.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsApply.java @@ -20,6 +20,12 @@ public class PlateGoodsApply extends BaseEntity { @TableField(exist = false) private static final long serialVersionUID = 1L; + /** + * 需求单号 + */ + @TableField(value = "DEMAND_CODE") + private String demandCode; + /** * 镀层物料号 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsRecord.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsRecord.java index 62687e9..1700392 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsRecord.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/PlateGoodsRecord.java @@ -20,6 +20,12 @@ public class PlateGoodsRecord extends BaseEntity { @TableField(exist = false) private static final long serialVersionUID = 1L; + /** + * 需求单号 + */ + @TableField(value = "DEMAND_CODE") + private String demandCode; + /** * 作业中心 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/AssayContentDetailVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/AssayContentDetailVo.java new file mode 100644 index 0000000..d4459a0 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/AssayContentDetailVo.java @@ -0,0 +1,30 @@ +package org.springblade.desk.order.pojo.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import org.springblade.desk.order.pojo.entity.AssayContentDetail; + +import java.io.Serial; + +/** + * 化验含量明细-视图类 + * + * @author lqk + */ +@Data +public class AssayContentDetailVo extends AssayContentDetail { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** + * 状态名称 + */ + String statusName; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/AssayContentVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/AssayContentVo.java new file mode 100644 index 0000000..d6b0eac --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/AssayContentVo.java @@ -0,0 +1,30 @@ +package org.springblade.desk.order.pojo.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import org.springblade.desk.order.pojo.entity.AssayContent; + +import java.io.Serial; + +/** + * 化验含量-视图类 + * + * @author lqk + */ +@Data +public class AssayContentVo extends AssayContent { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** + * 状态名称 + */ + String statusName; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanOrderVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanOrderVo.java new file mode 100644 index 0000000..a3d50a9 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanOrderVo.java @@ -0,0 +1,30 @@ +package org.springblade.desk.order.pojo.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import org.springblade.desk.order.pojo.entity.MoldPlanOrder; + +import java.io.Serial; + +/** + * 烧结模具计划-订单-视图类 + * + * @author lqk + */ +@Data +public class MoldPlanOrderVo extends MoldPlanOrder { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** + * 状态名称 + */ + String statusName; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanToolVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanToolVo.java new file mode 100644 index 0000000..344600a --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanToolVo.java @@ -0,0 +1,30 @@ +package org.springblade.desk.order.pojo.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import org.springblade.desk.order.pojo.entity.MoldPlanTool; + +import java.io.Serial; + +/** + * 烧结模具计划-模具-视图类 + * + * @author lqk + */ +@Data +public class MoldPlanToolVo extends MoldPlanTool { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** + * 状态名称 + */ + String statusName; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanVo.java new file mode 100644 index 0000000..48d0bd3 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanVo.java @@ -0,0 +1,30 @@ +package org.springblade.desk.order.pojo.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import org.springblade.desk.order.pojo.entity.MoldPlan; + +import java.io.Serial; + +/** + * 烧结模具计划-视图类 + * + * @author lqk + */ +@Data +public class MoldPlanVo extends MoldPlan { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** + * 状态名称 + */ + String statusName; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsApplyDetailVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsApplyDetailVo.java new file mode 100644 index 0000000..0b0bc98 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsApplyDetailVo.java @@ -0,0 +1,30 @@ +package org.springblade.desk.order.pojo.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import org.springblade.desk.order.pojo.entity.PlateGoodsApplyDetail; + +import java.io.Serial; + +/** + * 镀层物料添加量申报明细-视图类 + * + * @author lqk + */ +@Data +public class PlateGoodsApplyDetailVo extends PlateGoodsApplyDetail { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** + * 状态名称 + */ + String statusName; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsApplyVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsApplyVo.java new file mode 100644 index 0000000..0818bf4 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsApplyVo.java @@ -0,0 +1,30 @@ +package org.springblade.desk.order.pojo.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import org.springblade.desk.order.pojo.entity.PlateGoodsApply; + +import java.io.Serial; + +/** + * 镀层物料申报添加量-视图类 + * + * @author lqk + */ +@Data +public class PlateGoodsApplyVo extends PlateGoodsApply { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** + * 状态名称 + */ + String statusName; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsRecordDetailVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsRecordDetailVo.java new file mode 100644 index 0000000..6f5ecf9 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsRecordDetailVo.java @@ -0,0 +1,30 @@ +package org.springblade.desk.order.pojo.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import org.springblade.desk.order.pojo.entity.PlateGoodsRecordDetail; + +import java.io.Serial; + +/** + * 镀层物料需求申报明细-视图类 + * + * @author lqk + */ +@Data +public class PlateGoodsRecordDetailVo extends PlateGoodsRecordDetail { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** + * 状态名称 + */ + String statusName; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsRecordVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsRecordVo.java new file mode 100644 index 0000000..1155617 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsRecordVo.java @@ -0,0 +1,30 @@ +package org.springblade.desk.order.pojo.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import org.springblade.desk.order.pojo.entity.PlateGoodsRecord; + +import java.io.Serial; + +/** + * 镀层物料额外需求上报-视图类 + * + * @author lqk + */ +@Data +public class PlateGoodsRecordVo extends PlateGoodsRecord { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** + * 状态名称 + */ + String statusName; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/YieldOrderCraftVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/YieldOrderCraftVo.java new file mode 100644 index 0000000..2560a5c --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/YieldOrderCraftVo.java @@ -0,0 +1,30 @@ +package org.springblade.desk.order.pojo.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import org.springblade.desk.order.pojo.entity.YieldOrderCraft; + +import java.io.Serial; + +/** + * 生产订单工艺-视图类 + * + * @author lqk + */ +@Data +public class YieldOrderCraftVo extends YieldOrderCraft { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** + * 状态名称 + */ + String statusName; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/YieldOrderVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/YieldOrderVo.java new file mode 100644 index 0000000..7b6ecc0 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/YieldOrderVo.java @@ -0,0 +1,30 @@ +package org.springblade.desk.order.pojo.vo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import org.springblade.desk.order.pojo.entity.YieldOrder; + +import java.io.Serial; + +/** + * 生产订单-视图类 + * + * @author lqk + */ +@Data +public class YieldOrderVo extends YieldOrder { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + + /** + * 状态名称 + */ + String statusName; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java index eb73013..e4508dd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java @@ -3,6 +3,9 @@ package org.springblade.desk.order.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -14,8 +17,10 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.order.pojo.entity.AssayContent; import org.springblade.desk.order.pojo.entity.AssayContentDetail; import org.springblade.desk.order.pojo.request.AssayContentSave; +import org.springblade.desk.order.pojo.vo.AssayContentVo; import org.springblade.desk.order.service.IAssayContentDetailService; import org.springblade.desk.order.service.IAssayContentService; +import org.springblade.desk.order.wrapper.AssayContentWrapper; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -34,15 +39,19 @@ public class AssayContentController extends BladeController { private final IAssayContentService assayContentService; private final IAssayContentDetailService assayContentDetailService; - /** - * 分页 - */ - @GetMapping("/page") - @Operation(summary = "分页", description = "") - public R> page(AssayContent entity, Query query) { - IPage page = assayContentService.selectPage(Condition.getPage(query), entity); - return R.data(page); - } + /** + * 分页 + */ + @GetMapping("/page") + @Parameters({ + @Parameter(name = "wcId", description = "作业中心", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "status", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "int")) + }) + @Operation(summary = "分页", description = "") + public R> page(@Parameter(hidden = true) AssayContent entity, Query query) { + IPage page = assayContentService.selectPage(Condition.getPage(query), entity); + return R.data(AssayContentWrapper.build().pageVO(page)); + } /** * 详情 @@ -92,8 +101,8 @@ public class AssayContentController extends BladeController { * 列表 - 未使用的化验含量 */ @GetMapping("/listNoUsed") - @Operation(summary = "列表", description = "") - public R listNoUsed(AssayContentDetail authClient, Query query) { + @Operation(summary = "未使用的化验含量列表", description = "") + public R listNoUsed(@Parameter(hidden = true) AssayContentDetail authClient, Query query) { return R.data(null); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java index 42c6a51..67c77f5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java @@ -3,6 +3,9 @@ package org.springblade.desk.order.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -16,9 +19,11 @@ import org.springblade.desk.order.pojo.entity.MoldPlanOrder; import org.springblade.desk.order.pojo.entity.MoldPlanTool; import org.springblade.desk.order.pojo.enums.MoldPlanEnum; import org.springblade.desk.order.pojo.request.MoldPlanSave; +import org.springblade.desk.order.pojo.vo.MoldPlanVo; import org.springblade.desk.order.service.IMoldPlanOrderService; import org.springblade.desk.order.service.IMoldPlanService; import org.springblade.desk.order.service.IMoldPlanToolService; +import org.springblade.desk.order.wrapper.MoldPlanWrapper; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -42,10 +47,14 @@ public class MoldPlanController extends BladeController { * 分页 */ @GetMapping("/page") + @Parameters({ + @Parameter(name = "moCode", description = "工装号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "partCode", description = "零件号", in = ParameterIn.QUERY, schema = @Schema(type = "string")) + }) @Operation(summary = "分页", description = "") - public R> page(MoldPlan entity, Query query) { + public R> page(@Parameter(hidden = true) MoldPlan entity, Query query) { IPage page = moldPlanService.selectPage(Condition.getPage(query), entity); - return R.data(page); + return R.data(MoldPlanWrapper.build().pageVO(page)); } /** @@ -110,7 +119,7 @@ public class MoldPlanController extends BladeController { */ @GetMapping("/pageNearlyMonth") @Operation(summary = "分页", description = "") - public R> pageNearlyMonth(MoldPlan authClient, Query query) { + public R> pageNearlyMonth(@Parameter(hidden = true) MoldPlan authClient, Query query) { // 根据零件号,分页查询近一月的模具申报 return R.data(null); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java index f875c0f..631e2f7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java @@ -1,9 +1,11 @@ package org.springblade.desk.order.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -15,8 +17,10 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.order.pojo.entity.PlateGoodsApply; import org.springblade.desk.order.pojo.entity.PlateGoodsApplyDetail; import org.springblade.desk.order.pojo.request.PlateGoodsApplySave; +import org.springblade.desk.order.pojo.vo.PlateGoodsApplyVo; import org.springblade.desk.order.service.IPlateGoodsApplyDetailService; import org.springblade.desk.order.service.IPlateGoodsApplyService; +import org.springblade.desk.order.wrapper.PlateGoodsApplyWrapper; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -35,22 +39,25 @@ public class PlateGoodsApplyController extends BladeController { private final IPlateGoodsApplyService plateGoodsApplyService; private final IPlateGoodsApplyDetailService plateGoodsApplyDetailService; - /** - * 分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 1) - @Operation(summary = "分页", description = "") - public R> page(PlateGoodsApply entity, Query query) { + /** + * 分页 + */ + @GetMapping("/page") + @Parameters({ + @Parameter(name = "demandCode", description = "需求单号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "wcId", description = "作业中心", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "status", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "int")) + }) + @Operation(summary = "分页", description = "") + public R> page(@Parameter(hidden = true) PlateGoodsApply entity, Query query) { IPage page = plateGoodsApplyService.selectPage(Condition.getPage(query), entity); - return R.data(page); - } + return R.data(PlateGoodsApplyWrapper.build().pageVO(page)); + } /** * 详情 */ @GetMapping("/detail") - @ApiOperationSupport(order = 2) @Operation(summary = "详情", description = "") public R detail(String id) { PlateGoodsApply detail = plateGoodsApplyService.getById(id); @@ -61,7 +68,6 @@ public class PlateGoodsApplyController extends BladeController { * 新增 */ @PostMapping("/save") - @ApiOperationSupport(order = 3) @Operation(summary = "新增", description = "") public R save(@Valid @RequestBody PlateGoodsApplySave saveData) { PlateGoodsApply entity = saveData.getAssayContent(); @@ -74,7 +80,6 @@ public class PlateGoodsApplyController extends BladeController { * 修改 */ @PostMapping("/update") - @ApiOperationSupport(order = 4) @Operation(summary = "修改", description = "") public R update(@Valid @RequestBody PlateGoodsApplySave saveData) { PlateGoodsApply entity = saveData.getAssayContent(); @@ -87,7 +92,6 @@ public class PlateGoodsApplyController extends BladeController { * 删除 */ @PostMapping("/remove") - @ApiOperationSupport(order = 6) @Operation(summary = "逻辑删除", description = "传入ids") public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { return R.status(plateGoodsApplyService.deleteLogic(Func.toLongList(ids))); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java index 5b0ff55..de81cd4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java @@ -3,6 +3,9 @@ package org.springblade.desk.order.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -16,8 +19,10 @@ import org.springblade.desk.order.pojo.entity.PlateGoodsRecord; import org.springblade.desk.order.pojo.entity.PlateGoodsRecordDetail; import org.springblade.desk.order.pojo.enums.PlateGoodsEnum; import org.springblade.desk.order.pojo.request.PlateGoodsRecordSave; +import org.springblade.desk.order.pojo.vo.PlateGoodsRecordVo; import org.springblade.desk.order.service.IPlateGoodsRecordDetailService; import org.springblade.desk.order.service.IPlateGoodsRecordService; +import org.springblade.desk.order.wrapper.PlateGoodsRecordWrapper; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -33,28 +38,33 @@ import java.util.List; @Tag(name = "镀层物料需求申报", description = "接口") public class PlateGoodsRecordController extends BladeController { - private final IPlateGoodsRecordService goodsRecordService; - private final IPlateGoodsRecordDetailService goodsRecordDetailService; + private final IPlateGoodsRecordService goodsRecordService; + private final IPlateGoodsRecordDetailService goodsRecordDetailService; - /** - * 分页 - */ - @GetMapping("/page") - @Operation(summary = "分页", description = "") - public R> page(PlateGoodsRecord entity, Query query) { - IPage page = goodsRecordService.selectPage(Condition.getPage(query), entity); - return R.data(page); - } + /** + * 分页 + */ + @GetMapping("/page") + @Parameters({ + @Parameter(name = "demandCode", description = "需求单号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "wcId", description = "作业中心", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "status", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "int")) + }) + @Operation(summary = "分页", description = "") + public R> page(@Parameter(hidden = true) PlateGoodsRecord entity, Query query) { + IPage page = goodsRecordService.selectPage(Condition.getPage(query), entity); + return R.data(PlateGoodsRecordWrapper.build().pageVO(page)); + } - /** - * 详情 - */ - @GetMapping("/detail") - @Operation(summary = "详情", description = "") - public R detail(String id) { - PlateGoodsRecord detail = goodsRecordService.getById(id); - return R.data(detail); - } + /** + * 详情 + */ + @GetMapping("/detail") + @Operation(summary = "详情", description = "") + public R detail(String id) { + PlateGoodsRecord detail = goodsRecordService.getById(id); + return R.data(detail); + } /** * 新增 @@ -112,12 +122,12 @@ public class PlateGoodsRecordController extends BladeController { return R.status(result); } - /** - * 列表 - 查询已审批通过但未添加完成的申请列表 - */ - @GetMapping("/listNoFinished") - @Operation(summary = "列表", description = "") - public R listNoFinished(AssayContentDetail authClient, Query query) { - return R.data(null); + /** + * 列表 - 查询已审批通过但未添加完成的申请列表 + */ + @GetMapping("/listNoFinished") + @Operation(summary = "查询已审批通过但未添加完成的申请列表", description = "") + public R listNoFinished(@Parameter(hidden = true) AssayContentDetail authClient, Query query) { + return R.data(null); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java index 47e00f1..7314e3a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java @@ -16,12 +16,16 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.desk.order.pojo.entity.YieldOrder; import org.springblade.desk.order.pojo.entity.YieldOrderCraft; +import org.springblade.desk.order.pojo.vo.YieldOrderVo; import org.springblade.desk.order.service.IYieldOrderCraftService; import org.springblade.desk.order.service.IYieldOrderService; +import org.springblade.desk.order.wrapper.YieldOrderWrapper; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; /** @@ -43,13 +47,19 @@ public class YieldOrderController extends BladeController { */ @GetMapping("/page") @Parameters({ - @Parameter(name = "yoCode", description = "生产单号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), - @Parameter(name = "partCode", description = "零件号", in = ParameterIn.QUERY, schema = @Schema(type = "string")) + @Parameter(name = "yoCode", description = "计划单号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "yoCode", description = "生产单号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "partCode", description = "零件号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "batchNo", description = "批次号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "cardNo", description = "流程卡号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "roamNo", description = "流转编号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "reworkCode", description = "返工单号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "status", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "int")) }) @Operation(summary = "分页", description = "") - public R> page(@Parameter(hidden = true) YieldOrder entity, Query query) { + public R> page(@Parameter(hidden = true) YieldOrder entity, Query query) { IPage page = yieldOrderService.selectPage(Condition.getPage(query), entity); - return R.data(page); + return R.data(YieldOrderWrapper.build().pageVO(page)); } /** @@ -57,13 +67,21 @@ public class YieldOrderController extends BladeController { */ @GetMapping("/pageException") @Parameters({ - @Parameter(name = "yoCode", description = "生产单号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), - @Parameter(name = "partCode", description = "零件号", in = ParameterIn.QUERY, schema = @Schema(type = "string")) + @Parameter(name = "yoCode", description = "生产单号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "partCode", description = "零件号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), + @Parameter(name = "validationResult", description = "校验结果, 16002:数据缺失, 16003:工艺缺失, 16004:资源缺失, 16005:交期冲突", + in = ParameterIn.QUERY, schema = @Schema(type = "string")) }) - @Operation(summary = "分页", description = "") - public R> pageException(@Parameter(hidden = true) YieldOrder entity, Query query) { - IPage page = yieldOrderService.selectPage(Condition.getPage(query), entity); - return R.data(page); + @Operation(summary = "分页-异常订单", description = "") + public R> pageException(@Parameter(hidden = true) YieldOrder entity, Query query) { + IPage page = Condition.getPage(query); + page.setRecords(new ArrayList<>()); + + if (ObjectUtil.isNotEmpty(entity.getValidationResult())) { + page = yieldOrderService.selectPage(Condition.getPage(query), entity); + } + + return R.data(YieldOrderWrapper.build().pageVO(page)); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml index f996cea..8d853e0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/AssayContentMapper.xml @@ -4,6 +4,14 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml index a8192e8..d48d8b8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml @@ -4,6 +4,15 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml index 39059f2..98e0e6b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsApplyMapper.xml @@ -4,6 +4,18 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml index 2d47add..a3575d4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/PlateGoodsRecordMapper.xml @@ -4,6 +4,19 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.xml index a6b22c5..8d63310 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderCraftMapper.xml @@ -4,6 +4,11 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml index 8207abe..9d25041 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml @@ -5,6 +5,43 @@ + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/AssayContentDetailWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/AssayContentDetailWrapper.java new file mode 100644 index 0000000..3076f00 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/AssayContentDetailWrapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.order.pojo.entity.AssayContentDetail; +import org.springblade.desk.order.pojo.vo.AssayContentDetailVo; + +import java.util.Objects; + +/** + * 包装类,返回视图层所需的字段 + * + * @author Chill + */ +public class AssayContentDetailWrapper extends BaseEntityWrapper { + + public static AssayContentDetailWrapper build() { + return new AssayContentDetailWrapper(); + } + + @Override + public AssayContentDetailVo entityVO(AssayContentDetail entity) { + AssayContentDetailVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, AssayContentDetailVo.class)); +// vo.setStatusName(AssayContentDetailEnum.getName(entity.getStatus())); + return vo; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/AssayContentWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/AssayContentWrapper.java new file mode 100644 index 0000000..06b8529 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/AssayContentWrapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.order.pojo.entity.AssayContent; +import org.springblade.desk.order.pojo.vo.AssayContentVo; + +import java.util.Objects; + +/** + * 包装类,返回视图层所需的字段 + * + * @author Chill + */ +public class AssayContentWrapper extends BaseEntityWrapper { + + public static AssayContentWrapper build() { + return new AssayContentWrapper(); + } + + @Override + public AssayContentVo entityVO(AssayContent entity) { + AssayContentVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, AssayContentVo.class)); +// vo.setStatusName(AssayContentEnum.getName(entity.getStatus())); + return vo; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanOrderWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanOrderWrapper.java new file mode 100644 index 0000000..91d00fb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanOrderWrapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.order.pojo.entity.MoldPlanOrder; +import org.springblade.desk.order.pojo.vo.MoldPlanOrderVo; + +import java.util.Objects; + +/** + * 包装类,返回视图层所需的字段 + * + * @author Chill + */ +public class MoldPlanOrderWrapper extends BaseEntityWrapper { + + public static MoldPlanOrderWrapper build() { + return new MoldPlanOrderWrapper(); + } + + @Override + public MoldPlanOrderVo entityVO(MoldPlanOrder entity) { + MoldPlanOrderVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, MoldPlanOrderVo.class)); +// vo.setStatusName(MoldPlanOrderEnum.getName(entity.getStatus())); + return vo; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanToolWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanToolWrapper.java new file mode 100644 index 0000000..ec23599 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanToolWrapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.order.pojo.entity.MoldPlanTool; +import org.springblade.desk.order.pojo.vo.MoldPlanToolVo; + +import java.util.Objects; + +/** + * 包装类,返回视图层所需的字段 + * + * @author Chill + */ +public class MoldPlanToolWrapper extends BaseEntityWrapper { + + public static MoldPlanToolWrapper build() { + return new MoldPlanToolWrapper(); + } + + @Override + public MoldPlanToolVo entityVO(MoldPlanTool entity) { + MoldPlanToolVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, MoldPlanToolVo.class)); +// vo.setStatusName(MoldPlanToolEnum.getName(entity.getStatus())); + return vo; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanWrapper.java new file mode 100644 index 0000000..08f4114 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanWrapper.java @@ -0,0 +1,28 @@ +package org.springblade.desk.order.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.order.pojo.entity.MoldPlan; +import org.springblade.desk.order.pojo.enums.MoldPlanEnum; +import org.springblade.desk.order.pojo.vo.MoldPlanVo; + +import java.util.Objects; + +/** + * 包装类,返回视图层所需的字段 + * + * @author Chill + */ +public class MoldPlanWrapper extends BaseEntityWrapper { + + public static MoldPlanWrapper build() { + return new MoldPlanWrapper(); + } + + @Override + public MoldPlanVo entityVO(MoldPlan entity) { + MoldPlanVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, MoldPlanVo.class)); + vo.setStatusName(MoldPlanEnum.getName(entity.getStatus())); + return vo; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsApplyDetailWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsApplyDetailWrapper.java new file mode 100644 index 0000000..e385ed2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsApplyDetailWrapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.order.pojo.entity.PlateGoodsApplyDetail; +import org.springblade.desk.order.pojo.vo.PlateGoodsApplyDetailVo; + +import java.util.Objects; + +/** + * 包装类,返回视图层所需的字段 + * + * @author Chill + */ +public class PlateGoodsApplyDetailWrapper extends BaseEntityWrapper { + + public static PlateGoodsApplyDetailWrapper build() { + return new PlateGoodsApplyDetailWrapper(); + } + + @Override + public PlateGoodsApplyDetailVo entityVO(PlateGoodsApplyDetail entity) { + PlateGoodsApplyDetailVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, PlateGoodsApplyDetailVo.class)); +// vo.setStatusName(PlateGoodsApplyDetailEnum.getName(entity.getStatus())); + return vo; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsApplyWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsApplyWrapper.java new file mode 100644 index 0000000..5a17b85 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsApplyWrapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.order.pojo.entity.PlateGoodsApply; +import org.springblade.desk.order.pojo.vo.PlateGoodsApplyVo; + +import java.util.Objects; + +/** + * 包装类,返回视图层所需的字段 + * + * @author Chill + */ +public class PlateGoodsApplyWrapper extends BaseEntityWrapper { + + public static PlateGoodsApplyWrapper build() { + return new PlateGoodsApplyWrapper(); + } + + @Override + public PlateGoodsApplyVo entityVO(PlateGoodsApply entity) { + PlateGoodsApplyVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, PlateGoodsApplyVo.class)); +// vo.setStatusName(PlateGoodsApplyEnum.getName(entity.getStatus())); + return vo; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsRecordDetailWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsRecordDetailWrapper.java new file mode 100644 index 0000000..bdd8fb0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsRecordDetailWrapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.order.pojo.entity.PlateGoodsRecordDetail; +import org.springblade.desk.order.pojo.vo.PlateGoodsRecordDetailVo; + +import java.util.Objects; + +/** + * 包装类,返回视图层所需的字段 + * + * @author Chill + */ +public class PlateGoodsRecordDetailWrapper extends BaseEntityWrapper { + + public static PlateGoodsRecordDetailWrapper build() { + return new PlateGoodsRecordDetailWrapper(); + } + + @Override + public PlateGoodsRecordDetailVo entityVO(PlateGoodsRecordDetail entity) { + PlateGoodsRecordDetailVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, PlateGoodsRecordDetailVo.class)); +// vo.setStatusName(PlateGoodsRecordDetailEnum.getName(entity.getStatus())); + return vo; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsRecordWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsRecordWrapper.java new file mode 100644 index 0000000..7258c1e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsRecordWrapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.order.pojo.entity.PlateGoodsRecord; +import org.springblade.desk.order.pojo.vo.PlateGoodsRecordVo; + +import java.util.Objects; + +/** + * 包装类,返回视图层所需的字段 + * + * @author Chill + */ +public class PlateGoodsRecordWrapper extends BaseEntityWrapper { + + public static PlateGoodsRecordWrapper build() { + return new PlateGoodsRecordWrapper(); + } + + @Override + public PlateGoodsRecordVo entityVO(PlateGoodsRecord entity) { + PlateGoodsRecordVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, PlateGoodsRecordVo.class)); +// vo.setStatusName(PlateGoodsRecordEnum.getName(entity.getStatus())); + return vo; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/YieldOrderCraftWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/YieldOrderCraftWrapper.java new file mode 100644 index 0000000..bb83252 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/YieldOrderCraftWrapper.java @@ -0,0 +1,27 @@ +package org.springblade.desk.order.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.order.pojo.entity.YieldOrderCraft; +import org.springblade.desk.order.pojo.vo.YieldOrderCraftVo; + +import java.util.Objects; + +/** + * 包装类,返回视图层所需的字段 + * + * @author Chill + */ +public class YieldOrderCraftWrapper extends BaseEntityWrapper { + + public static YieldOrderCraftWrapper build() { + return new YieldOrderCraftWrapper(); + } + + @Override + public YieldOrderCraftVo entityVO(YieldOrderCraft entity) { + YieldOrderCraftVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, YieldOrderCraftVo.class)); +// vo.setStatusName(YieldOrderCraftEnum.getName(entity.getStatus())); + return vo; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/YieldOrderWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/YieldOrderWrapper.java new file mode 100644 index 0000000..6d12adc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/YieldOrderWrapper.java @@ -0,0 +1,28 @@ +package org.springblade.desk.order.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.order.pojo.entity.YieldOrder; +import org.springblade.desk.order.pojo.enums.YieldOrderEnum; +import org.springblade.desk.order.pojo.vo.YieldOrderVo; + +import java.util.Objects; + +/** + * 包装类,返回视图层所需的字段 + * + * @author Chill + */ +public class YieldOrderWrapper extends BaseEntityWrapper { + + public static YieldOrderWrapper build() { + return new YieldOrderWrapper(); + } + + @Override + public YieldOrderVo entityVO(YieldOrder entity) { + YieldOrderVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, YieldOrderVo.class)); + vo.setStatusName(YieldOrderEnum.getName(entity.getStatus())); + return vo; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/YieldPlanWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/YieldPlanWrapper.java index 4946052..494f177 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/YieldPlanWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/YieldPlanWrapper.java @@ -1,28 +1,3 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package org.springblade.desk.order.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper;