From d1a429a02407174a396c321e8fc3181af35b7166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Sat, 16 May 2026 16:44:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../produce/pojo/dto/MesEquipmentCardDTO.java | 46 -------- .../produce/pojo/dto/PrMacTooUseSpec.java | 7 +- .../pojo/entity/MesEquipmentCardEntity.java | 110 ------------------ .../produce/pojo/vo/MesEquipmentCardVO.java | 46 -------- .../MesEquipmentCardController.java | 109 ----------------- .../produce/mapper/EquipmentCardMapper.xml | 34 ------ .../desk/produce/mapper/MacToolUseMapper.xml | 2 +- .../mapper/MesEquipmentCardMapper.java | 31 ----- .../desk/produce/mapper/WorkPlanMapper.xml | 10 +- .../service/IMesEquipmentCardService.java | 29 ----- .../service/impl/MakeRecServiceImpl.java | 2 - .../impl/MesEquipmentCardServiceImpl.java | 27 ----- .../wrapper/MesEquipmentCardWrapper.java | 35 ------ .../impl/InspectionTaskServiceImpl.java | 21 +--- 14 files changed, 11 insertions(+), 498 deletions(-) delete mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/MesEquipmentCardDTO.java delete mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesEquipmentCardEntity.java delete mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MesEquipmentCardVO.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/MesEquipmentCardController.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/EquipmentCardMapper.xml delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MesEquipmentCardMapper.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IMesEquipmentCardService.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MesEquipmentCardServiceImpl.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/produce/wrapper/MesEquipmentCardWrapper.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/MesEquipmentCardDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/MesEquipmentCardDTO.java deleted file mode 100644 index 8d19eb822..000000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/MesEquipmentCardDTO.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * 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.produce.pojo.dto; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.desk.produce.pojo.entity.MesEquipmentCardEntity; - -import java.io.Serial; - -/** - * 设备卡片 数据传输对象实体类 - * - * @author BladeX - * @since 2026-02-03 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class MesEquipmentCardDTO extends MesEquipmentCardEntity { - @Serial - private static final long serialVersionUID = 1L; - -} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrMacTooUseSpec.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrMacTooUseSpec.java index d40f6cfae..e61d26b08 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrMacTooUseSpec.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrMacTooUseSpec.java @@ -11,7 +11,7 @@ import lombok.Data; * 注意：本内容仅限于苏州微缔软件股份有限公司内部传阅，禁止外泄以及用于其他的商业目的 */ @Data -public class PrMacTooUseSpec implements java.io.Serializable { +public class PrMacTooUseSpec { /** * id @@ -33,10 +33,5 @@ public class PrMacTooUseSpec implements java.io.Serializable { * 时间 */ private String createTime; - /** - * 设备 - */ - private MesEquipmentCardDTO equipmentCard; - } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesEquipmentCardEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesEquipmentCardEntity.java deleted file mode 100644 index e7abde19e..000000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesEquipmentCardEntity.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.springblade.desk.produce.pojo.entity; - -import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; -import com.baomidou.mybatisplus.annotation.TableName; -import java.math.BigDecimal; -import java.util.Date; -import lombok.EqualsAndHashCode; -import org.springblade.core.mp.base.BaseEntity; -import org.springblade.core.tenant.mp.TenantEntity; -import java.io.Serial; -import java.util.HashMap; -import java.util.Map; - -/** - * 设备卡片 实体类 - * - * @author BladeX - * @since 2026-02-03 - */ -@Data -@TableName("MES_EQUIPMENT_CARD") -@Schema(description = "MesEquipmentCard对象") -@EqualsAndHashCode(callSuper = true) -public class MesEquipmentCardEntity extends BaseEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 设备编号 - */ - @Schema(description = "设备编号") - private String deviceCode; - /** - * 设备名称 - */ - @Schema(description = "设备名称") - private String deviceName; - /** - * 类别名称 - */ - @Schema(description = "类别名称") - private String typeName; - /** - * 规格型号 - */ - @Schema(description = "规格型号") - private String macSpec; - /** - * 服役状态 1、正常服役，2、服役中，3、暂停服役 - */ - @Schema(description = "服役状态 1、正常服役，2、服役中，3、暂停服役") - private Long used; - /** - * RFID - */ - @Schema(description = "RFID") - private String rfId; - /** - * 虚拟设备:0、否； 1、是 - */ - @Schema(description = "虚拟设备:0、否； 1、是") - private Boolean virtualMac=false; - /** - * 是否对接 - */ - @Schema(description = "是否对接") - private boolean docking=false; - /** - * 类别说明 - */ - @Schema(description = "类别说明") - private String memo; - /** - * 绑定数量 - */ - @Schema(description = "绑定数量") - private Integer bindQty=0; - /** - * 设备分类 - */ - @Schema(description = "设备分类") - private String categorys; - /** - * 设备IP - */ - @Schema(description = "设备IP") - private String deviceIp; - /** - * 正常服役 - */ - public static Short USED_OK = 1; - /** - * 服役中 - */ - public static Short USED_AFOOT = 2; - /** - * 暂停服役 - */ - public static Short USED_PAUSE = 3; - - public static Map usedMap = new HashMap(); - - static { - usedMap.put(USED_OK, "正常服役"); - usedMap.put(USED_AFOOT, "服役中"); - usedMap.put(USED_PAUSE, "暂停服役"); - } -} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MesEquipmentCardVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MesEquipmentCardVO.java deleted file mode 100644 index cd6767db0..000000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MesEquipmentCardVO.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * 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.produce.pojo.vo; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.desk.produce.pojo.entity.MesEquipmentCardEntity; - -import java.io.Serial; - -/** - * 设备卡片 视图实体类 - * - * @author BladeX - * @since 2026-02-03 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class MesEquipmentCardVO extends MesEquipmentCardEntity { - @Serial - private static final long serialVersionUID = 1L; - -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/MesEquipmentCardController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/MesEquipmentCardController.java deleted file mode 100644 index a9cb0ed73..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/MesEquipmentCardController.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.springblade.desk.produce.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import lombok.AllArgsConstructor; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.Func; -import org.springblade.desk.produce.pojo.entity.MesEquipmentCardEntity; -import org.springblade.desk.produce.pojo.vo.MesEquipmentCardVO; -import org.springblade.desk.produce.service.IMesEquipmentCardService; -import org.springblade.desk.produce.wrapper.MesEquipmentCardWrapper; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** - * 设备卡片 控制器 - * - * @author BladeX - * @since 2026-02-03 - */ -@RestController -@AllArgsConstructor -@RequestMapping("/mesEquipmentCard") -@Tag(name = "设备卡片", description = "设备卡片接口") -public class MesEquipmentCardController extends BladeController { - - private final IMesEquipmentCardService mesEquipmentCardService; - - /** - * 设备卡片 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 1) - @Operation(summary = "详情", description = "传入mesEquipmentCard") - public R detail(MesEquipmentCardEntity mesEquipmentCard) { - MesEquipmentCardEntity detail = mesEquipmentCardService.getOne(Condition.getQueryWrapper(mesEquipmentCard)); - return R.data(MesEquipmentCardWrapper.build().entityVO(detail)); - } - /** - * 设备卡片 分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 2) - @Operation(summary = "分页", description = "传入mesEquipmentCard") - public R> list(@Parameter(hidden = true) @RequestParam Map mesEquipmentCard, Query query) { - IPage pages = mesEquipmentCardService.page(Condition.getPage(query), Condition.getQueryWrapper(mesEquipmentCard, MesEquipmentCardEntity.class)); - return R.data(MesEquipmentCardWrapper.build().pageVO(pages)); - } - - /** - * 设备卡片 自定义分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 3) - @Operation(summary = "分页", description = "传入mesEquipmentCard") - public R> page(MesEquipmentCardVO mesEquipmentCard, Query query) { - IPage pages = mesEquipmentCardService.selectMesEquipmentCardPage(Condition.getPage(query), mesEquipmentCard); - return R.data(pages); - } - - /** - * 设备卡片 新增 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @Operation(summary = "新增", description = "传入mesEquipmentCard") - public R save(@Valid @RequestBody MesEquipmentCardEntity mesEquipmentCard) { - return R.status(mesEquipmentCardService.save(mesEquipmentCard)); - } - - /** - * 设备卡片 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @Operation(summary = "修改", description = "传入mesEquipmentCard") - public R update(@Valid @RequestBody MesEquipmentCardEntity mesEquipmentCard) { - return R.status(mesEquipmentCardService.updateById(mesEquipmentCard)); - } - - /** - * 设备卡片 新增或修改 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 6) - @Operation(summary = "新增或修改", description = "传入mesEquipmentCard") - public R submit(@Valid @RequestBody MesEquipmentCardEntity mesEquipmentCard) { - return R.status(mesEquipmentCardService.saveOrUpdate(mesEquipmentCard)); - } - - /** - * 设备卡片 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 7) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(mesEquipmentCardService.deleteLogic(Func.toLongList(ids))); - } - -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/EquipmentCardMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/EquipmentCardMapper.xml deleted file mode 100644 index 5bfc995d9..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/EquipmentCardMapper.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml index ed00963ea..40c8afb48 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml @@ -73,7 +73,7 @@ a.mtn_code FROM MES_MAC_TOOL_USE a - LEFT JOIN MES_EQUIPMENT_CARD b ON + LEFT JOIN MES_EQUIPMENT b ON a.EQUIPMENT_CARD = b.ID WHERE b.CATEGORYS = '烘箱设备' diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MesEquipmentCardMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MesEquipmentCardMapper.java deleted file mode 100644 index 1e2212ce4..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MesEquipmentCardMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.springblade.desk.produce.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.produce.pojo.entity.MesEquipmentCardEntity; -import org.springblade.desk.produce.pojo.vo.MesEquipmentCardVO; - -import java.util.List; - -/** - * 设备卡片 Mapper 接口 - * - * @author BladeX - * @since 2026-02-03 - */ -public interface MesEquipmentCardMapper extends BaseMapper { - - /** - * 自定义分页 - * - * @param page 分页参数 - * @param mesEquipmentCard 查询参数 - * @return List - */ - List selectMesEquipmentCardPage(IPage page, MesEquipmentCardVO mesEquipmentCard); - - - - -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml index b86c448ca..0584765aa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml @@ -66,7 +66,7 @@ select min(c.IN_DATE), max(c.OUT_DATE), 'Max:'||max(c.TEMP_SLOT)||'/'||'Min:'||min(c.temp_slot), max(c.DEVICE_ID) from MES_QC_PRODUCE_RUN c where c.mtn_code in ( - select a.mtn_code from MES_MAC_TOOL_USE a left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID + select a.mtn_code from MES_MAC_TOOL_USE a left join MES_EQUIPMENT b on a.EQUIPMENT_CARD = b.ID where b.CATEGORYS = '烘箱设备' and a.WP_ID = #{wpId} ) and c.WORK_SLOT = '烘箱' order by c.IN_DATE desc @@ -84,7 +84,7 @@ inner join DS_PART f on d.PART_CODE = f.PART_CODE where a.MTN_CODE in ( select a.MTN_CODE from MES_MAC_TOOL_USE a - left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID + left join MES_EQUIPMENT b on a.EQUIPMENT_CARD = b.ID where a.WP_ID = #{wpId} @@ -109,7 +109,7 @@ inner join DS_PART f on d.PART_CODE = f.PART_CODE where a.MTN_CODE in ( select a.MTN_CODE from MES_MAC_TOOL_USE a - left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID + left join MES_EQUIPMENT b on a.EQUIPMENT_CARD = b.ID where a.WP_ID = #{wpId} @@ -210,7 +210,7 @@ inner join DS_PART f on d.part_code = f.part_code where a.MTN_CODE in( select a.MTN_CODE from MES_MAC_TOOL_USE a - left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID + left join MES_EQUIPMENT b on a.EQUIPMENT_CARD = b.ID where a.WP_ID = #{wpId} and b.CATEGORYS = '产线设备' @@ -245,7 +245,7 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IMesEquipmentCardService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IMesEquipmentCardService.java deleted file mode 100644 index 589d76531..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IMesEquipmentCardService.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.springblade.desk.produce.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.produce.pojo.entity.MesEquipmentCardEntity; -import org.springblade.desk.produce.pojo.vo.MesEquipmentCardVO; - -import java.util.List; - -/** - * 设备卡片 服务类 - * - * @author BladeX - * @since 2026-02-03 - */ -public interface IMesEquipmentCardService extends BaseService { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param mesEquipmentCard 查询参数 - * @return IPage - */ - IPage selectMesEquipmentCardPage(IPage page, MesEquipmentCardVO mesEquipmentCard); - - - -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java index fc1d67061..ea0d6e72b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java @@ -60,8 +60,6 @@ public class MakeRecServiceImpl extends BaseServiceImpl private final IRelTeamSetUserService relTeamSetUserService; - private final IMesEquipmentCardService mesEquipmentCardService; - private final IMesRbFilePreserveSlotService mesRbFilePreserveSlotService; private final IMesRbFilePreserveDetailService mesRbFilePreserveDetailService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MesEquipmentCardServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MesEquipmentCardServiceImpl.java deleted file mode 100644 index 7e2753a45..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MesEquipmentCardServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.springblade.desk.produce.service.impl; - -import org.springblade.desk.produce.mapper.MesEquipmentCardMapper; -import org.springblade.desk.produce.pojo.entity.MesEquipmentCardEntity; -import org.springblade.desk.produce.pojo.vo.MesEquipmentCardVO; -import org.springblade.desk.produce.service.IMesEquipmentCardService; -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 java.util.List; - -/** - * 设备卡片 服务实现类 - * - * @author BladeX - * @since 2026-02-03 - */ -@Service -public class MesEquipmentCardServiceImpl extends BaseServiceImpl implements IMesEquipmentCardService { - - @Override - public IPage selectMesEquipmentCardPage(IPage page, MesEquipmentCardVO mesEquipmentCard) { - return page.setRecords(baseMapper.selectMesEquipmentCardPage(page, mesEquipmentCard)); - } - -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/wrapper/MesEquipmentCardWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/wrapper/MesEquipmentCardWrapper.java deleted file mode 100644 index 9137c7f1d..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/wrapper/MesEquipmentCardWrapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.springblade.desk.produce.wrapper; - -import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.desk.produce.pojo.entity.MesEquipmentCardEntity; -import org.springblade.desk.produce.pojo.vo.MesEquipmentCardVO; - -import java.util.Objects; - -/** - * 设备卡片 包装类,返回视图层所需的字段 - * - * @author BladeX - * @since 2026-02-03 - */ -public class MesEquipmentCardWrapper extends BaseEntityWrapper { - - public static MesEquipmentCardWrapper build() { - return new MesEquipmentCardWrapper(); - } - - @Override - public MesEquipmentCardVO entityVO(MesEquipmentCardEntity mesEquipmentCard) { - MesEquipmentCardVO mesEquipmentCardVO = Objects.requireNonNull(BeanUtil.copyProperties(mesEquipmentCard, MesEquipmentCardVO.class)); - - //User createUser = UserCache.getUser(mesEquipmentCard.getCreateUser()); - //User updateUser = UserCache.getUser(mesEquipmentCard.getUpdateUser()); - //mesEquipmentCardVO.setCreateUserName(createUser.getName()); - //mesEquipmentCardVO.setUpdateUserName(updateUser.getName()); - - return mesEquipmentCardVO; - } - - -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index 78a41a83d..0fa2d2f67 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -1,6 +1,3 @@ -/** - * Author: Tom Shuo - */ package org.springblade.desk.quality.service.impl; import cn.hutool.core.bean.BeanUtil; @@ -30,7 +27,6 @@ import org.springblade.desk.basic.constant.BaseValue; import org.springblade.desk.basic.mapper.OemMapper; import org.springblade.desk.basic.pojo.entity.CenterTeam; import org.springblade.desk.basic.pojo.entity.Oem; -import org.springblade.desk.basic.pojo.entity.Plating; import org.springblade.desk.basic.service.ICenterTeamService; import org.springblade.desk.basic.service.IPlatingService; import org.springblade.desk.basic.util.IdUtil; @@ -41,13 +37,14 @@ import org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity; import org.springblade.desk.dashboard.pojo.entity.DsPartSub; import org.springblade.desk.dashboard.service.IBsProcessSetService; import org.springblade.desk.dashboard.service.IDsPartService; +import org.springblade.desk.device.pojo.entity.EquipmentEntity; import org.springblade.desk.device.pojo.entity.FeiBaSetEntity; import org.springblade.desk.device.pojo.entity.RackSetEntity; +import org.springblade.desk.device.service.IEquipmentService; import org.springblade.desk.device.service.IFeiBaSetService; import org.springblade.desk.device.service.IRackSetService; import org.springblade.desk.order.mapper.YieldOrderMapper; import org.springblade.desk.order.pojo.entity.YieldOrder; -import org.springblade.desk.order.service.IYieldOrderService; import org.springblade.desk.produce.mapper.WorkOrderMapper; import org.springblade.desk.produce.mapper.WorkPlanMapper; import org.springblade.desk.produce.pojo.dto.*; @@ -65,14 +62,12 @@ import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew; import org.springblade.desk.quality.pojo.vo.*; import org.springblade.desk.quality.service.*; import org.springblade.desk.quality.wrapper.InspectionTaskListWrapper; -import org.springblade.scheduling.pojo.entity.ProcessSetEntity; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; import org.springblade.system.pojo.entity.User; import org.springframework.beans.BeanUtils; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -81,8 +76,6 @@ import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; -import static com.fasterxml.jackson.databind.type.LogicalType.DateTime; - /** * [检验任务] 服务实现类 * @@ -103,10 +96,6 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl cards = mtuList.stream().map(MacToolUse::getEquipmentCard).collect(Collectors.toList()); List rackList = rackSetService.listByIds(racks); List basList = feiBaSetService.listByIds(bas); - List cardList = mesEquipmentCardService.listByIds(cards); + List cardList = mesEquipmentCardService.listByIds(cards); // 设备编号