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/service/impl/ProductProcessServiceImpl.java | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 116 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 e44ae02..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,21 +1,44 @@
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.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;
import com.ruoyi.production.mapper.ProductProcessMapper;
+import com.ruoyi.production.mapper.ProductProcessRouteItemMapper;
+import com.ruoyi.production.pojo.ProcessRouteItem;
import com.ruoyi.production.pojo.ProductProcess;
+import com.ruoyi.production.pojo.ProductProcessRouteItem;
import com.ruoyi.production.service.ProductProcessService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
@Service
public class ProductProcessServiceImpl extends ServiceImpl<ProductProcessMapper, ProductProcess> implements ProductProcessService {
@Autowired
private ProductProcessMapper productProcessMapper;
+ @Autowired
+ private ProcessRouteItemMapper processRouteItemMapper;
+ @Autowired
+ private ProductProcessRouteItemMapper productProcessRouteItemMapper;
+ @Autowired
+ private DeviceLedgerMapper deviceLedgerMapper;
@Override
public IPage<ProductProcessDto> listPage(Page page, ProductProcessDto productProcessDto) {
@@ -27,7 +50,7 @@
ProductProcess productProcess = new ProductProcess();
BeanUtils.copyProperties(productProcessDto,productProcess);
boolean save = productProcessMapper.insert(productProcess) > 0;
- if (save) {
+ if (save && ObjectUtils.isNull(productProcessDto.getNo())) {
// 鏍规嵁id鐢熸垚no瀛楁锛欸X + 8浣嶆暟瀛楋紙涓嶈冻8浣嶅墠闈㈣ˉ0锛�
String no = "GX" + String.format("%08d", productProcess.getId());
productProcess.setNo(no);
@@ -35,6 +58,97 @@
productProcessMapper.updateById(productProcess);
return AjaxResult.success();
}
- return AjaxResult.error();
+ return AjaxResult.success();
+ }
+
+ @Override
+ public AjaxResult importData(MultipartFile file) {
+ try {
+ ExcelUtil<ProductProcess> util = new ExcelUtil<ProductProcess>(ProductProcess.class);
+ List<ProductProcess> productProcessList = util.importExcel(file.getInputStream());
+ 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(e.getMessage());
+ }
+ }
+
+ @Override
+ public String batchDelete(List<Integer> ids) {
+ //鏌ヨ鏄惁鐢熶骇涓凡缁忓紩鐢ㄤ簡杩欎簺宸ュ簭
+ List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(Wrappers.<ProcessRouteItem>lambdaQuery().in(ProcessRouteItem::getProcessId, ids));
+ List<ProductProcessRouteItem> productProcessRouteItems = productProcessRouteItemMapper.selectList(Wrappers.<ProductProcessRouteItem>lambdaQuery().in(ProductProcessRouteItem::getProcessId, ids));
+ if (!CollectionUtils.isEmpty(processRouteItems) || !CollectionUtils.isEmpty(productProcessRouteItems)){
+ throw new RuntimeException("璇ュ伐搴忓凡缁忚浣跨敤锛屾棤娉曞垹闄�");
+ }
+ 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