diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/RelTeamSetUserDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/RelTeamSetUserDTO.java new file mode 100644 index 00000000..d9399669 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/RelTeamSetUserDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.RelTeamSetUser; + +import java.io.Serial; + +/** + * [班组用户关联] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class RelTeamSetUserDTO extends RelTeamSetUser { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/RelTeamSetUser.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/RelTeamSetUser.java new file mode 100644 index 00000000..676e5701 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/RelTeamSetUser.java @@ -0,0 +1,49 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * [班组用户关联] 实体类 + * + * @author Tom Shuo + * @since 2026-01-13 + */ +@Data +@TableName("BA_REL_TEAM_SET_USER") +@Schema(description = "RelTeamSetUser Entity对象") +@EqualsAndHashCode(callSuper = true) +public class RelTeamSetUser extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [班组]id + */ + public static final String COL_TEAM_SET_ID = "TEAM_SET_ID"; + /** + * [用户]id + */ + public static final String COL_USER_ID = "USER_ID"; + + /** + * [班组]id + */ + @Schema(description = "[班组]id") + private Long teamSetId; + /** + * [用户]id + */ + @Schema(description = "[用户]id") + private Long userId; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java index 60e30a81..2ba37c3e 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java @@ -24,143 +24,143 @@ import java.io.Serial; @EqualsAndHashCode(callSuper = true) public class TeamSet extends BaseEntity { - @Serial - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; - /** - * 编码 - */ + /** + * 编码 + */ public static final String COL_TS_CODE = "TS_CODE"; - /** - * 名称 - */ + /** + * 名称 + */ public static final String COL_TS_NAME = "TS_NAME"; - /** - * 调度员 - */ + /** + * 调度员 + */ public static final String COL_DISPATCHER = "DISPATCHER"; - /** - * 班组长;外键（人员） - */ + /** + * 班组长[用户]id + */ public static final String COL_TEAM_LEADER = "TEAM_LEADER"; - /** - * 班次;外键（班次） - */ + /** + * 班次;外键（班次） + */ public static final String COL_CS_ID = "CS_ID"; - /** - * 日分派时间 - */ + /** + * 日分派时间 + */ public static final String COL_DAY_PUT_DUE_TIME = "DAY_PUT_DUE_TIME"; - /** - * 创建人;外键（人员） - */ + /** + * 创建人;外键（人员） + */ public static final String COL_CREATE_MAN = "CREATE_MAN"; - /** - * 作业中心 - */ + /** + * 作业中心 + */ public static final String COL_WC_ID = "WC_ID"; - /** - * - */ + /** + * + */ public static final String COL_SPECIAL = "SPECIAL"; - /** - * - */ + /** + * + */ public static final String COL_PLANNER = "PLANNER"; - /** - * - */ + /** + * + */ public static final String COL_TEAM_MEMBER = "TEAM_MEMBER"; - /** - * - */ + /** + * + */ public static final String COL_SPEC_DAY_PUT_DUE_TIME = "SPEC_DAY_PUT_DUE_TIME"; - /** - * - */ + /** + * + */ public static final String COL_EX_CHANGE_TIME = "EX_CHANGE_TIME"; - /** - * 类型;1、针孔，2、壳体，3、烧结，4、园区，5、外协 - */ + /** + * 类型-[1]针孔;[2]-壳体;[3]烧结;[4]:园区;[5]:外协; + */ public static final String COL_TS_TYPE = "TS_TYPE"; - /** - * 备注 - */ + /** + * 备注 + */ public static final String COL_REMARK = "REMARK"; - /** - * 编码 - */ - @Schema(description = "编码") - private String tsCode; - /** - * 名称 - */ - @Schema(description = "名称") - private String tsName; - /** - * 调度员 - */ - @Schema(description = "调度员") - private Long dispatcher; - /** - * 班组长;外键（人员） - */ - @Schema(description = "班组长;外键（人员）") - private Long teamLeader; - /** - * 班次;外键（班次） - */ - @Schema(description = "班次;外键（班次）") - private Long csId; - /** - * 日分派时间 - */ - @Schema(description = "日分派时间") - private String dayPutDueTime; - /** - * 创建人;外键（人员） - */ - @Schema(description = "创建人;外键（人员）") - private Long createMan; - /** - * 作业中心 - */ - @Schema(description = "作业中心") - private Long wcId; - /** - * - */ - @Schema(description = "") - private String special; - /** - * - */ - @Schema(description = "") - private Long planner; - /** - * - */ - @Schema(description = "") - private String teamMember; - /** - * - */ - @Schema(description = "") - private String specDayPutDueTime; - /** - * - */ - @Schema(description = "") - private String exChangeTime; - /** - * 类型;1、针孔，2、壳体，3、烧结，4、园区，5、外协 - */ - @Schema(description = "类型;1、针孔，2、壳体，3、烧结，4、园区，5、外协") - private Short tsType; - /** - * 备注 - */ - @Schema(description = "备注") - private String remark; + /** + * 编码 + */ + @Schema(description = "编码") + private String tsCode; + /** + * 名称 + */ + @Schema(description = "名称") + private String tsName; + /** + * 调度员 + */ + @Schema(description = "调度员") + private Long dispatcher; + /** + * 班组长;外键（人员） + */ + @Schema(description = "班组长[用户]id") + private Long teamLeader; + /** + * 班次;外键（班次） + */ + @Schema(description = "班次;外键（班次）") + private Long csId; + /** + * 日分派时间 + */ + @Schema(description = "日分派时间") + private String dayPutDueTime; + /** + * 创建人;外键（人员） + */ + @Schema(description = "创建人;外键（人员）") + private Long createMan; + /** + * 作业中心 + */ + @Schema(description = "作业中心") + private Long wcId; + /** + * 特殊标识 + */ + @Schema(description = "") + private String special; + /** + * 计划员[用户]id + */ + @Schema(description = "") + private Long planner; + /** + * 班组成员 + */ + @Schema(description = "") + private String teamMember; + /** + * 特殊日分派时间 + */ + @Schema(description = "") + private String specDayPutDueTime; + /** + * 轮换时间 + */ + @Schema(description = "") + private String exChangeTime; + /** + * 类型-[1]针孔;[2]-壳体;[3]烧结;[4]:园区;[5]:外协; + */ + @Schema(description = "类型-[1]针孔;[2]-壳体;[3]烧结;[4]:园区;[5]:外协;") + private Short tsType; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/RelTeamSetUserVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/RelTeamSetUserVO.java new file mode 100644 index 00000000..2d383f50 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/RelTeamSetUserVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.RelTeamSetUser; + +import java.io.Serial; + +/** + * [班组用户关联] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class RelTeamSetUserVO extends RelTeamSetUser { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/TeamSetVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/TeamSetVO.java index 89a1c090..d7a751ad 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/TeamSetVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/TeamSetVO.java @@ -3,6 +3,7 @@ */ package org.springblade.desk.basic.pojo.vo; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.desk.basic.pojo.entity.TeamSet; @@ -18,7 +19,21 @@ import java.io.Serial; @Data @EqualsAndHashCode(callSuper = true) public class TeamSetVO extends TeamSet { - @Serial - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; + @Schema(description = "班组长[用户]真名") + private String teamLeaderRealName; + + @Schema(description = "计划员[用户]真名") + private Long plannerRealName; + + @Schema(description = "调度员[用户]真名") + private Long dispatcherRealName; + + @Schema(description = "[班次]名称") + private String shiftsName; + + @Schema(description = "类型分类") + private String tsTypeName; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/UrlVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/UrlVO.java new file mode 100644 index 00000000..61f09411 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/UrlVO.java @@ -0,0 +1,15 @@ +package org.springblade.desk.basic.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode() +public class UrlVO { + + public UrlVO(String url) { + this.url = url; + } + + private String url = ""; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java index c362d0e7..f8b745e2 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java @@ -68,6 +68,10 @@ public class IotHardness extends BaseEntity { * [设备]id */ public static final String COL_EQUIPMENT_ID = "EQUIPMENT_ID"; + /** + * IP + */ + public static final String COL_IP = "IP"; /** * 编码 @@ -118,5 +122,10 @@ public class IotHardness extends BaseEntity { * [设备]id */ @Schema(description = "[设备]id") - private BigDecimal equipmentId; + private Long equipmentId; + /** + * [设备]id + */ + @Schema(description = "ip") + private String ip; } 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 79725ec0..000e55cd 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 @@ -125,7 +125,7 @@ public class ReviewSheet extends BaseEntity { */ public static final String COL_REVIEW_STATUS = "REVIEW_STATUS"; /** - * 业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理返修;[4]:ERP审理报废; + * 业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理; */ public static final String COL_BIZ_TYPE = "BIZ_TYPE"; /** @@ -229,7 +229,7 @@ public class ReviewSheet extends BaseEntity { * 不合格数量 */ @Schema(description = "不合格数量") - private Short unqualifiedQty; + private Double unqualifiedQty; /** * 上级编号 */ @@ -304,7 +304,7 @@ public class ReviewSheet extends BaseEntity { * 业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理; */ @Schema(description = "业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理;") - private Short bizType; + private Integer bizType; /** * 物料号 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetErpSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetErpSearch.java new file mode 100644 index 00000000..690143ad --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetErpSearch.java @@ -0,0 +1,13 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * todo: + */ +@Data +@EqualsAndHashCode() +public class ReviewSheetErpSearch { + +} 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 new file mode 100644 index 00000000..01d2d5de --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java @@ -0,0 +1,14 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; + +/** + * todo: + */ +@Data +@EqualsAndHashCode(callSuper = false) +public class ReviewSheetInitSearch extends ReviewSheet { + +} 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 new file mode 100644 index 00000000..fe97ee2e --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoSearch.java @@ -0,0 +1,13 @@ +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 new file mode 100644 index 00000000..9edae34d --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetScrapSearch.java @@ -0,0 +1,13 @@ +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 new file mode 100644 index 00000000..5e937b2c --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java @@ -0,0 +1,13 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * todo: + */ +@Data +@EqualsAndHashCode() +public class ReviewSheetSelfSearch { + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionItemVO.java index f20a25aa..7dea2621 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionItemVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionItemVO.java @@ -3,6 +3,7 @@ */ 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.InspectionItem; @@ -21,4 +22,6 @@ public class InspectionItemVO extends InspectionItem { @Serial private static final long serialVersionUID = 1L; + @Schema(description = "检验类型 名称") + private String itemTypeName = "检验类型A"; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java index 3adf5db3..ac62b12b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java @@ -3,6 +3,7 @@ */ 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.InspectionTask; @@ -27,6 +28,12 @@ public class InspectionTaskDetailVO extends InspectionTask { @Serial private static final long serialVersionUID = 1L; + /** + * todo: + */ + @Schema(description = "工序名称") + private String processName = "工序名称A"; + private InspectionTaskListVO orderInfo; private List remindMsgList; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java index 59c82e74..20f2164b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java @@ -3,6 +3,7 @@ */ 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; @@ -56,10 +57,14 @@ public class InspectionTaskListVO extends InspectionTask { private String batchNo = "XXXX12345"; @Schema(description = "分批号") private String poBatchNo = "XXXX12345"; - @Schema(description = "当前工序") + @Schema(description = "当前[工序]名称") private String currentProcessName = "XXXX12345"; - @Schema(description = "下个工序") + @Schema(description = "当前[工序]id") + private Long currentProcessId = 100L; + @Schema(description = "下个[工序]名称") private String nextProcessName = "XXXX12345"; + @Schema(description = "下个[工序]id") + private Long nextProcessId = 100L; @Schema(description = "面积") private Double area = 100.10; @Schema(description = "总面积") @@ -69,6 +74,7 @@ public class InspectionTaskListVO extends InspectionTask { @Schema(description = "接收时间") private LocalDateTime receiveDate = LocalDateTime.now(); + @Schema(description = "订单-产品号") private String prodCode = "XXXX12345"; @Schema(description = "订单-产品型号") @@ -95,4 +101,10 @@ public class InspectionTaskListVO extends InspectionTask { private String remark; @Schema(description = "订单-提醒内容") private String remindContent; + // todo: + @Schema(description = "同槽编号/同炉编号") + private String sameNo = "tank-1001"; + // todo: + @Schema(description = "材料") + private String material = "铜"; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskSubPartVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskSubPartVO.java new file mode 100644 index 00000000..e0b3feaf --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskSubPartVO.java @@ -0,0 +1,38 @@ +package org.springblade.desk.quality.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode() +public class InspectionTaskSubPartVO { + + // todo: + @Schema(description = "子件号") + private String subPartCode = "SU11"; + @Schema(description = "子件名称") + private String subPartName = "XS"; + @Schema(description = "数量") + private Double qty = 100d; + @Schema(description = "产品型号") + private String prodTypeName = "iw100"; + @Schema(description = "子件类型") + private String subPartTypeName = "subX1"; + @Schema(description = "镀种") + private String plateName = "镀金"; + @Schema(description = "材料") + private String material = "Au"; + @Schema(description = "面积") + private Double area = 100d; + @Schema(description = "总面积") + private Double totalArea = 100d; + @Schema(description = "镀层代码") + private String matCode = "mat100"; + @Schema(description = "镀层厚度") + private Long thickness = 10L; + @Schema(description = "备注") + private String remark = ""; + @Schema(description = "修改人") + private String updateUserRealName = ""; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java index d7363081..c683498b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java @@ -3,6 +3,7 @@ */ 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.ReviewFault; @@ -21,4 +22,10 @@ public class ReviewFaultVO extends ReviewFault { @Serial private static final long serialVersionUID = 1L; + @Schema(description = "故障类别[缺陷]名称") + private String ngType2Name; + @Schema(description = "问题大类[缺陷]名称") + private String ngType3Name; + @Schema(description = "问题小类[缺陷]名称") + private String ngType4Name; } 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/ReviewSheetErpListVO.java new file mode 100644 index 00000000..f09e0ecd --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetErpListVO.java @@ -0,0 +1,35 @@ +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 ReviewSheetErpListVO 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 dutyPart; + @Schema(description = "责任批号") + private String dutyBatNo; + @Schema(description = "工序号") + private String processNo; + @Schema(description = "工序名称") + private String processName; + @Schema(description = "发生单位") + private String ngOrg; + @Schema(description = "责任部门") + private String dutyDeptName; + @Schema(description = "零件号") + private String partCode; +} 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/ReviewSheetInitListVO.java new file mode 100644 index 00000000..cea01d6b --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitListVO.java @@ -0,0 +1,41 @@ +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 ReviewSheetInitListVO extends ReviewSheet { + + @Schema(description = "BaseEntityVO") + private BaseEntityVO base; + @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 Double poQty; + @Schema(description = "[生产处置单]模式 名称") + private String reviewOrderModeName; + @Schema(description = "打回[用户]真名") + private String backUserRealName; + @Schema(description = "审理状态 名称") + private String reviewStatusName; + @Schema(description = "审理[用户]真名") + private String reviewUserRealName; +} 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 new file mode 100644 index 00000000..873d7cca --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoListVO.java @@ -0,0 +1,24 @@ +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/ReviewSheetScrapListVO.java new file mode 100644 index 00000000..c4c03cc9 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetScrapListVO.java @@ -0,0 +1,29 @@ +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 ReviewSheetScrapListVO 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; + @Schema(description = "供应商代码") + private String oemCode; + @Schema(description = "供应商名称") + private String oemName; + @Schema(description = "镀前价格") + private String priceBeforePlate; +} 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/ReviewSheetSelfListVO.java new file mode 100644 index 00000000..2d3f9897 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetSelfListVO.java @@ -0,0 +1,41 @@ +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 ReviewSheetSelfListVO extends ReviewSheet { + + @Schema(description = "BaseEntityVO") + private BaseEntityVO base; + @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 Double poQty; + @Schema(description = "[生产处置单]模式 名称") + private String reviewOrderModeName; + @Schema(description = "打回[用户]真名") + private String backUserRealName; + @Schema(description = "审理状态 名称") + private String reviewStatusName; + @Schema(description = "审理[用户]真名") + private String reviewUserRealName; +} 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 index 88dd23bd..fffafd94 100644 --- 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 @@ -3,6 +3,7 @@ */ 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; @@ -11,7 +12,7 @@ import java.io.Serial; import java.util.List; /** - * [生产处置单] 视图实体类 + * [生产处置单] 视图实体类 detail详情 * * @author Tom Shuo * @since 2026-01-06 @@ -22,13 +23,12 @@ 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; - - private String dutyDeleteIds; - - private List faultList; - - private String faultDeleteIds; - - private Integer submitErpType; + @Schema(description = "责任零件删除ids") + private String dutyDeleteIds = ""; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java index bd161524..0c1635dc 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java @@ -3,6 +3,7 @@ */ 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.WorkPlanItemDetail; @@ -18,7 +19,9 @@ import java.io.Serial; @Data @EqualsAndHashCode(callSuper = true) public class WorkPlanItemDetailVO extends WorkPlanItemDetail { - @Serial - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; + @Schema(description = "[量具]名称") + private String mtName = "标尺1"; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java index 05732ce1..6d07bd7c 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java @@ -3,6 +3,7 @@ */ 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.InspectionItem; @@ -25,9 +26,14 @@ public class WorkPlanItemVO extends WorkPlanItem { @Serial private static final long serialVersionUID = 1L; + @Schema(description = "检验员 真名") + private String checkUserRealName; + @Schema(description = "检验项目 Obj") private InspectionItemVO item; - + @Schema(description = "检验标准 Obj") private StandardVO standard; - +// @Schema(description = "工序对象 Obj") +// private DsProcessEntity process; + @Schema(description = "wp详情 List") private List wpItemDetailList; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.java new file mode 100644 index 00000000..5028a850 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.java @@ -0,0 +1,237 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.excel.RelTeamSetUserExcel; +import org.springblade.desk.basic.pojo.entity.RelTeamSetUser; +import org.springblade.desk.basic.pojo.vo.RelTeamSetUserVO; +import org.springblade.desk.basic.service.IRelTeamSetUserService; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.RelTeamSetUserWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [班组用户关联] 控制器 + * + * @author Tom Shuo + * @since 2026-01-13 + */ +@RestController +@RequestMapping("/RelTeamSetUser") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[班组用户关联]", description = "[班组用户关联]接口") +public class RelTeamSetUserController extends BladeController { + + @Resource + private IRelTeamSetUserService service; + + /** + * [班组用户关联] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入RelTeamSetUser Obj") + public R detail(RelTeamSetUser relTeamSetUser) { + QueryWrapper qw = Condition.getQueryWrapper(relTeamSetUser); + RelTeamSetUser detail = service.getOne(qw); + RelTeamSetUserVO detailVO = RelTeamSetUserWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [班组用户关联] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入RelTeamSetUser Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map relTeamSetUser, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(relTeamSetUser, RelTeamSetUser.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = RelTeamSetUserWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [班组用户关联] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入RelTeamSetUser Obj") + public R> page(RelTeamSetUserVO relTeamSetUser, Query query) { + IPage pagesVO = service.selectRelTeamSetUserPage( + Condition.getPage(query), relTeamSetUser + ); + return R.data(pagesVO); + } + + /** + * [班组用户关联] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = RelTeamSetUserWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [班组用户关联] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入RelTeamSetUser Obj") + public R save(@Valid @RequestBody RelTeamSetUser addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [班组用户关联] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入RelTeamSetUser List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [班组用户关联] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入RelTeamSetUser Obj") + public R update(@Valid @RequestBody RelTeamSetUser updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [班组用户关联] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入RelTeamSetUser List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [班组用户关联] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入RelTeamSetUser Obj") + public R submit(@Valid @RequestBody RelTeamSetUser mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [班组用户关联] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入RelTeamSetUser List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [班组用户关联] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [班组用户关联] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入RelTeamSetUser") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map relTeamSetUser, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(relTeamSetUser, RelTeamSetUser.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(RelTeamSetUser::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(RelTeamSetUserEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportRelTeamSetUser(qw); + ExcelUtil.export(response, "[班组用户关联]数据" + DateUtil.time(), + "[班组用户关联]数据表", list, RelTeamSetUserExcel.class); + } + + /** + * [班组用户关联] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [班组用户关联] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, RelTeamSetUser.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java index f9cef1c9..ecf254cb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java @@ -127,6 +127,19 @@ public class TeamSetController extends BladeController { return R.data(listVO); } + /** + * [班组] getOneByUserId + */ + @GetMapping("/getOneByUserId") + @ApiOperationSupport(order = 23) + @Operation(summary = "getOneByUserId", description = "") + public R getOneByUserId( + @Parameter(description = "用户id", required = true) @RequestParam Long userId) { + TeamSet one = service.getOneByUserId(userId); + TeamSetVO vo = TeamSetWrapper.build().entityVO(one); + return R.data(vo); + } + /** * [班组] 新增一条 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/RelTeamSetUserExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/RelTeamSetUserExcel.java new file mode 100644 index 00000000..0a887a27 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/RelTeamSetUserExcel.java @@ -0,0 +1,45 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * [班组用户关联] Excel实体类 + * + * @author Tom Shuo + * @since 2026-01-13 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class RelTeamSetUserExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [班组]id + */ + @ColumnWidth(20) + @ExcelProperty("[班组]id") + private BigDecimal teamSetId; + /** + * [用户]id + */ + @ColumnWidth(20) + @ExcelProperty("[用户]id") + private BigDecimal userId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/RelTeamSetUserMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/RelTeamSetUserMapper.java new file mode 100644 index 00000000..7c09c37b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/RelTeamSetUserMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.basic.excel.RelTeamSetUserExcel; +import org.springblade.desk.basic.pojo.entity.RelTeamSetUser; +import org.springblade.desk.basic.pojo.vo.RelTeamSetUserVO; + +import java.util.List; + +/** + * [班组用户关联] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-13 + */ +public interface RelTeamSetUserMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param relTeamSetUser 查询参数 + * @return List + */ + List selectRelTeamSetUserPage(IPage page, RelTeamSetUserVO relTeamSetUser); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportRelTeamSetUser(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/RelTeamSetUserMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/RelTeamSetUserMapper.xml new file mode 100644 index 00000000..9260a026 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/RelTeamSetUserMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IRelTeamSetUserService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IRelTeamSetUserService.java new file mode 100644 index 00000000..c4b75bf6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IRelTeamSetUserService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.RelTeamSetUserExcel; +import org.springblade.desk.basic.pojo.entity.RelTeamSetUser; +import org.springblade.desk.basic.pojo.vo.RelTeamSetUserVO; + +import java.util.List; + +/** + * [班组用户关联] 服务类 + * + * @author Tom Shuo + * @since 2026-01-13 + */ +public interface IRelTeamSetUserService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param relTeamSetUser 查询参数 + * @return IPage + */ + IPage selectRelTeamSetUserPage(IPage page, RelTeamSetUserVO relTeamSetUser); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportRelTeamSetUser(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(RelTeamSetUserVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ITeamSetService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ITeamSetService.java index c6c9d48f..853de900 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ITeamSetService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ITeamSetService.java @@ -6,9 +6,11 @@ package org.springblade.desk.basic.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; +import org.springblade.core.tool.api.R; import org.springblade.desk.basic.excel.TeamSetExcel; import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.pojo.vo.TeamSetVO; +import org.springblade.system.pojo.entity.User; import java.util.List; @@ -19,20 +21,76 @@ import java.util.List; * @since 2025-12-16 */ public interface ITeamSetService extends BaseService { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param teamSet 查询参数 - * @return IPage - */ - IPage selectTeamSetPage(IPage page, TeamSetVO teamSet); - - /** - * 导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportTeamSet(Wrapper queryWrapper); + /** + * 自定义分页 + * + * @param page 分页参数 + * @param teamSet 查询参数 + * @return IPage + */ + IPage selectTeamSetPage(IPage page, TeamSetVO teamSet); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportTeamSet(Wrapper queryWrapper); + + /** + * + * @param id [班组]id + * @return 用户 list + */ + List listUserByTeamId(Long id); + + /** + * + * @param userId [用户]id + * @return 用户所在班组 list + */ + List listByUserId(Long userId); + + /** + * + * @param userId [用户]id + * @return 用户所在班组 + */ + TeamSet getOneByUserId(Long userId); + + /** + * 设置 班组成员 + * + * @param ids + * @return + */ + R setUsers(String ids); + + /** + * 设置 日分派时间 + * + * @param id + * @param dayPutDueTime + * @return + */ + R setDayPutDueTime(Long id, String dayPutDueTime); + + /** + * 设置 特殊日分派时间 + * + * @param id + * @param specDayPutDueTime + * @return + */ + R setSpecDayPutDueTime(Long id, String specDayPutDueTime); + + /** + * 设置 轮换时间 + * + * @param id + * @param exChangeTime + * @return + */ + R setExChangeTime(Long id, String exChangeTime); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/RelTeamSetUserServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/RelTeamSetUserServiceImpl.java new file mode 100644 index 00000000..2fb90dde --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/RelTeamSetUserServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.RelTeamSetUserExcel; +import org.springblade.desk.basic.mapper.RelTeamSetUserMapper; +import org.springblade.desk.basic.pojo.entity.RelTeamSetUser; +import org.springblade.desk.basic.pojo.vo.RelTeamSetUserVO; +import org.springblade.desk.basic.service.IRelTeamSetUserService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [班组用户关联] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-13 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class RelTeamSetUserServiceImpl extends BaseServiceImpl implements IRelTeamSetUserService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectRelTeamSetUserPage(IPage page, RelTeamSetUserVO relTeamSetUser) { + return page.setRecords(baseMapper.selectRelTeamSetUserPage(page, relTeamSetUser)); + } + + @Override + public List exportRelTeamSetUser(Wrapper queryWrapper) { + List relTeamSetUserList = baseMapper.exportRelTeamSetUser(queryWrapper); + //relTeamSetUserList.forEach(relTeamSetUser -> { + // relTeamSetUser.setTypeName(DictCache.getValue(DictEnum.YES_NO, RelTeamSetUser.getType())); + //}); + return relTeamSetUserList; + } + + @Override + public void setVOValue(RelTeamSetUserVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/TeamSetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/TeamSetServiceImpl.java index cbcc53f0..3f6738f3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/TeamSetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/TeamSetServiceImpl.java @@ -4,18 +4,30 @@ package org.springblade.desk.basic.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.excel.TeamSetExcel; import org.springblade.desk.basic.mapper.TeamSetMapper; +import org.springblade.desk.basic.pojo.entity.RelTeamSetUser; import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.pojo.vo.TeamSetVO; +import org.springblade.desk.basic.service.IRelTeamSetUserService; import org.springblade.desk.basic.service.ITeamSetService; +import org.springblade.desk.order.pojo.entity.YieldPlan; +import org.springblade.system.pojo.entity.User; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -30,17 +42,69 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class TeamSetServiceImpl extends BaseServiceImpl implements ITeamSetService { - @Override - public IPage selectTeamSetPage(IPage page, TeamSetVO teamSet) { - return page.setRecords(baseMapper.selectTeamSetPage(page, teamSet)); - } - - @Override - public List exportTeamSet(Wrapper queryWrapper) { - List teamSetList = baseMapper.exportTeamSet(queryWrapper); - //teamSetList.forEach(teamSet -> { - // teamSet.setTypeName(DictCache.getValue(DictEnum.YES_NO, TeamSet.getType())); - //}); - return teamSetList; - } + @Resource + private IRelTeamSetUserService relTeamSetUserService; + + @Override + public IPage selectTeamSetPage(IPage page, TeamSetVO teamSet) { + return page.setRecords(baseMapper.selectTeamSetPage(page, teamSet)); + } + + @Override + public List exportTeamSet(Wrapper queryWrapper) { + List teamSetList = baseMapper.exportTeamSet(queryWrapper); + //teamSetList.forEach(teamSet -> { + // teamSet.setTypeName(DictCache.getValue(DictEnum.YES_NO, TeamSet.getType())); + //}); + return teamSetList; + } + + @Override + public List listUserByTeamId(Long teamId) { + return List.of(); + } + + @Override + public List listByUserId(Long userId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(RelTeamSetUser.class) + .ne(RelTeamSetUser::getUserId, userId); + List rList = relTeamSetUserService.list(qw); + List tsList = new ArrayList<>(); + for (RelTeamSetUser rel : rList) { + TeamSet ts = getById(rel.getTeamSetId()); + tsList.add(ts); + } + return tsList; + } + + @Override + public TeamSet getOneByUserId(Long userId) { + return listByUserId(userId).get(0); + } + + @Override + public R setUsers(String ids) { + return null; + } + + @Override + public R setDayPutDueTime(Long id, String dayPutDueTime) { + TeamSet f = getById(id); + f.setDayPutDueTime(dayPutDueTime); + return R.status(updateById(f)); + } + + @Override + public R setSpecDayPutDueTime(Long id, String specDayPutDueTime) { + TeamSet f = getById(id); + f.setSpecDayPutDueTime(specDayPutDueTime); + return R.status(updateById(f)); + } + + @Override + public R setExChangeTime(Long id, String exChangeTime) { + TeamSet f = getById(id); + f.setExChangeTime(exChangeTime); + return R.status(updateById(f)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/RelTeamSetUserWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/RelTeamSetUserWrapper.java new file mode 100644 index 00000000..eefb79c2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/RelTeamSetUserWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.RelTeamSetUser; +import org.springblade.desk.basic.pojo.vo.RelTeamSetUserVO; + +import java.util.Objects; + +/** + * [班组用户关联] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-13 + */ +public class RelTeamSetUserWrapper extends BaseEntityWrapper { + + public static RelTeamSetUserWrapper build() { + return new RelTeamSetUserWrapper(); + } + + @Override + public RelTeamSetUserVO entityVO(RelTeamSetUser relTeamSetUser) { + RelTeamSetUserVO VO = Objects.requireNonNull(BeanUtil.copyProperties(relTeamSetUser, RelTeamSetUserVO.class)); + + //User createUser = UserCache.getUser(relTeamSetUser.getCreateUser()); + //User updateUser = UserCache.getUser(relTeamSetUser.getUpdateUser()); + //relTeamSetUserVO.setCreateUserName(createUser.getName()); + //relTeamSetUserVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} 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 c7b5d25b..ce9aa18a 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,22 +5,62 @@ package org.springblade.desk.quality.constant; */ public interface ReviewSheetConst { - /** - * 新建 - */ - Integer S_NEW = 1; - /** - * 打回 - */ - Integer S_REPULSE = 3; - /** - * 审理中 - */ - Integer S_HEAR = 6; - /** - * 审理完成 - */ - Integer S_COMPLETE = 10; + Integer S_INIT = 0; + + // [1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理; + interface BizType { + Integer T_1 = 1; + Integer T_2 = 2; + Integer T_3 = 3; + } + + interface ERP { + /** + * 新建 + */ + Integer S_NEW = 1; + /** + * 打回 + */ + Integer S_REPULSE = 3; + /** + * 审理中 + */ + Integer S_HEAR = 6; + /** + * 审理完成 + */ + Integer S_COMPLETE = 10; + + /** + * 让步接收 + */ + Integer REVIEW_STATUS_3 = 3; + /** + * 返工 + */ + Integer REVIEW_STATUS_4 = 4; + /** + * 返修 + */ + Integer REVIEW_STATUS_5 = 5; + /** + * 报废 + */ + Integer REVIEW_STATUS_6 = 6; + /** + * 挑出报废 + */ + Integer REVIEW_STATUS_7 = 7; + /** + * 退库更换 + */ + Integer REVIEW_STATUS_8 = 8; + /** + * 退回 + */ + Integer REVIEW_STATUS_15 = 15; + } /** @@ -35,34 +75,4 @@ public interface ReviewSheetConst { * 售后模式 */ Integer MODE_AFTER_SALES = 3; - - - /** - * 让步接收 - */ - Integer REVIEW_STATUS_3 = 3; - /** - * 返工 - */ - Integer REVIEW_STATUS_4 = 4; - /** - * 返修 - */ - Integer REVIEW_STATUS_5 = 5; - /** - * 报废 - */ - Integer REVIEW_STATUS_6 = 6; - /** - * 挑出报废 - */ - Integer REVIEW_STATUS_7 = 7; - /** - * 退库更换 - */ - Integer REVIEW_STATUS_8 = 8; - /** - * 退回 - */ - Integer REVIEW_STATUS_15 = 15; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index 323f6203..0a1ca980 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -22,6 +22,7 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.pojo.vo.UrlVO; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; @@ -29,11 +30,14 @@ import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew; import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskSubPartVO; import org.springblade.desk.quality.service.IInspectionTaskService; import org.springblade.desk.quality.service.InspectionTaskService2; import org.springblade.desk.quality.wrapper.InspectionTaskDetailWrapper; import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.view.RedirectView; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -169,23 +173,55 @@ public class InspectionTaskController extends BladeController { return service.fill(taskDetailVO); } + /** + * [检验任务] 查询同槽/同炉 + */ + @GetMapping("/getSameList") + @ApiOperationSupport(order = 7) + @Operation(summary = "查询同槽/同炉", description = "id") + public R getSameList(@Parameter(description = "主键", required = true) @RequestParam Long id) { + return service.getSamePlace(id); + } + /** * [检验任务] 同槽 检验结果应用 */ - @GetMapping("/sameTankResultCopy") + @GetMapping("/sameResultCopy") @ApiOperationSupport(order = 101) - @Operation(summary = "同槽结果应用", description = "传入inspectionTask id") - public R sameTankResultCopy(@Parameter(hidden = true) @RequestParam Long id) { - return null; + @Operation(summary = "同槽/同炉结果应用", description = "传入inspectionTask id") + public R sameResultCopy(@Parameter(hidden = true) @RequestParam Long sourceId, + @Parameter(hidden = true) @RequestParam Long targetId) { + return service.sameResultCopy(sourceId, targetId); } /** - * [检验任务] 同炉 检验结果应用 + * 工序名称为 【烧结包装防护】页面展示内容 + * [检验任务] 特殊 子件列表 */ - @GetMapping("/sameFurnaceResultCopy") - @ApiOperationSupport(order = 102) - @Operation(summary = "同槽结果应用", description = "传入inspectionTask id") - public R sameFurnaceResultCopy(@Parameter(hidden = true) @RequestParam Long id) { - return null; + @GetMapping("/subPartList") + @ApiOperationSupport(order = 101) + @Operation(summary = "烧结包装防护-子件列表", description = "传入inspectionTask id") + public R subPartList(@Parameter(hidden = true) @RequestParam Long id) { + // todo: 车间订单关联查询 + List list = new ArrayList<>(); + list.add(new InspectionTaskSubPartVO()); + list.add(new InspectionTaskSubPartVO()); + return R.data(list); + } + + @GetMapping("/toQaRecord") + @ApiOperationSupport(order = 101) + @Operation(summary = "跳转-质量记录", description = "传入inspectionTask id") + public R toQaRecord(@Parameter(hidden = true) @RequestParam Long id) { + String url = "https://www.baidu.com" + "?id=" + id; + return R.data(new UrlVO(url)); + } + + @GetMapping("/toCertificate") + @ApiOperationSupport(order = 101) + @Operation(summary = "跳转-合格证", description = "传入inspectionTask id") + public R toCertificate(@Parameter(hidden = true) @RequestParam Long id) { + String url = "https://www.baidu.com" + "?id=" + id; + return R.data(new UrlVO(url)); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java index 50e4d17a..fb67c29c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java @@ -10,6 +10,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import lombok.AllArgsConstructor; @@ -21,6 +22,7 @@ import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; @@ -31,6 +33,8 @@ import org.springblade.desk.quality.pojo.entity.IotHardness; import org.springblade.desk.quality.pojo.vo.IotHardnessVO; import org.springblade.desk.quality.service.IIotHardnessService; import org.springblade.desk.quality.wrapper.IotHardnessWrapper; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.pojo.entity.UserInfo; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -55,184 +59,228 @@ import java.util.stream.Collectors; public class IotHardnessController extends BladeController { @Resource - private IIotHardnessService service; - - /** - * [IOT硬度] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入IotHardness Obj") - public R detail(IotHardness iotHardness) { - QueryWrapper qw = Condition.getQueryWrapper(iotHardness); - IotHardness detail = service.getOne(qw); - IotHardnessVO detailVO = IotHardnessWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [IOT硬度] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入IotHardness Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map iotHardness, - Query query) { + private IIotHardnessService service; + + @Resource + private IUserClient iUserClient; + + /** + * [IOT硬度] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入IotHardness Obj") + public R detail(IotHardness iotHardness) { + QueryWrapper qw = Condition.getQueryWrapper(iotHardness); + IotHardness detail = service.getOne(qw); + IotHardnessVO detailVO = IotHardnessWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [IOT硬度] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入IotHardness Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map iotHardness, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(iotHardness, IotHardness.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = IotHardnessWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [IOT硬度] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入IotHardness Obj") - public R> page(IotHardnessVO iotHardness, Query query) { - IPage pagesVO = service.selectIotHardnessPage( - Condition.getPage(query), iotHardness - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = IotHardnessWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + @GetMapping("/getDataFirst") + @ApiOperationSupport(order = 20) + @Operation(summary = "获取硬度检测值 getData", description = "传入IotHardness Obj") + public R> getDataFirst(HttpServletRequest request, + @Parameter(hidden = true) @RequestParam Map map) { + // 根据ip关联查询 + + // todo: + +// BladeUser loginUser = AuthUtil.getUser(); +// Long userId = loginUser.getUserId(); +// R rUI = iUserClient.userInfo(userId); +// if (rUI.isSuccess() && rUI.getData() != null) { +// +// } + QueryWrapper qw = Condition.getQueryWrapper(map, IotHardness.class); + List list = service.list(qw); + return R.data(list); + } + + @GetMapping("/getDataRefresh") + @ApiOperationSupport(order = 20) + @Operation(summary = "获取硬度检测值 getData", description = "传入IotHardness Obj") + public R> getDataRefresh(HttpServletRequest request, + @Parameter(hidden = true) @RequestParam Map map) { + // 根据ip关联查询 + + // todo: + +// BladeUser loginUser = AuthUtil.getUser(); +// Long userId = loginUser.getUserId(); +// R rUI = iUserClient.userInfo(userId); +// if (rUI.isSuccess() && rUI.getData() != null) { +// +// } + QueryWrapper qw = Condition.getQueryWrapper(map, IotHardness.class); + List list = service.list(qw); + return R.data(list); + } + + + /** + * [IOT硬度] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入IotHardness Obj") + public R> page(IotHardnessVO iotHardness, Query query) { + IPage pagesVO = service.selectIotHardnessPage( + Condition.getPage(query), iotHardness + ); + return R.data(pagesVO); + } + + /** * [IOT硬度] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = IotHardnessWrapper.build().listVO(list); - return R.data(listVO); - } - - /** - * [IOT硬度] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入IotHardness Obj") - public R save(@Valid @RequestBody IotHardness addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + List list = service.list(); + List listVO = IotHardnessWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [IOT硬度] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入IotHardness Obj") + public R save(@Valid @RequestBody IotHardness addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** * [IOT硬度] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入IotHardness List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [IOT硬度] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入IotHardness Obj") - public R update(@Valid @RequestBody IotHardness updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入IotHardness List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [IOT硬度] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入IotHardness Obj") + public R update(@Valid @RequestBody IotHardness updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [IOT硬度] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入IotHardness List") + @Operation(summary = "修改批量", description = "传入IotHardness List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [IOT硬度] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入IotHardness Obj") - public R submit(@Valid @RequestBody IotHardness mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } + /** + * [IOT硬度] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入IotHardness Obj") + public R submit(@Valid @RequestBody IotHardness mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } - /** + /** * [IOT硬度] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入IotHardness List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [IOT硬度] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [IOT硬度] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入IotHardness") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map iotHardness, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(iotHardness, IotHardness.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(IotHardness::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(IotHardnessEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportIotHardness(qw); - ExcelUtil.export(response, "[IOT硬度]数据" + DateUtil.time(), - "[IOT硬度]数据表", list, IotHardnessExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入IotHardness List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [IOT硬度] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [IOT硬度] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入IotHardness") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map iotHardness, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(iotHardness, IotHardness.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(IotHardness::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(IotHardnessEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportIotHardness(qw); + ExcelUtil.export(response, "[IOT硬度]数据" + DateUtil.time(), + "[IOT硬度]数据表", list, IotHardnessExcel.class); + } + + /** * [IOT硬度] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [IOT硬度] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, IotHardness.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [IOT硬度] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, IotHardness.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java index a8958773..9b7a7a9c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java @@ -3,13 +3,16 @@ */ package org.springblade.desk.quality.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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.tags.Tag; import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import lombok.AllArgsConstructor; @@ -21,12 +24,15 @@ import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.IotThicknessExcel; +import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.entity.IotHardness; import org.springblade.desk.quality.pojo.entity.IotThickness; import org.springblade.desk.quality.pojo.vo.IotThicknessVO; import org.springblade.desk.quality.service.IIotThicknessService; @@ -55,184 +61,202 @@ import java.util.stream.Collectors; public class IotThicknessController extends BladeController { @Resource - private IIotThicknessService service; - - /** - * [IOT厚度] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入IotThickness Obj") - public R detail(IotThickness iotThickness) { - QueryWrapper qw = Condition.getQueryWrapper(iotThickness); - IotThickness detail = service.getOne(qw); - IotThicknessVO detailVO = IotThicknessWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [IOT厚度] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入IotThickness Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map iotThickness, - Query query) { + private IIotThicknessService service; + + /** + * [IOT厚度] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入IotThickness Obj") + public R detail(IotThickness iotThickness) { + QueryWrapper qw = Condition.getQueryWrapper(iotThickness); + IotThickness detail = service.getOne(qw); + IotThicknessVO detailVO = IotThicknessWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [IOT厚度] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入IotThickness Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map iotThickness, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(iotThickness, IotThickness.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = IotThicknessWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [IOT厚度] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入IotThickness Obj") - public R> page(IotThicknessVO iotThickness, Query query) { - IPage pagesVO = service.selectIotThicknessPage( - Condition.getPage(query), iotThickness - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = IotThicknessWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + @GetMapping("/getData") + @ApiOperationSupport(order = 20) + @Operation(summary = "获取厚度检测值 getData", description = "传入IotHardness Obj") + public R> getData(HttpServletRequest request, + @Parameter(hidden = true) @RequestParam Map map) { + // 根据ip关联查询 + +// BladeUser loginUser = AuthUtil.getUser(); +// Long userId = loginUser.getUserId(); +// R rUI = iUserClient.userInfo(userId); +// if (rUI.isSuccess() && rUI.getData() != null) { +// +// } + QueryWrapper qw = Condition.getQueryWrapper(map, IotThickness.class); + List list = service.list(qw); + return R.data(list); + } + + + /** + * [IOT厚度] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入IotThickness Obj") + public R> page(IotThicknessVO iotThickness, Query query) { + IPage pagesVO = service.selectIotThicknessPage( + Condition.getPage(query), iotThickness + ); + return R.data(pagesVO); + } + + /** * [IOT厚度] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = IotThicknessWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = IotThicknessWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [IOT厚度] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入IotThickness Obj") + public R save(@Valid @RequestBody IotThickness addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [IOT厚度] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入IotThickness Obj") - public R save(@Valid @RequestBody IotThickness addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [IOT厚度] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入IotThickness List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [IOT厚度] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入IotThickness Obj") - public R update(@Valid @RequestBody IotThickness updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入IotThickness List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [IOT厚度] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入IotThickness Obj") + public R update(@Valid @RequestBody IotThickness updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [IOT厚度] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入IotThickness List") + @Operation(summary = "修改批量", description = "传入IotThickness List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [IOT厚度] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入IotThickness Obj") - public R submit(@Valid @RequestBody IotThickness mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [IOT厚度] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入IotThickness Obj") + public R submit(@Valid @RequestBody IotThickness mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [IOT厚度] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入IotThickness List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [IOT厚度] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [IOT厚度] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入IotThickness") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map iotThickness, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(iotThickness, IotThickness.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(IotThickness::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(IotThicknessEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportIotThickness(qw); - ExcelUtil.export(response, "[IOT厚度]数据" + DateUtil.time(), - "[IOT厚度]数据表", list, IotThicknessExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入IotThickness List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [IOT厚度] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [IOT厚度] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入IotThickness") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map iotThickness, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(iotThickness, IotThickness.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(IotThickness::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(IotThicknessEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportIotThickness(qw); + ExcelUtil.export(response, "[IOT厚度]数据" + DateUtil.time(), + "[IOT厚度]数据表", list, IotThicknessExcel.class); + } + + /** * [IOT厚度] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [IOT厚度] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, IotThickness.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [IOT厚度] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, IotThickness.class + ); + return R.status(service.saveBatch(importList)); + } } 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 a85f811f..ac0f126b 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 @@ -28,22 +28,30 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.QAModuleConst; +import org.springblade.desk.quality.constant.ReviewSheetConst; import org.springblade.desk.quality.excel.ReviewSheetExcel; 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.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.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.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -87,12 +95,56 @@ public class ReviewSheetController extends BladeController { /** * [生产处置单] list分页 */ - @GetMapping("/list") +// @GetMapping("/list") +// @ApiOperationSupport(order = 20) +// @Operation(summary = "list分页", description = "传入ReviewSheet Obj") +// public R> list(@Parameter(hidden = true) @RequestParam Map reviewSheet, +// Query query) { +// QueryWrapper qw = Condition.getQueryWrapper(reviewSheet, ReviewSheet.class); +// IPage pages = service.page(Condition.getPage(query), qw); +// IPage pagesVO = ReviewSheetWrapper.build().pageVO(pages); +// pagesVO.getRecords() +// .stream() +// .peek(service::setVOValue) +// .collect(Collectors.toList()); +// return R.data(pagesVO); +// } + + /** + * + * + * [生产处置单] list分页 + */ + @PostMapping("/listInit") @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入ReviewSheet Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map reviewSheet, - Query query) { - QueryWrapper qw = Condition.getQueryWrapper(reviewSheet, ReviewSheet.class); + @Operation(summary = "生产处置单list分页", description = "传入ReviewSheet Obj") + public R> listInit(@Parameter(hidden = true) @RequestParam(required = false) + 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); + + // todo: +// pagesVO.getRecords() +// .stream() +// .peek(service::setVOValue) +// .collect(Collectors.toList()); + return R.data(pagesVO); + } + + /** + * [生产处置单] 返工审理list分页 + */ + @PostMapping("/listRedo") + @ApiOperationSupport(order = 20) + @Operation(summary = "返工审理list分页", description = "传入ReviewSheet Obj") + public R> listRedo(@Parameter(hidden = true) @RequestParam(required = false) + ReviewSheetRedoSearch search, Query query) { + Map demo = new HashMap(); + demo.put("bizType", ReviewSheetConst.BizType.T_1); + QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = ReviewSheetWrapper.build().pageVO(pages); pagesVO.getRecords() @@ -102,20 +154,78 @@ public class ReviewSheetController extends BladeController { 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) + .collect(Collectors.toList()); + return R.data(pagesVO); + } /** - * [生产处置单] page分页 + * [生产处置单] list分页 */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入ReviewSheet Obj") - public R> page(ReviewSheetVO reviewSheet, Query query) { - IPage pagesVO = service.selectReviewSheetPage( - Condition.getPage(query), reviewSheet - ); + @PostMapping("/listSelf") + @ApiOperationSupport(order = 20) + @Operation(summary = "内部list分页", description = "传入ReviewSheet Obj") + public R> listSelf(@Parameter(hidden = true) @RequestParam(required = false) + 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); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ReviewSheetWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); return R.data(pagesVO); } + /** + * [生产处置单] list分页 + */ + @PostMapping("/listErp") + @ApiOperationSupport(order = 20) + @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); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ReviewSheetWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + /** + * [生产处置单] page分页 + */ +// @GetMapping("/page") +// @ApiOperationSupport(order = 21) +// @Operation(summary = "page分页", description = "传入ReviewSheet Obj") +// public R> page(ReviewSheetVO reviewSheet, Query query) { +// IPage pagesVO = service.selectReviewSheetPage( +// Condition.getPage(query), reviewSheet +// ); +// return R.data(pagesVO); +// } + /** * [生产处置单] list下拉选择 */ @@ -290,4 +400,14 @@ public class ReviewSheetController extends BladeController { ); return R.status(service.saveBatch(importList)); } + + /** + * [生产处置单] 修改一条 + */ + @PostMapping("/fill") + @ApiOperationSupport(order = 40) + @Operation(summary = "fill", description = "ReviewSheetVO Obj") + public R fill(@Valid @RequestBody ReviewSheetVO vo) { + return service.fill(vo); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml index c482a35f..652be1f4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml @@ -90,6 +90,6 @@ AND task.FROM_TYPE = #{q.fromType} - ORDER BY ID DESC + ORDER BY task.ID DESC diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotHardnessMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotHardnessMapper.xml index 1f11d0dc..0449c836 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotHardnessMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotHardnessMapper.xml @@ -16,6 +16,7 @@ +