diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/MesMacToolUseDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/MesMacToolUseDTO.java new file mode 100644 index 00000000..4cedcb0e --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/MesMacToolUseDTO.java @@ -0,0 +1,44 @@ +package org.springblade.desk.produce.pojo.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.Date; + +/** + * 同炉(槽)查询 数据传输对象实体类 + * + * @author BladeX + * @since 2026-02-04 + */ +@Data +public class MesMacToolUseDTO { + + @Schema(description = "绑定编号") + private String code; + + @Schema(description = "车间订单号") + private String woCode; + + @Schema(description = "物料号") + private String partCode; + + @Schema(description = "批次号") + private String batchNo; + + @Schema(description = "设备编号") + private String deviceCode; + + @Schema(description = "挂具编号") + private String rsCode; + + @Schema(description = "飞靶编号") + private String fsCode; + + @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/produce/pojo/vo/MesMacToolUseVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MesMacToolUseVO.java new file mode 100644 index 00000000..c1430e15 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/MesMacToolUseVO.java @@ -0,0 +1,45 @@ +package org.springblade.desk.produce.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 同炉(槽)查询 视图实体类 + * + * @author BladeX + * @since 2026-02-04 + */ +@Data +public class MesMacToolUseVO { + + @Schema(description = "绑定编号") + private String code; + + @Schema(description = "车间订单号") + private String woCode; + + @Schema(description = "物料号") + private String partCode; + + @Schema(description = "批次号") + private String batchNo; + + @Schema(description = "数量") + private String makeQty; + + @Schema(description = "设备编号") + private String deviceCode; + + @Schema(description = "挂具编号") + private String rsCode; + + @Schema(description = "飞靶编号") + private String fsCode; + + @Schema(description = "绑定时间") + private String bindTime; + + @Schema(description = "绑定人员") + private String name; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/WorkProcessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/WorkProcessController.java index 699a2d82..cc3cc510 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/WorkProcessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/WorkProcessController.java @@ -9,7 +9,9 @@ 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.desk.produce.pojo.dto.MesMacToolUseDTO; import org.springblade.desk.produce.pojo.entity.MacToolUse; +import org.springblade.desk.produce.pojo.vo.MesMacToolUseVO; import org.springblade.desk.produce.service.IMacToolUseService; import org.springframework.web.bind.annotation.*; @@ -29,8 +31,8 @@ public class WorkProcessController extends BladeController { @GetMapping("/queryData") @ApiOperationSupport(order = 1) @Operation(summary = "分页", description = "传入macToolUse") - public R> page(MacToolUse macToolUse, Query query) { - IPage pages = macToolUseService.queryMacToolUse(Condition.getPage(query), macToolUse); + public R> page(MesMacToolUseDTO macToolUse, Query query) { + IPage pages = macToolUseService.queryMacToolUse(Condition.getPage(query), macToolUse); return R.data(pages); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.java index 720868a5..5edcc901 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.java @@ -2,8 +2,10 @@ 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.dto.MesMacToolUseDTO; import org.springblade.desk.produce.pojo.entity.MacToolUse; import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity; +import org.springblade.desk.produce.pojo.vo.MesMacToolUseVO; import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO; import java.util.List; @@ -17,7 +19,7 @@ import java.util.Map; public interface MacToolUseMapper extends BaseMapper { MacToolUse getTcDataByWoId(Long woId); - List queryMacToolUse(IPage page, MacToolUse macToolUse); + List queryMacToolUse(IPage page, MesMacToolUseDTO macToolUse); List listSlotInfo(Long id, int isGr, int isCx); 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 c3fe0bcc..53441125 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 @@ -31,9 +31,7 @@ - + - + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IMacToolUseService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IMacToolUseService.java index 9fe5d802..fec81163 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IMacToolUseService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IMacToolUseService.java @@ -2,11 +2,13 @@ package org.springblade.desk.produce.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.produce.pojo.dto.MesMacToolUseDTO; import org.springblade.desk.produce.pojo.entity.MacToolUse; import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity; import org.springblade.desk.produce.pojo.entity.WorkOrder; import org.springblade.desk.produce.pojo.entity.WorkPlan; import org.springblade.desk.produce.pojo.vo.MacToolUseVO; +import org.springblade.desk.produce.pojo.vo.MesMacToolUseVO; import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO; import java.util.List; @@ -33,7 +35,7 @@ public interface IMacToolUseService extends BaseService { */ void unMacToolUseBind(List mtuList); - IPage queryMacToolUse(IPage page, MacToolUse macToolUse); + IPage queryMacToolUse(IPage page, MesMacToolUseDTO macToolUse); MacToolUse getTcDataByWoId(Long woId); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MacToolUseServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MacToolUseServiceImpl.java index 28f43602..8887982e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MacToolUseServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MacToolUseServiceImpl.java @@ -15,11 +15,13 @@ import org.springblade.desk.device.pojo.entity.RackSetEntity; import org.springblade.desk.device.service.IEquipmentService; import org.springblade.desk.device.service.IRackSetService; import org.springblade.desk.produce.mapper.MacToolUseMapper; +import org.springblade.desk.produce.pojo.dto.MesMacToolUseDTO; import org.springblade.desk.produce.pojo.entity.MacToolUse; import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity; import org.springblade.desk.produce.pojo.entity.WorkOrder; import org.springblade.desk.produce.pojo.entity.WorkPlan; import org.springblade.desk.produce.pojo.vo.MacToolUseVO; +import org.springblade.desk.produce.pojo.vo.MesMacToolUseVO; import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO; import org.springblade.desk.produce.service.IMacToolUseService; import org.springframework.stereotype.Service; @@ -99,7 +101,7 @@ public class MacToolUseServiceImpl extends BaseServiceImpl queryMacToolUse(IPage page, MacToolUse macToolUse) { + public IPage queryMacToolUse(IPage page, MesMacToolUseDTO macToolUse) { return page.setRecords(baseMapper.queryMacToolUse(page, macToolUse)); }