From 2ade8a95ed3a9a870a620369bda58a35d37f0508 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 24 三月 2026 17:52:49 +0800
Subject: [PATCH] feat: 工序增加设备绑定功能
---
src/main/java/com/ruoyi/production/controller/ProductProcessController.java | 25 ++++++++++--
src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java | 64 +++++++++++++++++++++++++++++++
src/main/java/com/ruoyi/production/dto/ProductProcessDto.java | 7 ++-
src/main/java/com/ruoyi/production/pojo/ProductProcess.java | 2 +
src/main/java/com/ruoyi/production/service/ProductProcessService.java | 7 +++
5 files changed, 98 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductProcessController.java b/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
index c25f2cc..f16fd73 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
@@ -2,14 +2,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.oA.pojo.OaProject;
import com.ruoyi.production.dto.ProductProcessDto;
import com.ruoyi.production.pojo.ProductProcess;
import com.ruoyi.production.service.impl.ProductProcessServiceImpl;
@@ -17,7 +14,6 @@
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -83,4 +79,25 @@
ExcelUtil<ProductProcess> util = new ExcelUtil<ProductProcess>(ProductProcess.class);
util.importTemplateExcel(response, "宸ュ簭妯℃澘");
}
+
+ @PostMapping("/bindDevices")
+ @Log(title = "宸ュ簭-缁戝畾璁惧", businessType = BusinessType.UPDATE)
+ @ApiOperation("宸ュ簭-缁戝畾璁惧")
+ public AjaxResult bindDevices(@RequestParam Long processId, @RequestBody List<Long> deviceIds) {
+ return productProcessService.bindDevices(processId, deviceIds);
+ }
+
+ @GetMapping("/getBindDevices")
+ @Log(title = "宸ュ簭-鏌ヨ缁戝畾鐨勮澶�", businessType = BusinessType.OTHER)
+ @ApiOperation("宸ュ簭-鏌ヨ缁戝畾鐨勮澶�")
+ public AjaxResult getBindDevices(@RequestParam Long processId) {
+ return AjaxResult.success(productProcessService.getBindDevices(processId));
+ }
+
+ @DeleteMapping("/unbindDevice")
+ @Log(title = "宸ュ簭-瑙ｉ櫎璁惧缁戝畾", businessType = BusinessType.DELETE)
+ @ApiOperation("宸ュ簭-瑙ｉ櫎璁惧缁戝畾")
+ public AjaxResult unbindDevice(@RequestParam Long processId, @RequestParam Long deviceId) {
+ return productProcessService.unbindDevice(processId, deviceId);
+ }
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductProcessDto.java b/src/main/java/com/ruoyi/production/dto/ProductProcessDto.java
index 7383a82..4c0338e 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductProcessDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductProcessDto.java
@@ -1,13 +1,16 @@
package com.ruoyi.production.dto;
+import java.util.List;
+
import com.ruoyi.production.pojo.ProductProcess;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.math.BigDecimal;
-
@Data
@ApiModel
public class ProductProcessDto extends ProductProcess {
+
+ @ApiModelProperty(value = "缁戝畾鐨勮澶嘔D鍒楄〃")
+ private List<Long> deviceIdList;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index e55ab4f..a02ec2d 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -78,5 +78,7 @@
@ApiModelProperty(value ="鏄惁璐ㄦ")
private Boolean isQuality;
+ @ApiModelProperty(value = "缁戝畾鐨勮澶嘔D鍒楄〃(JSON鏍煎紡)")
+ private String deviceIds;
}
diff --git a/src/main/java/com/ruoyi/production/service/ProductProcessService.java b/src/main/java/com/ruoyi/production/service/ProductProcessService.java
index 8b61bdd..05f8aeb 100644
--- a/src/main/java/com/ruoyi/production/service/ProductProcessService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductProcessService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.pojo.DeviceRepair;
+import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.production.dto.*;
import com.ruoyi.production.pojo.ProductProcess;
@@ -25,4 +26,10 @@
AjaxResult importData(MultipartFile file);
String batchDelete(List<Integer> ids);
+
+ AjaxResult bindDevices(Long processId, List<Long> deviceIds);
+
+ AjaxResult unbindDevice(Long processId, Long deviceId);
+
+ List<DeviceLedger> getBindDevices(Long processId);
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
index 3be9086..4db17bf 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
@@ -1,12 +1,15 @@
package com.ruoyi.production.service.impl;
+import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.device.mapper.DeviceLedgerMapper;
+import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.production.dto.ProductProcessDto;
import com.ruoyi.production.mapper.ProcessRouteItemMapper;
@@ -22,6 +25,8 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
@Service
@@ -32,6 +37,8 @@
private ProcessRouteItemMapper processRouteItemMapper;
@Autowired
private ProductProcessRouteItemMapper productProcessRouteItemMapper;
+ @Autowired
+ private DeviceLedgerMapper deviceLedgerMapper;
@Override
public IPage<ProductProcessDto> listPage(Page page, ProductProcessDto productProcessDto) {
@@ -89,4 +96,59 @@
productProcessMapper.deleteBatchIds(ids);
return null;
}
+
+ @Override
+ public AjaxResult bindDevices(Long processId, List<Long> deviceIds) {
+ ProductProcess productProcess = productProcessMapper.selectById(processId);
+ if (productProcess == null) {
+ return AjaxResult.error("宸ュ簭涓嶅瓨鍦�");
+ }
+ String deviceIdsJson = productProcess.getDeviceIds();
+ // 鑾峰彇宸叉湁鐨勮澶嘔D鍒楄〃
+ List<Long> existingDeviceIds = Collections.emptyList();
+ if (StringUtils.isNotEmpty(deviceIdsJson)) {
+ existingDeviceIds = JSON.parseArray(deviceIdsJson, Long.class);
+ }
+ // 鍚堝苟璁惧ID锛堝幓閲嶏級
+ List<Long> mergedDeviceIds = new ArrayList<>(existingDeviceIds);
+ for (Long deviceId : deviceIds) {
+ if (!mergedDeviceIds.contains(deviceId)) {
+ mergedDeviceIds.add(deviceId);
+ }
+ }
+ deviceIdsJson = JSON.toJSONString(mergedDeviceIds);
+ productProcess.setDeviceIds(deviceIdsJson);
+ productProcessMapper.updateById(productProcess);
+ return AjaxResult.success();
+ }
+
+ @Override
+ public AjaxResult unbindDevice(Long processId, Long deviceId) {
+ ProductProcess productProcess = productProcessMapper.selectById(processId);
+ if (productProcess == null) {
+ return AjaxResult.error("宸ュ簭涓嶅瓨鍦�");
+ }
+ if (productProcess.getDeviceIds() == null || productProcess.getDeviceIds().isEmpty()) {
+ return AjaxResult.success();
+ }
+ List<Long> existingDeviceIds = JSON.parseArray(productProcess.getDeviceIds(), Long.class);
+ existingDeviceIds.remove(deviceId);
+ String deviceIdsJson = JSON.toJSONString(existingDeviceIds);
+ productProcess.setDeviceIds(deviceIdsJson);
+ productProcessMapper.updateById(productProcess);
+ return AjaxResult.success();
+ }
+
+ @Override
+ public List<DeviceLedger> getBindDevices(Long processId) {
+ ProductProcess productProcess = productProcessMapper.selectById(processId);
+ if (productProcess == null || productProcess.getDeviceIds() == null) {
+ return Collections.emptyList();
+ }
+ List<Long> deviceIdList = JSON.parseArray(productProcess.getDeviceIds(), Long.class);
+ if (CollectionUtils.isEmpty(deviceIdList)) {
+ return Collections.emptyList();
+ }
+ return deviceLedgerMapper.selectBatchIds(deviceIdList);
+ }
}
--
Gitblit v1.9.3