From 76e99272017ca2242c8c55e36890d03d598f5103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Tue, 9 Jun 2026 17:35:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E8=AE=B0=E5=BD=95=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../produce/pojo/dto/SaveMacToolUseDto.java | 11 +++ .../desk/produce/pojo/vo/MesMacToolUseVO.java | 3 + .../controller/WorkProcessController.java | 50 +++++++++- .../desk/produce/mapper/MacToolUseMapper.java | 8 ++ .../desk/produce/mapper/MacToolUseMapper.xml | 91 +++++++++++++++++++ .../produce/service/IMacToolUseService.java | 11 +++ .../desk/produce/service/IPdaLoadService.java | 1 + .../service/impl/MacToolUseServiceImpl.java | 48 ++++++++++ .../service/impl/PdaLoadServiceImpl.java | 14 +++ 9 files changed, 236 insertions(+), 1 deletion(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/SaveMacToolUseDto.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/SaveMacToolUseDto.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/SaveMacToolUseDto.java new file mode 100644 index 000000000..1be6f8934 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/SaveMacToolUseDto.java @@ -0,0 +1,11 @@ +package org.springblade.desk.produce.pojo.dto; + +import lombok.Data; + +@Data +public class SaveMacToolUseDto { + + private Long wpId; + + private Long toolId; +} 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 index 41b33be6e..13547d143 100644 --- 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 @@ -12,6 +12,9 @@ import lombok.Data; @Data public class MesMacToolUseVO { + @Schema(description = "id") + private Long id; + @Schema(description = "工序ID") private Long wpId; 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 cc3cc5105..57d24b8d7 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 @@ -3,18 +3,23 @@ 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 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.dto.MesMacToolUseDTO; -import org.springblade.desk.produce.pojo.entity.MacToolUse; +import org.springblade.desk.produce.pojo.dto.SaveMacToolUseDto; +import org.springblade.desk.produce.pojo.vo.BindModelVO; import org.springblade.desk.produce.pojo.vo.MesMacToolUseVO; import org.springblade.desk.produce.service.IMacToolUseService; +import org.springblade.desk.produce.service.IPdaLoadService; import org.springframework.web.bind.annotation.*; +import java.util.List; /** * 同炉（槽）查询 控制器 * @@ -28,6 +33,8 @@ import org.springframework.web.bind.annotation.*; public class WorkProcessController extends BladeController { private final IMacToolUseService macToolUseService; + + private final IPdaLoadService pdaLoadService; @GetMapping("/queryData") @ApiOperationSupport(order = 1) @Operation(summary = "分页", description = "传入macToolUse") @@ -36,4 +43,45 @@ public class WorkProcessController extends BladeController { return R.data(pages); } + @GetMapping("/getMacToolUseByWpId") + @Operation(summary = "根据wpId获取绑定记录", description = "传入wpId") + public R> getMacToolUseByWpId(Long wpId) { + return R.data(macToolUseService.getMacToolUseByWpId(wpId)); + } + + @PostMapping("/remove") + @Operation(summary = "删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(macToolUseService.removeByIds(Func.toLongList(ids))); + } + + @GetMapping("/getCurrentWorkPlan") + @Operation(summary = "查询当前工序信息", description = "传入cardNo") + public R getCurrentWorkPlan(String cardNo) { + return R.data(pdaLoadService.getCurrentWorkPlan(cardNo)); + } + + @GetMapping("/getBindMacToolUseByRsCode") + @Operation(summary = "根据挂具号查询设备已绑定记录") + public R getBindMacToolUseByRsCode(String rsCode) { + return R.data(macToolUseService.getBindMacToolUseByRsCode(rsCode)); + } + + @GetMapping("/getBindMacToolUseByFsCode") + @Operation(summary = "根据挂具号查询设备已绑定记录") + public R getBindMacToolUseByFsCode(String fsCode) { + return R.data(macToolUseService.getBindMacToolUseByFsCode(fsCode)); + } + + @GetMapping("/getBindMacToolUseByDeviceCode") + @Operation(summary = "根据挂具号查询设备已绑定记录") + public R getBindMacToolUseByDeviceCode(String deviceCode) { + return R.data(macToolUseService.getBindMacToolUseByDeviceCode(deviceCode)); + } + + @PostMapping("/saveMacToolUse") + @Operation(summary = "新增绑定记录") + public R saveMacToolUse(@RequestBody SaveMacToolUseDto saveMacToolUseDto) { + return R.status(macToolUseService.saveMacToolUse(saveMacToolUseDto)); + } } 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 9bfb9071d..d34fa261b 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 @@ -43,4 +43,12 @@ public interface MacToolUseMapper extends BaseMapper { * 更新作业计划打印标记类型 */ void updatePrintType(String deviceCode, String hangNum, String mtnCode); + + List getMacToolUseByWpId(Long wpId); + + List getBindMacToolUseByRsCode(String rsCode); + + List getBindMacToolUseByFsCode(String fsCode); + + List getBindMacToolUseByDeviceCode(String deviceCode); } 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 40c8afb48..03182225e 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 @@ -205,6 +205,97 @@ AND a.is_deleted = 0 GROUP BY b.DEVICE_CODE, b.CATEGORYS, a.HANG_NUM, a.MTN_CODE + + + + UPDATE MES_WORK_PLAN a SET a.PRINT_TYPE = 1 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 0d458baed..b69fe87b4 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 @@ -3,6 +3,7 @@ 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.dto.SaveMacToolUseDto; import org.springblade.desk.produce.pojo.entity.MacToolUse; import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity; import org.springblade.desk.produce.pojo.entity.WorkOrder; @@ -87,4 +88,14 @@ public interface IMacToolUseService extends BaseService { * 查询所有未解绑的数据 */ List listByNoFinished(); + + List getMacToolUseByWpId(Long wpId); + + MesMacToolUseVO getBindMacToolUseByRsCode(String rsCode); + + MesMacToolUseVO getBindMacToolUseByFsCode(String fsCode); + + MesMacToolUseVO getBindMacToolUseByDeviceCode(String deviceCode); + + boolean saveMacToolUse(SaveMacToolUseDto saveMacToolUseDto); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java index 17c7ad37e..35281ef45 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java @@ -83,4 +83,5 @@ public interface IPdaLoadService extends BaseService { Object epDosingRecByCode(String code); + BindModelVO getCurrentWorkPlan(String cardNo); } 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 8d6869515..0e35439f5 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 @@ -11,7 +11,9 @@ import com.google.common.collect.Lists; import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity; import org.springblade.desk.dashboard.service.IBsProcessSetService; import org.springblade.desk.device.pojo.entity.EquipmentEntity; @@ -21,6 +23,7 @@ import org.springblade.desk.device.service.IRackSetService; import org.springblade.desk.energy.util.HttpRequestService; import org.springblade.desk.produce.mapper.MacToolUseMapper; import org.springblade.desk.produce.pojo.dto.MesMacToolUseDTO; +import org.springblade.desk.produce.pojo.dto.SaveMacToolUseDto; import org.springblade.desk.produce.pojo.entity.MacToolUse; import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity; import org.springblade.desk.produce.pojo.entity.WorkOrder; @@ -353,6 +356,51 @@ public class MacToolUseServiceImpl extends BaseServiceImpl getMacToolUseByWpId(Long wpId) { + return baseMapper.getMacToolUseByWpId(wpId); + } + + @Override + public MesMacToolUseVO getBindMacToolUseByRsCode(String rsCode) { + List list = baseMapper.getBindMacToolUseByRsCode(rsCode); + return CollectionUtils.isEmpty(list) ? null : list.get(0); + } + + @Override + public MesMacToolUseVO getBindMacToolUseByFsCode(String fsCode) { + List list = baseMapper.getBindMacToolUseByFsCode(fsCode); + return CollectionUtils.isEmpty(list) ? null : list.get(0); + } + + @Override + public MesMacToolUseVO getBindMacToolUseByDeviceCode(String deviceCode) { + List list = baseMapper.getBindMacToolUseByDeviceCode(deviceCode); + return CollectionUtils.isEmpty(list) ? null : list.get(0); + } + + @Override + public boolean saveMacToolUse(SaveMacToolUseDto saveMacToolUseDto) { + if (saveMacToolUseDto.getWpId() == null) { + throw new ServiceException("请扫描需要绑定订单"); + } + MacToolUse macToolUse = this.getById(saveMacToolUseDto.getToolId()); + if (macToolUse == null) { + throw new ServiceException("绑定记录异常"); + } + MacToolUse newMacToolUse = new MacToolUse(); + newMacToolUse.setWpId(saveMacToolUseDto.getWpId()); + newMacToolUse.setMtnCode(macToolUse.getMtnCode()); + newMacToolUse.setBsRackSet(macToolUse.getBsRackSet()); + newMacToolUse.setEquipmentCard(macToolUse.getEquipmentCard()); + newMacToolUse.setBsFeiBaSet(macToolUse.getBsFeiBaSet()); + newMacToolUse.setHangNum(macToolUse.getHangNum()); + newMacToolUse.setFinished(0); + newMacToolUse.setCreateMan(AuthUtil.getUserId()); + newMacToolUse.setBindTime(new Date()); + return this.save(newMacToolUse); + } + private Double setMaxHeat(Map eUMap, JSONObject jsonObject, Double heat) { if (eUMap.get(heat1) != null) { if (jsonObject.getString(eUMap.get(heat1).getString("attrCode")) != null && Double.valueOf(jsonObject.getString(eUMap.get(heat1).getString("attrCode"))) > heat) { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java index a22ac686a..21e1731a2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java @@ -562,4 +562,18 @@ public class PdaLoadServiceImpl extends BaseServiceImpl 0) { + throw new ServiceException("当前工单已存在绑定记录！"); + } + return this.createBindModel(workPlan); + } + }