diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java index 000e55cd7..e49f33e84 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java @@ -23,10 +23,10 @@ import java.time.LocalDateTime; * @author Tom Shuo * @since 2026-01-06 */ -@Data @TableName("QA_REVIEW_SHEET") -@Schema(description = "ReviewSheet Entity对象") +@Data @EqualsAndHashCode(callSuper = true) +@Schema(description = "ReviewSheet Entity对象") public class ReviewSheet extends BaseEntity { @Serial @@ -349,12 +349,12 @@ public class ReviewSheet extends BaseEntity { * 总数量 */ @Schema(description = "总数量") - private Short totalNum; + private Integer totalNum; /** * 返修数量 */ @Schema(description = "返修数量") - private Short reDoNum; + private Integer reDoNum; /** * 返修原因 */ @@ -375,4 +375,24 @@ public class ReviewSheet extends BaseEntity { */ @Schema(description = "[作业中心]id") private Long wcId; + /** + * 报废数量 + */ + @Schema(description = "报废数量") + private Integer scrapNum; + /** + * 报废数量 + */ + @Schema(description = "内部审理是否通过/驳回-[1]:通过;[2]:驳回;") + private Integer selfReviewFlag; + /** + * 不良原因 + */ + @Schema(description = "不良原因") + private String poorReason; + /** + * 不良描述 + */ + @Schema(description = "不良描述") + private String poorDesc; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetHisWOSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetHisWOSearch.java new file mode 100644 index 000000000..18945bf43 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetHisWOSearch.java @@ -0,0 +1,4 @@ +package org.springblade.desk.quality.pojo.request; + +public class ReviewSheetHisWOSearch { +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java index 01d2d5de8..b83931597 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java @@ -1,14 +1,35 @@ package org.springblade.desk.quality.pojo.request; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.ReviewSheet; /** - * todo: + * 生产处置单 搜索 */ @Data @EqualsAndHashCode(callSuper = false) public class ReviewSheetInitSearch extends ReviewSheet { + @Schema(description = "单据编号") + private String docCode; + @Schema(description = "车间订单号") + private String woCode; + @Schema(description = "产品编号") + private String prodCode; + @Schema(description = "产品名称") + private String prodName; + @Schema(description = "产品型号名称") + private String prodTypeName; + @Schema(description = "生产标识") + private String prodIdent; + @Schema(description = "批次号") + private String batchNo; + @Schema(description = "流程卡号") + private String cardNo; + @Schema(description = "创建时间-开始") + private String createTimeStart; + @Schema(description = "创建时间-结束") + private String createTimeEnd; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoScrapSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoScrapSearch.java new file mode 100644 index 000000000..581ca7273 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoScrapSearch.java @@ -0,0 +1,33 @@ +package org.springblade.desk.quality.pojo.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; + +/** + * 返工审理 报废审理 搜索 + */ +@Data +@EqualsAndHashCode(callSuper = false) +public class ReviewSheetRedoScrapSearch extends ReviewSheet { + + @Schema(description = "业务类型-[1]:内部审理返修;[2]:内部审理报废;") + private Integer bizType; + @Schema(description = "车间订单号") + private String woCode; + @Schema(description = "创建时间-开始") + private String createTimeStart; + @Schema(description = "创建时间-结束") + private String createTimeEnd; + @Schema(description = "提请人员[用户]真名") + private String createUserRealName; + @Schema(description = "审理[用户]真名") + private String reviewUserRealName; + @Schema(description = "供应商代码") + private String oemCode; + @Schema(description = "供应商名称") + private String oemName; + @Schema(description = "生产标识") + private String prodIdent; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoSearch.java deleted file mode 100644 index fe97ee2e2..000000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoSearch.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.springblade.desk.quality.pojo.request; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * todo: - */ -@Data -@EqualsAndHashCode() -public class ReviewSheetRedoSearch { - -} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetScrapSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetScrapSearch.java deleted file mode 100644 index 9edae34d4..000000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetScrapSearch.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.springblade.desk.quality.pojo.request; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * todo: - */ -@Data -@EqualsAndHashCode() -public class ReviewSheetScrapSearch { - -} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java index 5e937b2c6..260d270f1 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java @@ -1,13 +1,27 @@ package org.springblade.desk.quality.pojo.request; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; /** - * todo: + * 内部审理 搜索 */ @Data -@EqualsAndHashCode() -public class ReviewSheetSelfSearch { +@EqualsAndHashCode(callSuper = false) +public class ReviewSheetSelfSearch extends ReviewSheet { + @Schema(description = "车间订单号") + private String woCode; + @Schema(description = "供应商名称") + private String oemName; + @Schema(description = "创建时间-开始") + private String createTimeStart; + @Schema(description = "创建时间-结束") + private String createTimeEnd; + @Schema(description = "审理时间-开始") + private String reviewTimeStart; + @Schema(description = "审理时间-结束") + private String reviewTimeEnd; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ELeVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ELeVO.java new file mode 100644 index 000000000..b1b9e6251 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ELeVO.java @@ -0,0 +1,28 @@ +package org.springblade.desk.quality.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * [电子档案] todo: + */ +@Data +@EqualsAndHashCode() +public class ELeVO { + + @Schema(description = "[车间订单]编号") + private String woCode = ""; + @Schema(description = "[产品]编号") + private String prodCode = ""; + @Schema(description = "[批次]编号") + private String batCode = ""; + @Schema(description = "生产标识") + private String prodIdent = ""; + @Schema(description = "加工[班组]名称") + private String workTeamSetName; + @Schema(description = "完工时间") + private String finishTime; + @Schema(description = "上传兰台时间") + private String uploadTime; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDetailVO.java new file mode 100644 index 000000000..bf1b510c5 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDetailVO.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; + +import java.io.Serial; +import java.util.List; + +/** + * [生产处置单] 视图实体类 detail详情 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ReviewSheetDetailVO extends ReviewSheet { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "问题故障list") + private List faultList; + @Schema(description = "问题故障删除ids") + private String faultDeleteIds = ""; + @Schema(description = "责任零件list") + private List dutyList; + @Schema(description = "责任零件删除ids") + private String dutyDeleteIds = ""; + + @Schema(description = "发现[工序]名称") + private String findPrecessName; + @Schema(description = "流程卡号") + private String cardNo; + @Schema(description = "[物料]名称") + private String materialName; + @Schema(description = "提交类型") + private Integer submitType = 0; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetErpListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetErpVO.java similarity index 95% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetErpListVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetErpVO.java index f09e0ecda..581eb1f2c 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetErpListVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetErpVO.java @@ -8,7 +8,7 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet; @Data @EqualsAndHashCode(callSuper = true) -public class ReviewSheetErpListVO extends ReviewSheet { +public class ReviewSheetErpVO extends ReviewSheet { @Schema(description = "BaseEntityVO") private BaseEntityVO base; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetHisWOVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetHisWOVO.java new file mode 100644 index 000000000..1f5d6b69c --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetHisWOVO.java @@ -0,0 +1,22 @@ +package org.springblade.desk.quality.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 历史已完成车间订单 WorkOrder Copy Entity + */ +@Data +@EqualsAndHashCode() +public class ReviewSheetHisWOVO { + + @Schema(description = "车间订单id") + private Long woId = 1000L; + + @Schema(description = "车间订单编码") + private String woCode = "CJ1000"; + + @Schema(description = "车间订单下拉显示信息") + private String woInfo = "CJ1000"; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetSelfListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitVO.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetSelfListVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitVO.java index 2d3f9897f..a9c7f0384 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetSelfListVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitVO.java @@ -8,7 +8,7 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet; @Data @EqualsAndHashCode(callSuper = true) -public class ReviewSheetSelfListVO extends ReviewSheet { +public class ReviewSheetInitVO extends ReviewSheet { @Schema(description = "BaseEntityVO") private BaseEntityVO base; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoListVO.java deleted file mode 100644 index 873d7ccaa..000000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoListVO.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.springblade.desk.quality.pojo.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.desk.basic.pojo.vo.BaseEntityVO; -import org.springblade.desk.quality.pojo.entity.ReviewSheet; - -@Data -@EqualsAndHashCode(callSuper = true) -public class ReviewSheetRedoListVO extends ReviewSheet { - - @Schema(description = "BaseEntityVO") - private BaseEntityVO base; - @Schema(description = "审理状态 名称") - private String reviewStatusName; - @Schema(description = "审理[用户]真名") - private String reviewUserRealName; - @Schema(description = "打回[用户]真名") - private String backUserRealName; - @Schema(description = "车间订单号") - private String woCode; - -} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetScrapListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoScrapVO.java similarity index 94% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetScrapListVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoScrapVO.java index c4c03cc95..60f5f5cc7 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetScrapListVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoScrapVO.java @@ -8,7 +8,7 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet; @Data @EqualsAndHashCode(callSuper = true) -public class ReviewSheetScrapListVO extends ReviewSheet { +public class ReviewSheetRedoScrapVO extends ReviewSheet { @Schema(description = "BaseEntityVO") private BaseEntityVO base; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetSelfVO.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitListVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetSelfVO.java index cea01d6ba..73f499c1f 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitListVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetSelfVO.java @@ -8,7 +8,7 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet; @Data @EqualsAndHashCode(callSuper = true) -public class ReviewSheetInitListVO extends ReviewSheet { +public class ReviewSheetSelfVO extends ReviewSheet { @Schema(description = "BaseEntityVO") private BaseEntityVO base; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java deleted file mode 100644 index fffafd94a..000000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.pojo.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.desk.quality.pojo.entity.ReviewSheet; - -import java.io.Serial; -import java.util.List; - -/** - * [生产处置单] 视图实体类 detail详情 - * - * @author Tom Shuo - * @since 2026-01-06 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ReviewSheetVO extends ReviewSheet { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "故障list") - private List faultList; - @Schema(description = "故障删除ids") - private String faultDeleteIds = ""; - @Schema(description = "责任零件list") - private List dutyList; - @Schema(description = "责任零件删除ids") - private String dutyDeleteIds = ""; -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java index ce9aa18ad..72e3c3e7f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java @@ -5,13 +5,24 @@ package org.springblade.desk.quality.constant; */ public interface ReviewSheetConst { + /** + * 初始化 + */ Integer S_INIT = 0; - // [1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理; interface BizType { - Integer T_1 = 1; - Integer T_2 = 2; - Integer T_3 = 3; + /** + * [1]:内部审理返修 + */ + Integer T_SELF_REDO = 1; + /** + * [2]:内部审理报废 + */ + Integer T_SELF_SCRAP = 2; + /** + * [3]:ERP审理 + */ + Integer T_ERP = 3; } interface ERP { @@ -62,6 +73,24 @@ public interface ReviewSheetConst { Integer REVIEW_STATUS_15 = 15; } + interface SELF { + /** + * 编制中 + */ + Integer S_NEW = 1; + /** + * 待审理 + */ + Integer S_JUDGE = 2; + /** + * 待完成 + */ + Integer S_TODO = 3; + /** + * 已完成 + */ + Integer S_FINISH = 4; + } /** * 零件模式 @@ -72,7 +101,43 @@ public interface ReviewSheetConst { */ Integer MODE_ASSEMBLY = 2; /** - * 售后模式 + * 售后模式 目前不用 */ Integer MODE_AFTER_SALES = 3; + + interface SUBMIT_TYPE { + /** + * 内部提交 + */ + Integer T_SELF = 10; + /** + * 内部暂存 目前不需要 + */ + Integer T_SELF_TEMP = 11; + /** + * ERP暂存 + */ + Integer T_ERP_TEMP = 21; + /** + * ERP提交质保 + */ + Integer T_ERP_QA = 22; + /** + * ERP提交工艺 + */ + Integer T_ERP_CRAFT = 23; + /** + * ERP提交设计 + */ + Integer T_ERP_DES = 24; + /** + * ERP提交设计变更 + */ + Integer T_ERP_DES_CHANGE = 25; + } + + interface SELF_REVIEW_FLAG { + Integer YES = 1; + Integer NO = 2; + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java index ac0f126b6..c96910453 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java @@ -5,7 +5,6 @@ package org.springblade.desk.quality.controller; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.injector.methods.UpdateById; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; @@ -34,19 +33,13 @@ import org.springblade.desk.quality.pojo.entity.ReviewDuty; import org.springblade.desk.quality.pojo.entity.ReviewFault; import org.springblade.desk.quality.pojo.entity.ReviewSheet; import org.springblade.desk.quality.pojo.request.ReviewSheetInitSearch; -import org.springblade.desk.quality.pojo.request.ReviewSheetRedoSearch; -import org.springblade.desk.quality.pojo.request.ReviewSheetScrapSearch; +import org.springblade.desk.quality.pojo.request.ReviewSheetRedoScrapSearch; import org.springblade.desk.quality.pojo.request.ReviewSheetSelfSearch; -import org.springblade.desk.quality.pojo.vo.ReviewDutyVO; -import org.springblade.desk.quality.pojo.vo.ReviewFaultVO; -import org.springblade.desk.quality.pojo.vo.ReviewSheetInitListVO; -import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; +import org.springblade.desk.quality.pojo.vo.*; import org.springblade.desk.quality.service.IReviewDutyService; import org.springblade.desk.quality.service.IReviewFaultService; import org.springblade.desk.quality.service.IReviewSheetService; -import org.springblade.desk.quality.wrapper.ReviewDutyWrapper; -import org.springblade.desk.quality.wrapper.ReviewSheetInitListWrapper; -import org.springblade.desk.quality.wrapper.ReviewSheetWrapper; +import org.springblade.desk.quality.wrapper.*; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -84,10 +77,10 @@ public class ReviewSheetController extends BladeController { @GetMapping("/detail") @ApiOperationSupport(order = 10) @Operation(summary = "详情", description = "传入ReviewSheet Obj") - public R detail(ReviewSheet reviewSheet) { + public R detail(ReviewSheet reviewSheet) { QueryWrapper qw = Condition.getQueryWrapper(reviewSheet); ReviewSheet detail = service.getOne(qw); - ReviewSheetVO detailVO = ReviewSheetWrapper.build().entityVO(detail); + ReviewSheetDetailVO detailVO = ReviewSheetDetailWrapper.build().entityVO(detail); service.setVOValue(detailVO); return R.data(detailVO); } @@ -118,13 +111,13 @@ public class ReviewSheetController extends BladeController { @PostMapping("/listInit") @ApiOperationSupport(order = 20) @Operation(summary = "生产处置单list分页", description = "传入ReviewSheet Obj") - public R> listInit(@Parameter(hidden = true) @RequestParam(required = false) - ReviewSheetInitSearch search, Query query) { + public R> listInit(@Parameter(hidden = true) @RequestBody + ReviewSheetInitSearch search, Query query) { Map demo = new HashMap(); demo.put("status", ReviewSheetConst.S_INIT); QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ReviewSheetInitListWrapper.build().pageVO(pages); + IPage pagesVO = ReviewSheetInitWrapper.build().pageVO(pages); // todo: // pagesVO.getRecords() @@ -135,41 +128,22 @@ public class ReviewSheetController extends BladeController { } /** - * [生产处置单] 返工审理list分页 + * [生产处置单] 返工报废审理list分页 */ - @PostMapping("/listRedo") + @PostMapping("/listReviewRedoScrap") @ApiOperationSupport(order = 20) - @Operation(summary = "返工审理list分页", description = "传入ReviewSheet Obj") - public R> listRedo(@Parameter(hidden = true) @RequestParam(required = false) - ReviewSheetRedoSearch search, Query query) { + @Operation(summary = "返工报废审理list分页", description = "传入ReviewSheet Obj") + public R> listReviewRedoScrap(@Parameter(hidden = true) @RequestBody + ReviewSheetRedoScrapSearch search, Query query) { Map demo = new HashMap(); - demo.put("bizType", ReviewSheetConst.BizType.T_1); QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); + qw.eq(ReviewSheet.COL_BIZ_TYPE, search.getBizType()); + qw.eq(ReviewSheet.COL_REVIEW_STATUS, ReviewSheetConst.SELF.S_JUDGE); IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ReviewSheetWrapper.build().pageVO(pages); + IPage pagesVO = ReviewSheetRedoScrapWrapper.build().pageVO(pages); pagesVO.getRecords() .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - /** - * [生产处置单] 返工审理list分页 - */ - @PostMapping("/listScrap") - @ApiOperationSupport(order = 20) - @Operation(summary = "返工审理list分页", description = "传入ReviewSheet Obj") - public R> listScrap(@Parameter(hidden = true) @RequestParam(required = false) - ReviewSheetScrapSearch search, Query query) { - Map demo = new HashMap(); - demo.put("bizType", ReviewSheetConst.BizType.T_2); - QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ReviewSheetWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) + .peek(service::setRedoScrapVOValue) .collect(Collectors.toList()); return R.data(pagesVO); } @@ -180,16 +154,16 @@ public class ReviewSheetController extends BladeController { @PostMapping("/listSelf") @ApiOperationSupport(order = 20) @Operation(summary = "内部list分页", description = "传入ReviewSheet Obj") - public R> listSelf(@Parameter(hidden = true) @RequestParam(required = false) - ReviewSheetSelfSearch search, Query query) { + public R> listSelf(@Parameter(hidden = true) @RequestBody + ReviewSheetSelfSearch search, Query query) { Map demo = new HashMap(); QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); - qw.in("bizType", ReviewSheetConst.BizType.T_1, ReviewSheetConst.BizType.T_2); + qw.in("bizType", ReviewSheetConst.BizType.T_SELF_REDO, ReviewSheetConst.BizType.T_SELF_SCRAP); IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ReviewSheetWrapper.build().pageVO(pages); + IPage pagesVO = ReviewSheetSelfWrapper.build().pageVO(pages); pagesVO.getRecords() .stream() - .peek(service::setVOValue) + .peek(service::setSelfVOValue) .collect(Collectors.toList()); return R.data(pagesVO); } @@ -199,16 +173,16 @@ public class ReviewSheetController extends BladeController { */ @PostMapping("/listErp") @ApiOperationSupport(order = 20) - @Operation(summary = "ERPlist分页", description = "传入ReviewSheet Obj") - public R> listErp(@Parameter(hidden = true) @RequestParam Map reviewSheet, - Query query) { + @Operation(summary = "Erplist分页", description = "传入ReviewSheet Obj") + public R> listErp(@Parameter(hidden = true) @RequestParam Map reviewSheet, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(reviewSheet, ReviewSheet.class); - qw.eq("bizType", ReviewSheetConst.BizType.T_3); + qw.eq("bizType", ReviewSheetConst.BizType.T_ERP); IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ReviewSheetWrapper.build().pageVO(pages); + IPage pagesVO = ReviewSheetErpWrapper.build().pageVO(pages); pagesVO.getRecords() .stream() - .peek(service::setVOValue) + .peek(service::setErpVOValue) .collect(Collectors.toList()); return R.data(pagesVO); } @@ -232,9 +206,9 @@ public class ReviewSheetController extends BladeController { @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) @Operation(summary = "list下拉选择", description = "") - public R> listForSelect() { + public R> listForSelect() { List list = service.list(); - List listVO = ReviewSheetWrapper.build().listVO(list); + List listVO = ReviewSheetDetailWrapper.build().listVO(list); return R.data(listVO); } @@ -288,7 +262,7 @@ public class ReviewSheetController extends BladeController { @PostMapping("/submitInternal") @ApiOperationSupport(order = 50) @Operation(summary = "新增或修改一条", description = "传入ReviewSheet Obj") - public R submitInternal(@Valid @RequestBody ReviewSheetVO vo) { + public R submitInternal(@Valid @RequestBody ReviewSheetDetailVO vo) { { // dutyService.saveOrUpdateBatch(BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class)); @@ -308,7 +282,7 @@ public class ReviewSheetController extends BladeController { @PostMapping("/submitErp") @ApiOperationSupport(order = 50) @Operation(summary = "新增或修改一条", description = "传入ReviewSheet Obj") - public R submitErp(@Valid @RequestBody ReviewSheetVO vo) { + public R submitErp(@Valid @RequestBody ReviewSheetDetailVO vo) { { // dutyService.saveOrUpdateBatch(BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class)); @@ -322,16 +296,13 @@ public class ReviewSheetController extends BladeController { return R.status(service.saveOrUpdate(vo)); } - @GetMapping("/review") + @GetMapping("/reviewSelf") @ApiOperationSupport(order = 22) - @Operation(summary = "审批", description = "") - public R review(@RequestParam Long id, - @RequestParam Integer status, - @RequestParam String memo) { - ReviewSheet rs = service.getById(id); - rs.setStatus(status); - rs.setMemo(memo); - return R.status(service.updateById(rs)); + @Operation(summary = "内部审批", description = "") + public R reviewSelf(@Parameter(description = "id") @RequestParam Long id, + @Parameter(description = "selfReviewFlag 1 or 2") @RequestParam Integer selfReviewFlag, + @Parameter(description = "memo") @RequestParam String memo) { + return service.reviewSelf(id, selfReviewFlag, memo); } /** @@ -402,12 +373,14 @@ public class ReviewSheetController extends BladeController { } /** - * [生产处置单] 修改一条 + * 填报[生产处置单] */ @PostMapping("/fill") @ApiOperationSupport(order = 40) - @Operation(summary = "fill", description = "ReviewSheetVO Obj") - public R fill(@Valid @RequestBody ReviewSheetVO vo) { + @Operation(summary = "填报[生产处置单]", description = "ReviewSheetVO Obj") + public R fill(@Valid @RequestBody ReviewSheetDetailVO vo) { return service.fill(vo); } + + public R getHisWO( ) } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java index 6681b62c3..fc6d33d19 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.quality.excel.ReviewSheetExcel; import org.springblade.desk.quality.pojo.entity.ReviewSheet; -import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; +import org.springblade.desk.quality.pojo.vo.ReviewSheetDetailVO; import java.util.List; @@ -28,7 +28,7 @@ public interface ReviewSheetMapper extends BaseMapper { * @param reviewSheet 查询参数 * @return List */ - List selectReviewSheetPage(IPage page, ReviewSheetVO reviewSheet); + List selectReviewSheetPage(IPage page, ReviewSheetDetailVO reviewSheet); /** * 获取导出数据 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml index 3fbb2649a..007899097 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml @@ -44,6 +44,10 @@ + + + +