From 472d3a889984e88e17524431b48d17f19da57ad6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 24 三月 2026 17:52:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材

---
 src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java |   74 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 72 insertions(+), 2 deletions(-)

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 71e41ce..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) {
@@ -62,11 +69,19 @@
             if(CollectionUtils.isEmpty(productProcessList)){
                 return AjaxResult.warn("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
             }
+            productProcessList.forEach(productProcess -> {
+                if (ObjectUtils.isEmpty(productProcess)) {
+                    throw new RuntimeException("浣跨敤妯℃澘杩涜瀵煎叆");
+                }
+                if (ObjectUtils.isEmpty(productProcess.getName())) {
+                    throw new RuntimeException("宸ュ簭鍚嶇О涓嶈兘涓虹┖");
+                }
+            });
             this.saveOrUpdateBatch(productProcessList);
             return AjaxResult.success(true);
         }catch (Exception e){
             e.printStackTrace();
-            return AjaxResult.error("瀵煎叆澶辫触");
+            return AjaxResult.error(e.getMessage());
         }
     }
 
@@ -81,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