diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/constant/BaseValue.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/constant/BaseValue.java index 05091bda..20044dd4 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/constant/BaseValue.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/constant/BaseValue.java @@ -24,4 +24,12 @@ public interface BaseValue { * No */ Integer NO = 0; + /** + * 开 + */ + Integer ON = 1; + /** + * 关 + */ + Integer OFF = 0; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java index 52395772..82de38a7 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java @@ -18,7 +18,7 @@ import java.io.Serial; * @since 2025-12-16 */ @Data -@TableName("BA_WORK_CENTER") +@TableName("BS_WORK_CENTER") @Schema(description = "WorkCenter Entity对象") @EqualsAndHashCode(callSuper = true) public class WorkCenter extends BaseEntity { diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java index 94ebe27e..2e279f17 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java @@ -4,10 +4,13 @@ package org.springblade.desk.basic.pojo.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; +import org.springblade.desk.util.json.serializer.IdSerializer; +import org.springblade.desk.util.json.serializer.IntegerAllToStringSerializer; import java.io.Serial; @@ -23,80 +26,82 @@ import java.io.Serial; @EqualsAndHashCode(callSuper = true) public class WorkTank extends BaseEntity { - @Serial - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; - /** - * [作业槽]编码 - */ + /** + * [作业槽]编码 + */ public static final String COL_WORK_TANK_CODE = "WORK_TANK_CODE"; - /** - * [作业槽]类型 - */ + /** + * [作业槽]类型 + */ public static final String COL_WORK_TANK_TYPE = "WORK_TANK_TYPE"; - /** - * [作业槽]名称 - */ + /** + * [作业槽]名称 + */ public static final String COL_NAME = "NAME"; - /** - * 排序 - */ + /** + * 排序 + */ public static final String COL_SORT = "SORT"; - /** - * 备注 - */ + /** + * 备注 + */ public static final String COL_REMARK = "REMARK"; - /** - * 检测成分 - */ + /** + * 检测成分 + */ public static final String COL_TEST_ELEMENT = "TEST_ELEMENT"; - /** - * [作业中心]id - */ + /** + * [作业中心]id + */ public static final String COL_WORKSTATION_ID = "WORKSTATION_ID"; - /** - * 操作[用户]id - */ + /** + * 操作[用户]id + */ public static final String COL_OP_USER_ID = "OP_USER_ID"; - /** - * [作业槽]编码 - */ - @Schema(description = "[作业槽]编码") - private String workTankCode; - /** - * [作业槽]类型 - */ - @Schema(description = "[作业槽]类型") - private Long workTankType; - /** - * [作业槽]名称 - */ - @Schema(description = "[作业槽]名称") - private String name; - /** - * 排序 - */ - @Schema(description = "排序") - private Long sort; - /** - * 备注 - */ - @Schema(description = "备注") - private String remark; - /** - * 检测成分 - */ - @Schema(description = "检测成分") - private String testElement; - /** - * [作业中心]id - */ - @Schema(description = "[作业中心]id") - private Long workstationId; - /** - * 操作[用户]id - */ - @Schema(description = "操作[用户]id") - private Long opUserId; + /** + * [作业槽]编码 + */ + @Schema(description = "[作业槽]编码") + private String workTankCode; + /** + * [作业槽]类型 + */ + @Schema(description = "[作业槽]类型") + private Long workTankType; + /** + * [作业槽]名称 + */ + @Schema(description = "[作业槽]名称") + private String name; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 检测成分 + */ + @Schema(description = "检测成分") + private String testElement; + /** + * [作业中心]id + */ + @JsonSerialize(using = IdSerializer.class) + @Schema(description = "[作业中心]id") + private Long workstationId; + /** + * 操作[用户]id + */ + @JsonSerialize(using = IdSerializer.class) + @Schema(description = "操作[用户]id") + private Long opUserId; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartToolVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartToolVO.java new file mode 100644 index 00000000..67099188 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsPartToolVO.java @@ -0,0 +1,34 @@ +package org.springblade.desk.dashboard.pojo.vo; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 零件加工所需工装信息表 视图实体类 + * + * @author BladeX + * @since 2025-11-12 + */ +@Data +public class DsPartToolVO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 名称 + */ + private String name; + + /** + * 编码 + */ + private String code; + + /** + * 备注 + */ + private String memo; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java index 87a2ed98..5d4de997 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java @@ -24,6 +24,59 @@ public class YieldOrder extends BaseEntity { @TableField(exist = false) private static final long serialVersionUID = 1L; + /** + * 待接收 + */ + public static Integer CUR_STATUS_NORMAL = 0; + /** + * 大仓已接 + */ + public static Integer CUR_STATUS_STORAGE = 1; + /** + * 已派工 + */ + public static Integer CUR_STATUS_DISPATCHED = 2; + /** + * 已出库 + */ + public static Integer CUR_STATUS_OUT = 3; + /** + * 加工中 + */ + public static Integer CUR_STATUS_PROCESSING = 5; + /** + * 已完工 + */ + public static Integer CUR_STATUS_COMPLETED = 15; + /** + * 已关闭 + */ + public static Integer CUR_STATUS_VOIDED = 21; + /** + * 热表订单 + */ + public static Integer YIELD_TYPE_1 = 1; + /** + * 烧结订单 + */ + public static Integer YIELD_TYPE_2 = 2; + /** + * 玻璃饼 + */ + public static Integer YIELD_TYPE_3 = 3; + /** + * 壳体 + */ + public static Integer YIELD_TYPE_4 = 4; + /** + * 插针 + */ + public static Integer YIELD_TYPE_5 = 5; + /** + * 石墨模 + */ + public static Integer YIELD_TYPE_6 = 6; + /** * 作业中心 */ @@ -347,6 +400,11 @@ public class YieldOrder extends BaseEntity { @TableField(value = "RECEIVE_TIME") private Date receiveTime; + /** + * 需求镀层物料编码 + */ + @TableField(value = "PLATE_GOODS_CODE") + private String plateGoodsCode; /** * 物料需求数量 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/ListProProcessDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/ListProProcessDTO.java new file mode 100644 index 00000000..8ab96396 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/ListProProcessDTO.java @@ -0,0 +1,22 @@ +package org.springblade.desk.produce.pojo.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +/** + * 获取转外协所需数据 数据传输对象实体类 + * @author litao + */ +@Data +public class ListProProcessDTO { + + @Schema(description = "车间订单ID集合") + private List woIds; + + @Schema(description = "转换类型：1-外协，2-厂内") + private Integer runType; + + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/TransferBillDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/TransferBillDTO.java new file mode 100644 index 00000000..6dcf8fc5 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/TransferBillDTO.java @@ -0,0 +1,23 @@ +package org.springblade.desk.produce.pojo.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springblade.desk.produce.pojo.entity.WorkOrderRun; +import org.springblade.desk.produce.pojo.entity.WorkPlanRun; + +import java.util.List; + +/** + * 转外协(单个/批量) 数据传输对象实体类 + * @author litao + */ +@Data +public class TransferBillDTO { + + @Schema(description = "车间订单运行记录") + private List workOrderRuns; + + @Schema(description = "作业计划运行明细") + private List workPlanRuns; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/TurnTypeDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/TurnTypeDTO.java new file mode 100644 index 00000000..a86ca2e0 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/TurnTypeDTO.java @@ -0,0 +1,22 @@ +package org.springblade.desk.produce.pojo.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +/** + * 转烧结 数据传输对象实体类 + * @author litao + */ +@Data +public class TurnTypeDTO { + + @Schema(description = "生产订单id") + private Long id; + + @Schema(description = "订单类型") + private Integer yieldType; + + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/UpdatePriorityDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/UpdatePriorityDTO.java new file mode 100644 index 00000000..887e2892 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/UpdatePriorityDTO.java @@ -0,0 +1,21 @@ +package org.springblade.desk.produce.pojo.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.Date; + +/** + * 更改车间订单优先级 数据传输对象实体类 + * @author litao + */ +@Data +public class UpdatePriorityDTO { + + @Schema(description = "生产订单id") + private Long id; + + @Schema(description = "需求交期") + private Date demandDate; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/UpdateStatusDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/UpdateStatusDTO.java new file mode 100644 index 00000000..a8bb2ad1 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/UpdateStatusDTO.java @@ -0,0 +1,25 @@ +package org.springblade.desk.produce.pojo.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +/** + * 修改订单状态 数据传输对象实体类 + * @author litao + */ +@Data +public class UpdateStatusDTO { + + @Schema(description = "车间订单ID集合") + private List idArr; + + @Schema(description = "状态") + private Integer status; + + @Schema(description = "备注") + private String memo; + + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/PlateAround.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/PlateAround.java new file mode 100644 index 00000000..fdb9a5b7 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/PlateAround.java @@ -0,0 +1,77 @@ +package org.springblade.desk.produce.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.util.Date; + +/** + * 镀前镀后 实体类 + * + * @author BladeX + */ +@Data +@TableName("MES_PLATE_AROUND") +@Schema(description = "PlateAround对象") +@EqualsAndHashCode(callSuper = true) +public class PlateAround extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 镀前入库 + */ + public static Short BEFORE_PLAT_IN = 1; + /** + * 镀前出库 + */ + public static Short BEFORE_PLAN_OUT = 2; + /** + * 镀后入库 + */ + public static Short AFTER_PLAN_IN = 3; + /** + * 状态 新建 + */ + public static Short CUR_STATUS_NEW = 1; + /** + * 状态 完成 + */ + public static Short CUR_STATUS_OK = 2; + + @Schema(description = "单号") + private String paCode; + + @Schema(description = "作业计划") + private Long wpId; + + @Schema(description = "班组") + private Long tsId; + + @Schema(description = "供应商") + private Long ocId; + + @Schema(description = "类型") + private Short paType; + + @Schema(description = "数量") + private Double quantity = 0d; + + @Schema(description = "重量") + private Double weight = 0d; + + @Schema(description = "制单时间") + private Date makeTime; + + @Schema(description = "制单人") + private Long makeMan; + + @Schema(description = "状态") + private Short curStatus = 1; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkOrder.java index 5aecb6dd..a7f6c78a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkOrder.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkOrder.java @@ -26,104 +26,104 @@ public class WorkOrder extends BaseEntity { /** * 未下达 */ - public static Short RUN_STATUS_NORMAL = 1; + public static Integer RUN_STATUS_NORMAL = 1; /** * 已下达 */ - public static Short RUN_STATUS_ISSUED = 2; + public static Integer RUN_STATUS_ISSUED = 2; /** * 加工中 */ - public static Short RUN_STATUS_RECEIVE = 3; + public static Integer RUN_STATUS_RECEIVE = 3; /** * 检验中 */ - public static Short RUN_STATUS_CHECK = 4; + public static Integer RUN_STATUS_CHECK = 4; /** * 工艺变更 */ - public static Short RUN_STATUS_CRAFT_CHANGE = 5; + public static Integer RUN_STATUS_CRAFT_CHANGE = 5; /** * 审理中 */ - public static Short RUN_STATUS_HEAR = 13; + public static Integer RUN_STATUS_HEAR = 13; /** * 已完工 */ - public static Short RUN_STATUS_COMPLETED = 15; + public static Integer RUN_STATUS_COMPLETED = 15; /** * 已交接 */ - public static Short RUN_STATUS_HANDOVER = 17; + public static Integer RUN_STATUS_HANDOVER = 17; /** * 返工 */ - public static Short RUN_STATUS_REWORK = 19; + public static Integer RUN_STATUS_REWORK = 19; /** * 报废 */ - public static Short RUN_STATUS_SCRAP = 20; + public static Integer RUN_STATUS_SCRAP = 20; /** * 已关闭 */ - public static Short RUN_STATUS_VOIDED = 21; + public static Integer RUN_STATUS_VOIDED = 21; /** * 正常 */ - public static Short PRIORITY_NORMAL = 1; + public static Integer PRIORITY_NORMAL = 1; /** * 项目要求日期急件 */ - public static Short PRIORITY_PRO_IMP = 2; + public static Integer PRIORITY_PRO_IMP = 2; /** * 合同急件 */ - public static Short PRIORITY_PACT_IMP = 3; + public static Integer PRIORITY_PACT_IMP = 3; /** * 会议绩效急件 */ - public static Short PRIORITY_PERF_IMP = 4; + public static Integer PRIORITY_PERF_IMP = 4; /** * 调度标注急件 */ - public static Short PRIORITY_SCH_IMP = 5; + public static Integer PRIORITY_SCH_IMP = 5; /** * 1:正常 */ - public static Short APPROVAL_STATUS_NORMAL = 1; + public static Integer APPROVAL_STATUS_NORMAL = 1; /** * 2:审批中 */ - public static Short APPROVAL_STATUS_UNDER = 2; + public static Integer APPROVAL_STATUS_UNDER = 2; /** * 3:不通过 */ - public static Short APPROVAL_STATUS_FAIL = 3; + public static Integer APPROVAL_STATUS_FAIL = 3; /** * 4:通过 */ - public static Short APPROVAL_STATUS_VIA = 4; + public static Integer APPROVAL_STATUS_VIA = 4; /** * 整单外协 */ - public static Short OEM_TYPE_WHOLE = 1; + public static Integer OEM_TYPE_WHOLE = 1; /** * 工序外协 */ - public static Short OEM_TYPE_SINGLE = 2; + public static Integer OEM_TYPE_SINGLE = 2; /** * 未领取 */ - public static Short PICKING_STATUS_NOT = 0; + public static Integer PICKING_STATUS_NOT = 0; /** * 已领取 */ - public static Short PICKING_STATUS_OK = 1; + public static Integer PICKING_STATUS_OK = 1; - public static Map runStatusMap = new HashMap<>(11); - public static Map priorityMap = new HashMap(5); - public static Map approvalStatusMap = new HashMap(4); - public static Map pickingStatusMap = new HashMap(2); + public static Map runStatusMap = new HashMap<>(11); + public static Map priorityMap = new HashMap(5); + public static Map approvalStatusMap = new HashMap(4); + public static Map pickingStatusMap = new HashMap(2); static { runStatusMap.put(RUN_STATUS_NORMAL, "未下达"); @@ -170,12 +170,12 @@ public class WorkOrder extends BaseEntity { * 试验数量 */ @Schema(description = "试验数量") - private Short testQty; + private Integer testQty; /** * 损耗数量 */ @Schema(description = "损耗数量") - private Short lossQty; + private Integer lossQty; /** * 镀层单件定额 */ @@ -230,7 +230,7 @@ public class WorkOrder extends BaseEntity { * 会议要求周期 */ @Schema(description = "会议要求周期") - private Short meetCycle; + private Integer meetCycle; /** * 备注 */ @@ -240,12 +240,12 @@ public class WorkOrder extends BaseEntity { * 排产状态;1、已下发 */ @Schema(description = "排产状态;1、已下发") - private Short schedStatus; + private Integer schedStatus; /** * 是否已准备(烧结车间订单专用，默认为空，1是代表已准备) */ @Schema(description = "是否已准备(烧结车间订单专用，默认为空，1是代表已准备)") - private Short readStatus; + private Integer readStatus; /** * 返工单号(仅状态为19的车间订单在生产监控展示) */ @@ -255,7 +255,7 @@ public class WorkOrder extends BaseEntity { * 原订单状态 */ @Schema(description = "原订单状态") - private Short oldRunStatus; + private Integer oldRunStatus; /** * 返工入库类型;0:按B号；1：按返工描述 */ @@ -310,7 +310,7 @@ public class WorkOrder extends BaseEntity { * 领料状态;0.未领，1.已领 */ @Schema(description = "领料状态;0.未领，1.已领") - private Short pickingStatus; + private Integer pickingStatus; /** * 是否外协 */ @@ -330,7 +330,7 @@ public class WorkOrder extends BaseEntity { * 审批状态;1:正常，2:审批中，3:不通过，4:通过 */ @Schema(description = "审批状态;1:正常，2:审批中，3:不通过，4:通过") - private Short approvalStatus; + private Integer approvalStatus; /** * 报废数量 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlanRun.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlanRun.java new file mode 100644 index 00000000..5a7a7eff --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlanRun.java @@ -0,0 +1,45 @@ +package org.springblade.desk.produce.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.util.Date; + +/** + * 作业计划运行明细 实体类 + * + * @author BladeX + */ +@Data +@TableName("MES_WORK_ORDER_RUN") +@Schema(description = "WorkPlanRun对象") +@EqualsAndHashCode(callSuper = true) +public class WorkPlanRun extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "车间订单运行记录") + private Long worId; + + @Schema(description = "作业计划工序") + private Long wpId; + + @Schema(description = "工艺能力") + private Long caId; + + @Schema(description = "处理工序") + private Boolean handle; + + @Schema(description = "计划开始") + private Date startTime; + + @Schema(description = "计划结束") + private Date endTime; + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java index c02c65c8..5d5d0b7a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java @@ -10,10 +10,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import org.springblade.desk.util.json.serializer.Integer0ToEmptyStringSerializer; -import org.springblade.desk.util.json.serializer.IntegerAllToStringSerializer; import java.io.Serial; -import java.math.BigDecimal; /** * [工艺文件] 实体类 diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java index 1bd0587e..bcbc88f3 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java @@ -35,6 +35,8 @@ public class CycleTestVO extends CycleTest { private String cycleTestStandardName; @Schema(description = "[周期试验标准][附件]id") private Long cycleTestStandardAttachId; + @Schema(description = "[周期试验标准][附件]原始名称") + private String cycleTestStandardAttachOriginalName; @Schema(description = "工艺员[用户]姓名") private String processUserName; @Schema(description = "试验技术员[用户]姓名") diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java index ae35bdd0..c8b91245 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java @@ -21,62 +21,62 @@ import java.time.LocalDate; @Data @EqualsAndHashCode(callSuper = true) public class LiquidTankTaskCopyVO extends LiquidTankTaskCopy { - @Serial - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; - /** - * 作业中心 name - */ - @Schema(description = "作业中心 name") - private String wcName; - /** - * todo:temp - */ - @Schema(description = "药品物料编码") - private String drugMaterialCode = "111122223333"; - /** - * - */ - @Schema(description = "化验人[用户]名称") - private String testUserRealName; - @Schema(description = "复检化验人[用户]名称") - private String repeatTestUserRealName; - @Schema(description = "工艺主管[用户]名称") - private String processUserRealName; - @Schema(description = "审核[用户]名称") - private String reviewUserRealName; - @Schema(description = "发药[用户]名称") - private String sendDurgUserRealName; - @Schema(description = "收药[用户]名称") - private String receiveDurgUserRealName; - @Schema(description = "作业槽名称") - private String workTankName; - @Schema(description = "加药量[计算公式]名称") - private String addDrugFormulaName; - @Schema(description = "添加后理论值[计算公式]名称") - private String afterTheoryFormulaName; - @Schema(description = "班组名称") - private String tsName; - @Schema(description = "任务状态") - private String statusValue; - @Schema(description = "槽液对象") - private LiquidTank liquidTank; - @Schema(description = "取样时间(报告)") - private LocalDate sampleDate; - @Schema(description = "化验频率(报告)") - private String testFrequency; - @Schema(description = "有效期") - private LocalDate validDate; - @Schema(description = "超出规范极限调整后的结果(报告)") - private String outRangeResult; - @Schema(description = "槽液清理记录(报告)") - private String clearRecord; - @Schema(description = "药品计算公式(报告) 加药量[计算公式] 公式内容") - private String reportFormulaContent; - @Schema(description = "药品监督员签名(报告)") - private String drugSuUserSign; - @Schema(description = "药品监督员签名(报告)") - private String drugAddUserSign; - @Schema(description = "控制规范(报告)") - private String norm; + /** + * [作业中心]name + */ + @Schema(description = "[作业中心]name") + private String wcName; + /** + * todo: 尚未实现 WMS对接 + */ + @Schema(description = "药品物料编码") + private String drugMaterialCode; + /** + * + */ + @Schema(description = "化验人[用户]名称") + private String testUserRealName; + @Schema(description = "复检化验人[用户]名称") + private String repeatTestUserRealName; + @Schema(description = "工艺主管[用户]名称") + private String processUserRealName; + @Schema(description = "审核[用户]名称") + private String reviewUserRealName; + @Schema(description = "发药[用户]名称") + private String sendDurgUserRealName; + @Schema(description = "收药[用户]名称") + private String receiveDurgUserRealName; + @Schema(description = "作业槽名称") + private String workTankName; + @Schema(description = "加药量[计算公式]名称") + private String addDrugFormulaName; + @Schema(description = "添加后理论值[计算公式]名称") + private String afterTheoryFormulaName; + @Schema(description = "班组名称") + private String tsName; + @Schema(description = "任务状态") + private String statusValue; + @Schema(description = "槽液对象") + private LiquidTank liquidTank; + @Schema(description = "取样时间(报告)") + private LocalDate sampleDate; + @Schema(description = "化验频率(报告)") + private String testFrequency; + @Schema(description = "有效期") + private LocalDate validDate; + @Schema(description = "超出规范极限调整后的结果(报告)") + private String outRangeResult; + @Schema(description = "槽液清理记录(报告)") + private String clearRecord; + @Schema(description = "药品计算公式(报告) 加药量[计算公式] 公式内容") + private String reportFormulaContent; + @Schema(description = "药品监督员签名(报告)") + private String drugSuUserSign; + @Schema(description = "药品监督员签名(报告)") + private String drugAddUserSign; + @Schema(description = "控制规范(报告)") + private String norm; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/serializer/IdSerializer.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/serializer/IdSerializer.java new file mode 100644 index 00000000..d18db30d --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/serializer/IdSerializer.java @@ -0,0 +1,31 @@ +package org.springblade.desk.util.json.serializer; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer; + +import java.io.IOException; + +/** + * 自定义Long序列化器：0L值 或 null 序列化为空字符串，其他值正常序列化 + */ +public class IdSerializer extends StdScalarSerializer { + + /** + * 提供无参构造器，指定处理的类型为Integer + */ + public IdSerializer() { + super(Long.class); + } + + @Override + public void serialize(Long value, JsonGenerator gen, SerializerProvider provider) + throws IOException { + // 核心逻辑：判断值是否为null或0，是则写空字符串，否则写原数值 + if (value == null || value == 0L) { + gen.writeString(""); // 0或null时返回空字符串 + } else { + gen.writeString("" + value); // 返回字符串类型 + } + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java index 690d7e2c..5770cdf0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java @@ -28,6 +28,7 @@ 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.constant.BAModuleConst; +import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.basic.constant.BaseValue; import org.springblade.desk.basic.excel.PlatingExcel; import org.springblade.desk.basic.pojo.entity.Plating; @@ -84,6 +85,7 @@ public class PlatingController extends BladeController { public R> list(@Parameter(hidden = true) @RequestParam Map plating, Query query) { QueryWrapper qw = Condition.getQueryWrapper(plating, Plating.class); + qw.orderByAsc(BaseCol.ID); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = PlatingWrapper.build().pageVO(pages); pagesVO.getRecords() diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsCraftController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsCraftController.java index e5aa4a17..83306ba4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsCraftController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsCraftController.java @@ -1,61 +1,35 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

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

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

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

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

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

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

- * Author: Chill Zhuang (bladejava@qq.com) - */ package org.springblade.desk.dashboard.controller; -import io.swagger.v3.oas.annotations.tags.Tag; +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 com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import lombok.AllArgsConstructor; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; - -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; +import lombok.AllArgsConstructor; +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.secure.annotation.IsAdmin; 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.dashboard.pojo.vo.DsCraftExpireVO; -import org.springblade.desk.dashboard.pojo.vo.DsPartSynthesisVO; -import org.springblade.desk.dashboard.pojo.vo.DsProcessSynthesisVO; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.dashboard.excel.DsCraftExcel; import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity; +import org.springblade.desk.dashboard.pojo.vo.DsCraftExpireVO; import org.springblade.desk.dashboard.pojo.vo.DsCraftVO; -import org.springblade.desk.dashboard.excel.DsCraftExcel; -import org.springblade.desk.dashboard.wrapper.DsCraftWrapper; +import org.springblade.desk.dashboard.pojo.vo.DsProcessSynthesisVO; import org.springblade.desk.dashboard.service.IDsCraftService; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; -import java.util.Map; +import org.springblade.desk.dashboard.wrapper.DsCraftWrapper; +import org.springblade.desk.oldv1.pojo.ResultInfo; +import org.springframework.web.bind.annotation.*; + import java.util.List; -import jakarta.servlet.http.HttpServletResponse; +import java.util.Map; /** * 零件工艺信息表 控制器 @@ -71,8 +45,6 @@ public class DsCraftController extends BladeController { private final IDsCraftService dsCraftService; - - /** * 工序详情 */ @@ -84,8 +56,6 @@ public class DsCraftController extends BladeController { return R.data(detail); } - - /** * 零件工艺信息表 分页 */ @@ -166,7 +136,6 @@ public class DsCraftController extends BladeController { ExcelUtil.export(response, "零件工艺信息表数据" + DateUtil.time(), "零件工艺信息表数据表", list, DsCraftExcel.class); } - /** * 根据零件ID查询工艺版本号 */ @@ -188,5 +157,10 @@ public class DsCraftController extends BladeController { } + @PostMapping(value = "/getToolsByPartId") + @Operation(summary = "根据零件ID查询需要的工装列表", description = "零件ID") + public ResultInfo getToolsByPartId(@Parameter(description = "零件号", required = true) Long partId) { + return ResultInfo.ok(dsCraftService.getToolsByPartId(partId)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsProcessMoldToolController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsProcessMoldToolController.java index 69dc0cd9..75653e9c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsProcessMoldToolController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsProcessMoldToolController.java @@ -25,34 +25,33 @@ */ package org.springblade.desk.dashboard.controller; -import io.swagger.v3.oas.annotations.tags.Tag; +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 com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import lombok.AllArgsConstructor; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; - -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; +import lombok.AllArgsConstructor; +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.secure.annotation.IsAdmin; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.dashboard.excel.DsProcessMoldToolExcel; import org.springblade.desk.dashboard.pojo.entity.DsProcessMoldToolEntity; import org.springblade.desk.dashboard.pojo.vo.DsProcessMoldToolVO; -import org.springblade.desk.dashboard.excel.DsProcessMoldToolExcel; -import org.springblade.desk.dashboard.wrapper.DsProcessMoldToolWrapper; import org.springblade.desk.dashboard.service.IDsProcessMoldToolService; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; -import java.util.Map; +import org.springblade.desk.dashboard.wrapper.DsProcessMoldToolWrapper; +import org.springframework.web.bind.annotation.*; + import java.util.List; -import jakarta.servlet.http.HttpServletResponse; +import java.util.Map; /** * 工序工装模具表 控制器 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/CraftMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/CraftMapper.xml index 9ce23c36..564c4a10 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/CraftMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/CraftMapper.xml @@ -36,13 +36,26 @@ + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsCraftMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsCraftMapper.java index 590541a7..4180af42 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsCraftMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsCraftMapper.java @@ -63,6 +63,8 @@ public interface DsCraftMapper extends BaseMapper { List selectDsCraftByIds(@Param("craftIds")List craftIds); + List listByPartCode(@Param("partCode")String partCode); + List selectDsCraftByPartId(@Param("partId")Long partId); List selectCraftByPartId(@Param("partId")Long partId); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftService.java index caacf0e9..a617d272 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftService.java @@ -32,6 +32,7 @@ import org.springblade.desk.dashboard.excel.DsCraftExcel; import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity; import org.springblade.desk.dashboard.pojo.vo.DsCraftExpireVO; import org.springblade.desk.dashboard.pojo.vo.DsCraftVO; +import org.springblade.desk.dashboard.pojo.vo.DsPartToolVO; import org.springblade.desk.dashboard.pojo.vo.DsProcessSynthesisVO; import java.util.List; @@ -92,7 +93,6 @@ public interface IDsCraftService extends BaseService { */ List listByPartId(Long partId); - /** * 根据零件号查询工艺信息 * @param partId @@ -140,5 +140,10 @@ public interface IDsCraftService extends BaseService { */ DsCraftEntity getReworkCraft(Long partId, String changeNo); - + /** + * 根据零件ID查询需要的工装列表 + * @param partId + * @return + */ + List getToolsByPartId(Long partId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java index 2efbf72b..5a201a23 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java @@ -28,21 +28,20 @@ package org.springblade.desk.dashboard.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.ObjectUtils; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.desk.dashboard.excel.DsCraftExcel; import org.springblade.desk.dashboard.mapper.DsCraftMapper; -import org.springblade.core.secure.utils.AuthUtil; import org.springblade.desk.dashboard.pojo.entity.*; import org.springblade.desk.dashboard.pojo.vo.DsCraftExpireVO; import org.springblade.desk.dashboard.pojo.vo.DsCraftVO; +import org.springblade.desk.dashboard.pojo.vo.DsPartToolVO; import org.springblade.desk.dashboard.pojo.vo.DsProcessSynthesisVO; import org.springblade.desk.dashboard.service.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Objects; + import java.util.*; import java.util.stream.Collectors; @@ -53,27 +52,18 @@ import java.util.stream.Collectors; * @since 2025-11-12 */ @Service +@RequiredArgsConstructor public class DsCraftServiceImpl extends BaseServiceImpl implements IDsCraftService { - @Autowired - DsCraftMapper craftMapper; + private final IDsPartService partService; - @Autowired - @Lazy - IDsPartService partService; + private final IDsProcessService processService; - @Autowired - @Lazy - IDsProcessService processService; + private final IDsProcessProjectService processProjectService; - @Autowired - IDsProcessProjectService processProjectService; + private final IDsProcessMeasuringToolService processMeasuringToolService; - @Autowired - IDsProcessMeasuringToolService processMeasuringToolService; - - @Autowired - IDsProcessMoldToolService processMoldToolService; + private final IDsProcessMoldToolService processMoldToolService; @Override @@ -123,12 +113,12 @@ public class DsCraftServiceImpl extends BaseServiceImpl selectDsCraftByIds(List craftIds) { - return craftMapper.selectDsCraftByIds(craftIds); + return baseMapper.selectDsCraftByIds(craftIds); } @Override public List getVersion(Long partId) { - return craftMapper.selectDsCraftByPartId(partId); + return baseMapper.selectDsCraftByPartId(partId); } @Override @@ -140,17 +130,16 @@ public class DsCraftServiceImpl extends BaseServiceImpl selectDsCraftByPartId(Long partId) { - return craftMapper.selectCraftByPartId(partId); + return baseMapper.selectCraftByPartId(partId); } @Override public List selectDsCraftByPartId(Long partId, String version, String rank) { - return craftMapper.selectCraft(partId,version,rank); + return baseMapper.selectCraft(partId, version, rank); } @Override public boolean addOrEdit(DsCraftEntity craft) { - if(null != craft.getId()){ updateById(craft); }else { @@ -169,10 +158,10 @@ public class DsCraftServiceImpl extends BaseServiceImpl craftVOList = craftMapper.selectCraftByPartId(partId); + List craftVOList = baseMapper.selectCraftByPartId(partId); Optional latestVersion = craftVOList.stream() - .map(DsCraftVO::getPartVersions) - .max(Comparator.naturalOrder()); + .map(DsCraftVO::getPartVersions) + .max(Comparator.naturalOrder()); if (latestVersion.isPresent()) { // 输出: 最新版本号 System.out.println("最新版本号: " + latestVersion.get()); @@ -183,11 +172,49 @@ public class DsCraftServiceImpl extends BaseServiceImpl getToolsByPartId(Long partId) { + // 从零件工艺的工艺中拿取工装 + List dartAllModelList = new ArrayList<>(); + DsPartToolVO dartAllModel; + DsPartToolVO dartAllModel1; + List dsCraftList = this.listByPartId(partId); + if (dsCraftList != null && dsCraftList.size() > 0) { + for (DsCraftEntity dsCraft : dsCraftList) { + List dsProcessList = processService.selectDsProcessByCraftId(dsCraft.getId()); + if (dsProcessList != null && dsProcessList.size() > 0) { + for (DsProcessEntity dsProcess : dsProcessList) { + List dsToolsInfos = processMoldToolService.selectDsProcessMoldToolByProcessId(dsProcess.getId()); + if (dsToolsInfos != null && dsToolsInfos.size() > 0) { + for (DsProcessMoldToolEntity dsToolsInfo : dsToolsInfos) { + dartAllModel = new DsPartToolVO(); + dartAllModel.setCode(dsToolsInfo.getMoldCode()); + dartAllModel.setName(dsToolsInfo.getMoldName()); + dartAllModelList.add(dartAllModel); + //周新昊 20240920 增加查询工装的子件 + List dsPartSubs = partService.selectDsPartByPatCode(dsToolsInfo.getMoldCode(), null); + if (dsPartSubs != null && dsPartSubs.size() > 0) { + for (DsPartEntity dsPartSub : dsPartSubs) { + dartAllModel1 = new DsPartToolVO(); + dartAllModel1.setCode(dsPartSub.getPartCode()); + dartAllModel1.setName(dsPartSub.getPartName()); + dartAllModelList.add(dartAllModel1); + } + } + } + } + } + } + } + } + return dartAllModelList; } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java index 4568a932..aba4c2d2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java @@ -1,47 +1,23 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

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

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

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

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

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

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

- * Author: Chill Zhuang (bladejava@qq.com) - */ package org.springblade.desk.dashboard.service.impl; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.dashboard.constant.TaskingConstant; -import org.springblade.desk.dashboard.pojo.entity.*; -import org.springblade.desk.dashboard.pojo.vo.*; import org.springblade.desk.dashboard.excel.DsPartExcel; import org.springblade.desk.dashboard.mapper.DsPartMapper; +import org.springblade.desk.dashboard.pojo.entity.*; +import org.springblade.desk.dashboard.pojo.vo.*; import org.springblade.desk.dashboard.service.*; import org.springblade.system.feign.IUserClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -159,9 +135,13 @@ public class DsPartServiceImpl extends BaseServiceImpl selectDsPartByPatCode(String partCode, Integer sinTerType) { - Wrapper queryWrapper = Wrappers.lambdaQuery(DsPartEntity.class) - .eq(DsPartEntity::getPartCode, partCode) - .eq(DsPartEntity::getSinTerType, sinTerType); + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(DsPartEntity.class) + .eq(DsPartEntity::getPartCode, partCode); + + if (Func.isNotEmpty(sinTerType)) { + queryWrapper.eq(DsPartEntity::getSinTerType, sinTerType); + } + return baseMapper.selectList(queryWrapper); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMoldToolServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMoldToolServiceImpl.java index 1862537a..955e68c4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMoldToolServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMoldToolServiceImpl.java @@ -1,42 +1,17 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

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

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

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

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

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

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

- * Author: Chill Zhuang (bladejava@qq.com) - */ package org.springblade.desk.dashboard.service.impl; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.RequiredArgsConstructor; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.dashboard.excel.DsProcessMoldToolExcel; +import org.springblade.desk.dashboard.mapper.DsProcessMoldToolMapper; import org.springblade.desk.dashboard.pojo.entity.DsProcessEntity; import org.springblade.desk.dashboard.pojo.entity.DsProcessMoldToolEntity; import org.springblade.desk.dashboard.pojo.vo.DsProcessMoldToolVO; -import org.springblade.desk.dashboard.excel.DsProcessMoldToolExcel; -import org.springblade.desk.dashboard.mapper.DsProcessMoldToolMapper; import org.springblade.desk.dashboard.pojo.vo.PrReworkProcessVO; import org.springblade.desk.dashboard.service.IDsProcessMoldToolService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.util.CollectionUtils; import java.util.List; @@ -48,11 +23,9 @@ import java.util.List; * @since 2025-11-12 */ @Service +@RequiredArgsConstructor public class DsProcessMoldToolServiceImpl extends BaseServiceImpl implements IDsProcessMoldToolService { - @Autowired - DsProcessMoldToolMapper processMoldToolMapper; - @Override public IPage selectDsProcessMoldToolPage(IPage page, DsProcessMoldToolVO dsProcessMoldTool) { return page.setRecords(baseMapper.selectDsProcessMoldToolPage(page, dsProcessMoldTool)); @@ -70,12 +43,12 @@ public class DsProcessMoldToolServiceImpl extends BaseServiceImpl selectDsProcessMoldToolByProcessIds(List processIds) { - return processMoldToolMapper.selectDsProcessMoldToolByProcessIds(processIds); + return baseMapper.selectDsProcessMoldToolByProcessIds(processIds); } @Override public List selectDsProcessMoldToolByProcessId(Long processId) { - return processMoldToolMapper.selectDsProcessMoldToolByProcessId(processId); + return baseMapper.selectDsProcessMoldToolByProcessId(processId); } @Override @@ -97,9 +70,9 @@ public class DsProcessMoldToolServiceImpl extends BaseServiceImpl processMoldToolVOList) { if(!CollectionUtils.isEmpty(processMoldToolVOList)){ for (DsProcessMoldToolVO dsProcessMoldToolVO : processMoldToolVOList) { - if(null != dsProcessMoldToolVO.getId()){ + if (null != dsProcessMoldToolVO.getId()) { updateById(dsProcessMoldToolVO); - }else { + } else { dsProcessMoldToolVO.setProcessId(prReworkProcess.getId()); save(dsProcessMoldToolVO); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java index dbf95f07..df02953c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java @@ -25,41 +25,36 @@ */ package org.springblade.desk.device.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.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import jakarta.annotation.PostConstruct; -import lombok.AllArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; - -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; +import lombok.AllArgsConstructor; +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.device.pojo.entity.EquipmentEntity; import org.springblade.desk.device.pojo.excel.EquipmentExcel; import org.springblade.desk.device.pojo.vo.EquipmentStatusStatisticsVO; -import org.springblade.desk.order.wrapper.AssayContentWrapper; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.device.pojo.entity.EquipmentEntity; import org.springblade.desk.device.pojo.vo.EquipmentVO; -import org.springblade.desk.device.wrapper.EquipmentWrapper; import org.springblade.desk.device.service.IEquipmentService; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; -import java.util.Map; +import org.springblade.desk.device.wrapper.EquipmentWrapper; +import org.springframework.web.bind.annotation.*; + import java.util.List; -import jakarta.servlet.http.HttpServletResponse; +import java.util.Map; /** * 设备信息表 控制器 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java index a6c6f38f..ba70c84d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/FeiBaSetController.java @@ -1,41 +1,36 @@ package org.springblade.desk.device.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.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import jakarta.annotation.PostConstruct; -import lombok.AllArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; - -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; +import lombok.AllArgsConstructor; +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.device.pojo.entity.FeiBaSetEntity; import org.springblade.desk.device.pojo.excel.FeiBaSetExcel; import org.springblade.desk.device.pojo.vo.FeiBaSetVO; import org.springblade.desk.device.service.IFeiBaSetService; -import org.springblade.desk.device.wrapper.EquipmentWrapper; import org.springblade.desk.device.wrapper.FeiBaSetWrapper; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; -import java.util.Map; import java.util.List; - -import jakarta.servlet.http.HttpServletResponse; +import java.util.Map; /** * 飞靶设置 控制器 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml index e2b5459e..9cc0e7c2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml @@ -3,17 +3,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + yo.ID, yo.TENANT_ID, yo.CREATE_USER, yo.CREATE_DEPT, yo.CREATE_TIME, yo.UPDATE_USER, yo.UPDATE_TIME, yo.STATUS, yo.IS_DELETED, + YO_CODE, yo.YP_CODE, yo.PART_CODE, yo.PRODUCT_TYPE, yo.PART_NAME, yo.PLATE, yo.PRODUCT_IDENT, yo.USE_DEPT, yo.YP_AREA, yo.DEMAND_DATE, + PLAN_USER, yo.RELEASE_DATE, yo.MEMO, yo.CARD_NO, yo.BATCH_NO, yo.SITE_WORK, yo.YP_QTY, yo.ROAM_NO, yo.PRIMARY_CRAFT, yo.ROAM_NO_NEXT, + PDM_URL, yo.CUSTODIAN, yo.REWORK_CODE, yo.REWORK_NO, yo.ENTRUST_DEPT, yo.REWORK_MEMO, yo.BUSINESS_TYPE, yo.ASSIGN_MAN, yo.ASSIGN_TIME, + RECSEQ_NO, yo.MANUAL_INCREASE, yo.YIELD_TYPE, yo.FATHER_YO_ID, yo.NEW_LEV_FLAG, yo.PRODUCE_BOOL, yo.USE_DEPT_CODE, yo.YP_PRODUCT_LINE, + YP_MEMO, yo.SJ_MOLD_PREPARATION, yo.SJ_KIT_PREPARATION, yo.PK_USERNAME, yo.PK_DATE, yo.KIT_PREPARATION_MAN, yo.KIT_PREPARATION_TIME, + PRIORITY_APS, yo.PRIORITY_ERP, yo.VALIDATION_RESULT, yo.VALIDATION_MOMO, yo.VALIDATION_TIME, yo.VALIDATION_USER, yo.RECEIVE_STATUS, + WORK_CENTER_ID, yo.ERROR_INFO, yo.RECEIVE_USER, yo.RECEIVE_TIME, yo.GOODS_DEMAND, yo.TOOLS_DEMAND, yo.PLATE_GOODS_CODE + +