set = new LinkedHashSet<>();
+ set.add(templateFileName);
+ // 模版 / 模板 常见混用
+ if (templateFileName.contains("模版")) {
+ set.add(templateFileName.replace("模版", "模板"));
+ }
+ if (templateFileName.contains("模板")) {
+ set.add(templateFileName.replace("模板", "模版"));
+ }
+ if (templateFileName.startsWith("jpg/")) {
+ String name = templateFileName.substring("jpg/".length());
+ set.add("EXCEL模板/" + name);
+ if (name.contains("模版")) {
+ set.add("EXCEL模板/" + name.replace("模版", "模板"));
+ }
+ }
+ return new ArrayList<>(set);
+ }
+
+ private static byte[] readClasspathBytes(ClassLoader loader, String resourcePath) {
+ // 不用 ClassPathResource.exists()：部分环境下对依赖 jar / 中文路径会误判不存在
+ try (InputStream in = loader.getResourceAsStream(resourcePath)) {
+ if (in == null) {
+ return null;
+ }
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ byte[] buf = new byte[8192];
+ int n;
+ while ((n = in.read(buf)) != -1) {
+ out.write(buf, 0, n);
+ }
+ return out.toByteArray();
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ private static byte[] validateXlsxBytes(byte[] bytes, String templateFileName) throws IOException {
+ if (bytes == null || bytes.length < 4 || bytes[0] != 0x50 || bytes[1] != 0x4B) {
+ throw new IOException("Excel模板不是有效的xlsx文件: " + templateFileName
+ + ", size=" + (bytes == null ? -1 : bytes.length));
+ }
+ return bytes;
}
private static String sanitizeSheetName(String name) {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
index 4133e21..e38de44 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
@@ -1,25 +1,21 @@
package com.ruoyi.common.utils;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.SimpleCache;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReflectUtil;
-import cn.hutool.core.util.StrUtil;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.springframework.cglib.beans.BeanCopier;
-import org.springframework.cglib.beans.BeanMap;
-import org.springframework.cglib.core.Converter;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/**
- * bean深拷贝工具(基于 cglib 性能优异)
+ * bean深拷贝工具
*
- * 重点 cglib 不支持 拷贝到链式对象
+ * 重点 不支持 拷贝到链式对象
* 例如: 源对象 拷贝到 目标(链式对象)
* 请区分好`浅拷贝`和`深拷贝`再做使用
*
@@ -60,8 +56,7 @@ public class BeanCopyUtils {
if (ObjectUtil.isNull(desc)) {
return null;
}
- BeanCopier beanCopier = BeanCopierCache.INSTANCE.get(source.getClass(), desc.getClass(), null);
- beanCopier.copy(source, desc, null);
+ BeanUtil.copyProperties(source, desc);
return desc;
}
@@ -92,12 +87,11 @@ public class BeanCopyUtils {
* @param bean 数据来源实体
* @return map对象
*/
- @SuppressWarnings("unchecked")
public static Map copyToMap(T bean) {
if (ObjectUtil.isNull(bean)) {
return null;
}
- return BeanMap.create(bean);
+ return BeanUtil.beanToMap(bean);
}
/**
@@ -132,7 +126,7 @@ public class BeanCopyUtils {
if (ObjectUtil.isNull(bean)) {
return null;
}
- BeanMap.create(bean).putAll(map);
+ BeanUtil.fillBeanWithMap(map, bean, false);
return bean;
}
@@ -155,50 +149,4 @@ public class BeanCopyUtils {
return copyMap;
}
- /**
- * BeanCopier属性缓存
- * 缓存用于防止多次反射造成的性能问题
- *
- * @author Looly
- * @since 5.4.1
- */
- public enum BeanCopierCache {
- /**
- * BeanCopier属性缓存单例
- */
- INSTANCE;
-
- private final SimpleCache cache = new SimpleCache<>();
-
- /**
- * 获得类与转换器生成的key在{@link BeanCopier}的Map中对应的元素
- *
- * @param srcClass 源Bean的类
- * @param targetClass 目标Bean的类
- * @param converter 转换器
- * @return Map中对应的BeanCopier
- */
- public BeanCopier get(Class srcClass, Class targetClass, Converter converter) {
- final String key = genKey(srcClass, targetClass, converter);
- return cache.get(key, () -> BeanCopier.create(srcClass, targetClass, converter != null));
- }
-
- /**
- * 获得类与转换器生成的key
- *
- * @param srcClass 源Bean的类
- * @param targetClass 目标Bean的类
- * @param converter 转换器
- * @return 属性名和Map映射的key
- */
- private String genKey(Class srcClass, Class targetClass, Converter converter) {
- final StringBuilder key = StrUtil.builder()
- .append(srcClass.getName()).append('#').append(targetClass.getName());
- if (null != converter) {
- key.append('#').append(converter.getClass().getName());
- }
- return key.toString();
- }
- }
-
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/FtpUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/FtpUtil.java
index fc68914..0bcb5ce 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/FtpUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/FtpUtil.java
@@ -16,6 +16,9 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Predicate;
@Slf4j
public final class FtpUtil {
@@ -138,6 +141,86 @@ public final class FtpUtil {
remoteDir, localDir, fileNameFilter);
}
+ /**
+ * 在远程目录（含全部子目录）中查找并下载第一个匹配的文件。
+ * 目录不存在时返回失败（与整目录递归下载「视为空」不同）。
+ */
+ public static R downloadMatchingFileRecursive(DrawingFtpProperties.Endpoint ftp, String remoteDir,
+ String localDir, Predicate fileNameMatcher) {
+ if (fileNameMatcher == null) {
+ return R.fail("文件匹配规则不能为空");
+ }
+ FTPClient ftpClient = null;
+ try {
+ ftpClient = getFTPClient(ftp.getHost(), ftp.getUsername(), ftp.getPassword(), ftp.getPort());
+ if (ftpClient == null || !ftpClient.isConnected()) {
+ return R.fail("FTP连接失败 " + ftp.getHost() + ":" + ftp.getPort());
+ }
+ String dir = normalizeRemotePath(remoteDir);
+ log.info("FTP 递归匹配下载 {}:{} dir={}", ftp.getHost(), ftp.getPort(), dir);
+ if (!changeWorkingDirectoryWithEncoding(ftpClient, dir)) {
+ return R.fail("远程目录不存在: " + dir + " (reply=" + ftpClient.getReplyString().trim() + ")");
+ }
+ File localDirectory = new File(localDir);
+ if (!localDirectory.exists() && !localDirectory.mkdirs()) {
+ return R.fail("无法创建本地目录: " + localDir);
+ }
+ String saved = findAndDownloadMatching(ftpClient, dir, localDirectory, fileNameMatcher);
+ if (saved == null) {
+ return R.fail("远程目录中未找到匹配文件 (dir=" + dir + ")");
+ }
+ return R.ok(saved);
+ } catch (Exception e) {
+ log.error("FTP递归匹配下载异常 dir={}", remoteDir, e);
+ return R.fail("下载失败: " + e.getMessage());
+ } finally {
+ disconnectQuietly(ftpClient);
+ }
+ }
+
+ private static String findAndDownloadMatching(FTPClient ftp, String remoteDir, File localDir,
+ Predicate fileNameMatcher) throws IOException {
+ if (!changeWorkingDirectoryWithEncoding(ftp, remoteDir)) {
+ return null;
+ }
+ FTPFile[] files = ftp.listFiles();
+ if (files == null || files.length == 0) {
+ return null;
+ }
+ List subDirs = new ArrayList<>();
+ for (FTPFile file : files) {
+ String name = file.getName();
+ if (name == null || ".".equals(name) || "..".equals(name)) {
+ continue;
+ }
+ if (file.isDirectory()) {
+ subDirs.add(name);
+ continue;
+ }
+ if (!fileNameMatcher.test(name)) {
+ continue;
+ }
+ File localFile = new File(localDir, name);
+ try (OutputStream os = Files.newOutputStream(localFile.toPath())) {
+ if (retrieveFileWithEncoding(ftp, name, os)) {
+ log.info("FTP匹配下载成功: {}/{} -> {}", remoteDir, name, localFile.getAbsolutePath());
+ return name;
+ }
+ Files.deleteIfExists(localFile.toPath());
+ log.warn("FTP匹配下载失败: {}/{} reply={}", remoteDir, name, ftp.getReplyString());
+ return null;
+ }
+ }
+ for (String name : subDirs) {
+ String childRemote = normalizeRemotePath(remoteDir + "/" + name);
+ String saved = findAndDownloadMatching(ftp, childRemote, localDir, fileNameMatcher);
+ if (saved != null) {
+ return saved;
+ }
+ }
+ return null;
+ }
+
/**
* 出图 Excel 远程目录：basePath（如 F:） + 年份 + 生产令号，与 SMB 路径 F:\2026\令号 一致。
*/
@@ -258,6 +341,9 @@ public final class FtpUtil {
FTPFile[] files = ftpClient.listFiles();
if (files == null || files.length == 0) {
+ if (fileNameFilter != null && !fileNameFilter.isEmpty()) {
+ return R.fail("远程目录为空，未找到文件: " + fileNameFilter + " (dir=" + remoteDir + ")");
+ }
return R.ok("远程目录为空，无需下载");
}
@@ -270,7 +356,8 @@ public final class FtpUtil {
if (fileName.startsWith(".") || file.isDirectory()) {
continue;
}
- if (fileNameFilter != null && !fileNameFilter.isEmpty() && !fileName.contains(fileNameFilter)) {
+ if (fileNameFilter != null && !fileNameFilter.isEmpty()
+ && !fileNameMatchesFilter(fileName, fileNameFilter)) {
continue;
}
totalCount++;
@@ -312,6 +399,191 @@ public final class FtpUtil {
disconnectQuietly(ftpClient);
}
+ /**
+ * 递归下载远程目录（含全部子目录）到本地。远程目录不存在时返回成功（视为空）。
+ */
+ public static R downloadFtpDirectoryRecursive(DrawingFtpProperties.Endpoint ftp, String remoteDir,
+ String localDir) {
+ FTPClient ftpClient = null;
+ try {
+ ftpClient = getFTPClient(ftp.getHost(), ftp.getUsername(), ftp.getPassword(), ftp.getPort());
+ if (ftpClient == null || !ftpClient.isConnected()) {
+ return R.fail("FTP连接失败 " + ftp.getHost() + ":" + ftp.getPort());
+ }
+ return downloadFtpDirectoryRecursive(ftpClient, remoteDir, localDir);
+ } catch (Exception e) {
+ log.error("FTP递归下载异常 dir={}", remoteDir, e);
+ return R.fail("下载失败: " + e.getMessage());
+ } finally {
+ disconnectQuietly(ftpClient);
+ }
+ }
+
+ public static R downloadFtpDirectoryRecursive(FTPClient ftpClient, String remoteDir, String localDir) {
+ if (ftpClient == null || !ftpClient.isConnected()) {
+ return R.fail("FTP连接不可用");
+ }
+ String dir = normalizeRemotePath(remoteDir);
+ try {
+ if (!changeWorkingDirectoryWithEncoding(ftpClient, dir)) {
+ log.info("FTP 远程目录不存在，跳过下载: {}", dir);
+ return R.ok("远程目录不存在，无需下载: " + dir);
+ }
+ int count = downloadTree(ftpClient, dir, localDir);
+ return R.ok("递归下载完成，文件数=" + count + " dir=" + dir);
+ } catch (Exception e) {
+ log.error("FTP递归下载异常 dir={}", dir, e);
+ return R.fail("下载失败: " + e.getMessage());
+ }
+ }
+
+ /**
+ * 删除远程目录内全部文件与子目录，保留该目录本身。目录不存在视为已清理。
+ */
+ public static R deleteRemoteDirectoryContents(DrawingFtpProperties.Endpoint ftp, String remoteDir) {
+ FTPClient ftpClient = null;
+ try {
+ ftpClient = getFTPClient(ftp.getHost(), ftp.getUsername(), ftp.getPassword(), ftp.getPort());
+ if (ftpClient == null || !ftpClient.isConnected()) {
+ return R.fail("FTP连接失败 " + ftp.getHost() + ":" + ftp.getPort());
+ }
+ return deleteRemoteDirectoryContents(ftpClient, remoteDir);
+ } catch (Exception e) {
+ log.error("FTP清理远程目录异常 dir={}", remoteDir, e);
+ return R.fail("清理远程目录失败: " + e.getMessage());
+ } finally {
+ disconnectQuietly(ftpClient);
+ }
+ }
+
+ public static R deleteRemoteDirectoryContents(FTPClient ftpClient, String remoteDir) {
+ if (ftpClient == null || !ftpClient.isConnected()) {
+ return R.fail("FTP连接不可用");
+ }
+ String dir = normalizeRemotePath(remoteDir);
+ try {
+ if (!changeWorkingDirectoryWithEncoding(ftpClient, dir)) {
+ log.info("FTP 远程目录不存在，跳过删除: {}", dir);
+ return R.ok("远程目录不存在，无需删除: " + dir);
+ }
+ int count = deleteListedContents(ftpClient, dir);
+ return R.ok("已清理远程出图目录，删除 " + count + " 项: " + dir);
+ } catch (Exception e) {
+ log.error("FTP清理远程目录异常 dir={}", dir, e);
+ return R.fail("清理远程目录失败: " + e.getMessage());
+ }
+ }
+
+ private static int downloadTree(FTPClient ftp, String remoteDir, String localDir) throws IOException {
+ if (!changeWorkingDirectoryWithEncoding(ftp, remoteDir)) {
+ throw new IOException("远程目录不存在: " + remoteDir);
+ }
+ File local = new File(localDir);
+ if (!local.exists() && !local.mkdirs()) {
+ throw new IOException("无法创建本地目录: " + localDir);
+ }
+ FTPFile[] files = ftp.listFiles();
+ if (files == null || files.length == 0) {
+ return 0;
+ }
+ int count = 0;
+ List subDirs = new ArrayList<>();
+ for (FTPFile file : files) {
+ String name = file.getName();
+ if (name == null || ".".equals(name) || "..".equals(name)) {
+ continue;
+ }
+ if (file.isDirectory()) {
+ subDirs.add(name);
+ continue;
+ }
+ File localFile = new File(local, name);
+ try (OutputStream os = Files.newOutputStream(localFile.toPath())) {
+ if (retrieveFileWithEncoding(ftp, name, os)) {
+ count++;
+ log.info("FTP递归下载成功: {}/{}", remoteDir, name);
+ } else {
+ Files.deleteIfExists(localFile.toPath());
+ log.warn("FTP递归下载失败: {}/{} reply={}", remoteDir, name, ftp.getReplyString());
+ }
+ }
+ }
+ for (String name : subDirs) {
+ String childRemote = normalizeRemotePath(remoteDir + "/" + name);
+ String childLocal = new File(local, name).getAbsolutePath();
+ count += downloadTree(ftp, childRemote, childLocal);
+ }
+ return count;
+ }
+
+ private static int deleteListedContents(FTPClient ftp, String absDir) throws IOException {
+ if (!changeWorkingDirectoryWithEncoding(ftp, absDir)) {
+ return 0;
+ }
+ FTPFile[] files = ftp.listFiles();
+ if (files == null || files.length == 0) {
+ return 0;
+ }
+ int count = 0;
+ List subDirs = new ArrayList<>();
+ List fileNames = new ArrayList<>();
+ for (FTPFile file : files) {
+ String name = file.getName();
+ if (name == null || ".".equals(name) || "..".equals(name)) {
+ continue;
+ }
+ if (file.isDirectory()) {
+ subDirs.add(name);
+ } else {
+ fileNames.add(name);
+ }
+ }
+ for (String name : fileNames) {
+ if (deleteFileWithEncoding(ftp, name)) {
+ count++;
+ log.info("FTP已删除文件: {}/{}", absDir, name);
+ } else {
+ log.warn("FTP删除文件失败: {}/{} reply={}", absDir, name, ftp.getReplyString());
+ }
+ }
+ for (String name : subDirs) {
+ String child = normalizeRemotePath(absDir + "/" + name);
+ count += deleteListedContents(ftp, child);
+ changeWorkingDirectoryWithEncoding(ftp, absDir);
+ if (removeDirectoryWithEncoding(ftp, name)) {
+ count++;
+ log.info("FTP已删除目录: {}", child);
+ } else {
+ log.warn("FTP删除目录失败: {} reply={}", child, ftp.getReplyString());
+ }
+ }
+ return count;
+ }
+
+ private static boolean deleteFileWithEncoding(FTPClient ftpClient, String fileName) throws IOException {
+ if (ftpClient.deleteFile(fileName)) {
+ return true;
+ }
+ String gbkIso = new String(fileName.getBytes("GBK"), SERVER_CHARSET);
+ if (ftpClient.deleteFile(gbkIso)) {
+ return true;
+ }
+ String utf8Iso = new String(fileName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1);
+ return ftpClient.deleteFile(utf8Iso);
+ }
+
+ private static boolean removeDirectoryWithEncoding(FTPClient ftpClient, String dir) throws IOException {
+ if (ftpClient.removeDirectory(dir)) {
+ return true;
+ }
+ String gbkIso = new String(dir.getBytes("GBK"), SERVER_CHARSET);
+ if (ftpClient.removeDirectory(gbkIso)) {
+ return true;
+ }
+ String utf8Iso = new String(dir.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1);
+ return ftpClient.removeDirectory(utf8Iso);
+ }
+
private static String combineRemotePath(String basePath, String filePath) {
String base = basePath == null ? "" : basePath.trim();
String rel = filePath == null ? "" : filePath.trim();
@@ -417,6 +689,16 @@ public final class FtpUtil {
return ftpClient.retrieveFile(utf8Iso, os);
}
+ /**
+ * 目录扫描按文件名精确匹配。不能用 contains，否则「图纸数量统计表.xlsx」会命中其它令号的「令号图纸数量统计表.xlsx」。
+ */
+ private static boolean fileNameMatchesFilter(String fileName, String fileNameFilter) {
+ if (fileName == null || fileNameFilter == null) {
+ return false;
+ }
+ return fileName.equalsIgnoreCase(fileNameFilter);
+ }
+
private static boolean changeWorkingDirectoryWithEncoding(FTPClient ftpClient, String remoteDir)
throws IOException {
if (ftpClient.changeWorkingDirectory(remoteDir)) {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/KingdeeRouteDepartmentHelper.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/KingdeeRouteDepartmentHelper.java
index 8e0c331..2a2cfee 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/KingdeeRouteDepartmentHelper.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/KingdeeRouteDepartmentHelper.java
@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
* WC000002 机二工段 → 006 机加车间
* WC000004 装一工段 → 007 装配车间
* WC000005 装二工段 → 007 装配车间
- * WC000006 电钳工段 → 007 装配车间
+ * WC000006 电钳工段 → 023 电钳车间
* WC000007 下料工段 → 006 机加车间
* WC000008 委外中心 → 006 机加车间
* WC000010 下料工段 → 018 铆焊车间
@@ -31,16 +31,21 @@ public final class KingdeeRouteDepartmentHelper {
public static final String DEPT_ASSEMBLY = "007";
/** 铆焊车间 */
public static final String DEPT_RIVET_WELD = "018";
+ /** 电钳车间 */
+ public static final String DEPT_ELECTRICIAN = "023";
/** 006 机加车间 */
private static final Set MACHINE_WORKSHOP = setOf(
"机一工段", "机二工段", "机加委外");
/** 007 装配车间 */
private static final Set ASSEMBLY_WORKSHOP = setOf(
- "装一工段", "装二工段", "电钳工段","装配委外");
+ "装一工段", "装二工段", "装配委外");
/** 018 铆焊车间 */
private static final Set RIVET_WELD_WORKSHOP = setOf(
- "下料工段", "焊接工段","铆焊委外");
+ "下料工段", "焊接工段", "铆焊委外");
+ /** 023 电钳车间 */
+ private static final Set ELECTRICIAN_WORKSHOP = setOf(
+ "电钳工段");
public static final List ALLOWED_WORK_CENTERS;
static {
@@ -48,6 +53,7 @@ public final class KingdeeRouteDepartmentHelper {
all.addAll(MACHINE_WORKSHOP);
all.addAll(ASSEMBLY_WORKSHOP);
all.addAll(RIVET_WELD_WORKSHOP);
+ all.addAll(ELECTRICIAN_WORKSHOP);
ALLOWED_WORK_CENTERS = Collections.unmodifiableList(Arrays.asList(all.toArray(new String[0])));
}
@@ -72,6 +78,9 @@ public final class KingdeeRouteDepartmentHelper {
if (RIVET_WELD_WORKSHOP.contains(wc)) {
return DEPT_RIVET_WELD;
}
+ if (ELECTRICIAN_WORKSHOP.contains(wc)) {
+ return DEPT_ELECTRICIAN;
+ }
throw new ServiceException("不支持的工作中心「" + wc + "」，仅允许："
+ String.join("、", ALLOWED_WORK_CENTERS));
}
@@ -95,6 +104,9 @@ public final class KingdeeRouteDepartmentHelper {
if (DEPT_RIVET_WELD.equals(deptFNumber)) {
return "铆焊车间";
}
+ if (DEPT_ELECTRICIAN.equals(deptFNumber)) {
+ return "电钳车间";
+ }
return deptFNumber != null ? deptFNumber : "";
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/PDFDocHelper.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/PDFDocHelper.java
index ed7e6da..6a99857 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/PDFDocHelper.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/PDFDocHelper.java
@@ -8,10 +8,12 @@ import com.itextpdf.text.pdf.PdfStamper;
import org.apache.pdfbox.io.MemoryUsageSetting;
import org.apache.pdfbox.multipdf.PDFMergerUtility;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.file.Files;
+import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.util.List;
import java.util.Map;
@@ -132,7 +134,7 @@ public class PDFDocHelper {
}
/**
- * 在 PDF 第 1 页指定位置叠加文字（无图章），经临时文件替换原文件。
+ * 在 PDF 第 1 页指定位置叠加文字（无图章），就地覆盖原文件。
*/
public static void stampTextFirstPage(String pdfPath, List> reviews, float[] pswX, float[] pswY, int fontSize)
throws IOException, DocumentException {
@@ -140,23 +142,88 @@ public class PDFDocHelper {
}
/**
- * 在 PDF 第 1 页指定位置叠加文字（无图章），经临时文件替换原文件。
+ * 在 PDF 第 1 页指定位置叠加文字（无图章），就地覆盖原文件。
*
* @param rotation 逆时针旋转角度（伊特左栏竖排一般为 90）
*/
public static void stampTextFirstPage(String pdfPath, List> reviews, float[] pswX, float[] pswY,
int fontSize, float rotation) throws IOException, DocumentException {
- if (reviews == null || reviews.isEmpty()) {
+ File src = new File(pdfPath);
+ File result = stampTextFirstPage(src, readAllBytesWithRetry(src.toPath()), reviews, pswX, pswY, fontSize, rotation);
+ if (isSameFile(result, src)) {
return;
}
+ try {
+ if (!writeBytesWithRetry(src.toPath(), Files.readAllBytes(result.toPath()), 20)) {
+ throw new IOException("无法覆盖原文件: " + src.getAbsolutePath());
+ }
+ } finally {
+ Files.deleteIfExists(result.toPath());
+ }
+ }
+
+ /**
+ * 内存盖章后写回 {@code dest}。若 Windows 锁住原文件，则写入系统临时文件并返回该文件，
+ * 调用方用返回值继续出图，避免左栏标注被跳过。
+ *
+ * @return 后续流程应使用的 PDF（覆盖成功为 dest，否则为临时文件）
+ */
+ public static File stampTextFirstPage(File dest, byte[] pdfBytes, List> reviews,
+ float[] pswX, float[] pswY, int fontSize, float rotation)
+ throws IOException, DocumentException {
+ if (reviews == null || reviews.isEmpty()) {
+ return dest;
+ }
if (pswX == null || pswY == null || pswX.length < reviews.size() || pswY.length < reviews.size()) {
throw new IllegalArgumentException("reviews 与坐标数组长度不一致");
}
- File src = new File(pdfPath);
- File temp = new File(src.getParentFile(), "_plm_stamp_" + src.getName());
- PdfReader reader = new PdfReader(pdfPath);
- FileOutputStream fout = new FileOutputStream(temp);
- PdfStamper stp = new PdfStamper(reader, fout);
+ byte[] stamped = stampFirstPageToBytes(pdfBytes, reviews, pswX, pswY, fontSize, rotation);
+ if (writeBytesWithRetry(dest.toPath(), stamped, 20)) {
+ return dest;
+ }
+ File sidecar = Files.createTempFile("plm_stamp_", ".pdf").toFile();
+ Files.write(sidecar.toPath(), stamped);
+ return sidecar;
+ }
+
+ public static boolean copyOverWithRetry(File from, File to) {
+ if (from == null || to == null || !from.isFile()) {
+ return false;
+ }
+ try {
+ return writeBytesWithRetry(to.toPath(), readAllBytesWithRetry(from.toPath()), 10);
+ } catch (IOException e) {
+ return false;
+ }
+ }
+
+ public static byte[] readAllBytesWithRetry(Path src) throws IOException {
+ IOException last = null;
+ for (int i = 1; i <= 20; i++) {
+ try {
+ return Files.readAllBytes(src);
+ } catch (IOException e) {
+ last = e;
+ if (i == 20 || Thread.currentThread().isInterrupted()) {
+ throw e;
+ }
+ try {
+ Thread.sleep(Math.min(1000L, 50L * (1L << Math.min(i - 1, 4))));
+ } catch (InterruptedException ie) {
+ Thread.currentThread().interrupt();
+ throw e;
+ }
+ }
+ }
+ throw last != null ? last : new IOException("读取文件失败: " + src);
+ }
+
+ private static byte[] stampFirstPageToBytes(byte[] pdfBytes, List> reviews,
+ float[] pswX, float[] pswY, int fontSize, float rotation)
+ throws IOException, DocumentException {
+ PdfReader reader = new PdfReader(pdfBytes);
+ ByteArrayOutputStream bout = new ByteArrayOutputStream(Math.max(8192, pdfBytes.length));
+ PdfStamper stp = new PdfStamper(reader, bout);
try {
PdfContentByte content = stp.getOverContent(1);
content.beginText();
@@ -168,10 +235,42 @@ public class PDFDocHelper {
content.endText();
} finally {
stp.close();
- fout.close();
- reader.close();
}
- Files.move(temp.toPath(), src.toPath(), StandardCopyOption.REPLACE_EXISTING);
+ return bout.toByteArray();
+ }
+
+ /**
+ * Windows 上刚复制完的文件常被杀毒/索引短暂锁住，写回时重试。
+ */
+ private static boolean writeBytesWithRetry(Path dest, byte[] data, int maxAttempts) {
+ for (int i = 1; i <= maxAttempts; i++) {
+ try {
+ Files.write(dest, data);
+ return true;
+ } catch (IOException e) {
+ if (i == maxAttempts || Thread.currentThread().isInterrupted()) {
+ return false;
+ }
+ try {
+ Thread.sleep(Math.min(1000L, 50L * (1L << Math.min(i - 1, 4))));
+ } catch (InterruptedException ie) {
+ Thread.currentThread().interrupt();
+ return false;
+ }
+ }
+ }
+ return false;
+ }
+
+ private static boolean isSameFile(File a, File b) {
+ if (a == null || b == null) {
+ return false;
+ }
+ try {
+ return a.getCanonicalFile().equals(b.getCanonicalFile());
+ } catch (IOException e) {
+ return a.getAbsoluteFile().equals(b.getAbsoluteFile());
+ }
}
/**
@@ -235,11 +334,12 @@ public class PDFDocHelper {
List> reviews, float[] pswX, float[] pswY) throws IOException, DocumentException {
PdfReader reader = new PdfReader(inputPath);
- // 临时输出文件名，防止冲突
- String tempName = name.replace(".pdf", "_temp.pdf");
- String tempPath = outputPath + "/" + tempName;
+ // 临时文件放到系统临时目录，避免 _temp.pdf 残留在 zip 输出目录被一起打包
+ String baseName = name.toLowerCase().endsWith(".pdf") ? name.substring(0, name.length() - 4) : name;
+ File tempFile = Files.createTempFile("pdf-wm-" + sanitizeTempToken(baseName) + "-", ".pdf").toFile();
+ String tempPath = tempFile.getAbsolutePath();
- FileOutputStream foc = new FileOutputStream(tempPath);
+ FileOutputStream foc = new FileOutputStream(tempFile);
PdfStamper stamper = new PdfStamper(reader, foc);
PdfGState gs1 = new PdfGState();
@@ -268,28 +368,50 @@ public class PDFDocHelper {
e.printStackTrace();
return false;
} finally {
- stamper.close();
- foc.close();
- reader.close();
+ try {
+ stamper.close();
+ } catch (Exception ignore) {
+ }
+ try {
+ foc.close();
+ } catch (Exception ignore) {
+ }
+ try {
+ reader.close();
+ } catch (Exception ignore) {
+ }
}
- // 第二次处理 —— 添加文字水印
+ // 第二次处理 —— 添加文字水印到正式输出文件
try {
- signSinglePsw(outputPath, tempName, outputPath, name, reviews, pswX, pswY);
+ File outDir = new File(outputPath);
+ if (!outDir.exists() && !outDir.mkdirs()) {
+ throw new IOException("无法创建输出目录: " + outputPath);
+ }
+ signSinglePsw(tempFile.getParent(), tempFile.getName(), outputPath, name, reviews, pswX, pswY);
} catch (Exception e) {
e.printStackTrace();
return false;
- }
-
- // 删除临时文件
- File tempFile = new File(tempPath);
- if (tempFile.exists()) {
- tempFile.delete();
+ } finally {
+ // 删除临时文件（失败不阻塞主流程）
+ try {
+ Files.deleteIfExists(tempFile.toPath());
+ } catch (Exception ignore) {
+ tempFile.deleteOnExit();
+ }
}
return true;
}
+ private static String sanitizeTempToken(String name) {
+ if (name == null || name.isEmpty()) {
+ return "file";
+ }
+ String cleaned = name.replaceAll("[\\\\/:*?\"<>|\\s]+", "_");
+ return cleaned.length() > 40 ? cleaned.substring(0, 40) : cleaned;
+ }
+
/**
* pdf合并
* @param files
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
index 64df589..85c98d7 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
@@ -28,6 +28,7 @@ import org.springframework.expression.BeanResolver;
import org.springframework.expression.ExpressionParser;
import org.springframework.expression.ParserContext;
import org.springframework.expression.common.TemplateParserContext;
+import org.springframework.util.ClassUtils;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext;
@@ -161,7 +162,7 @@ public class PlusDataPermissionHandler {
int index = sb.lastIndexOf(".");
String clazzName = sb.substring(0, index);
String methodName = sb.substring(index + 1, sb.length());
- Class clazz = ClassUtil.loadClass(clazzName);
+ Class clazz = loadMapperClass(clazzName);
List methods = Arrays.stream(ClassUtil.getDeclaredMethods(clazz))
.filter(method -> method.getName().equals(methodName)).collect(Collectors.toList());
DataPermission dataPermission;
@@ -196,4 +197,15 @@ public class PlusDataPermissionHandler {
public boolean isInvalid(String mappedStatementId) {
return invalidCacheSet.contains(mappedStatementId);
}
+
+ /**
+ * ForkJoin 等异步线程的 contextClassLoader 可能找不到 Mapper，回退到 Spring 类加载器。
+ */
+ private Class loadMapperClass(String clazzName) {
+ try {
+ return ClassUtils.forName(clazzName, getClass().getClassLoader());
+ } catch (ClassNotFoundException e) {
+ return ClassUtil.loadClass(clazzName);
+ }
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/AssemblyBomReceiveController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/AssemblyBomReceiveController.java
index 0db0f21..0293094 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/AssemblyBomReceiveController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/AssemblyBomReceiveController.java
@@ -12,18 +12,21 @@ import com.ruoyi.system.domain.dto.productionorder.AssemblyBomReceiveItemDTO;
import com.ruoyi.system.domain.dto.productionorder.AssemblyBomReceiveSummary;
import com.ruoyi.system.service.IPlmReceiveLogService;
import com.ruoyi.system.service.IProductionOrderService;
+import com.ruoyi.system.service.PlmPlanCompleteNotifyService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.CompletableFuture;
/**
* PLM 总装配 BOM 推送接收入口（POST JSON 数组）。
@@ -39,9 +42,10 @@ public class AssemblyBomReceiveController extends BaseController {
private final IProductionOrderService productionOrderService;
private final IPlmReceiveLogService plmReceiveLogService;
+ private final PlmPlanCompleteNotifyService plmPlanCompleteNotifyService;
/**
- * 接收总装配 BOM 行列表，按生产令号全量替换写入 production_order，并同步 bom_details（bomType=0）。
+ * 接收总装配 BOM 行列表。已审核且主产品图号相同则拒绝；主产品图号不同则追加。
*
* POST /system/plm/assemblyBomReceive
* Content-Type: application/json; charset=UTF-8
@@ -60,6 +64,7 @@ public class AssemblyBomReceiveController extends BaseController {
summaryMap.put("lineCount", summary.getLineCount());
summaryMap.put("insertedCount", summary.getInsertedCount());
summaryMap.put("replaced", summary.isReplaced());
+ summaryMap.put("appended", summary.isAppended());
plmReceiveLogService.record(
IPlmReceiveLogService.BIZ_ASSEMBLY_BOM,
API_PATH,
@@ -73,6 +78,10 @@ public class AssemblyBomReceiveController extends BaseController {
null,
clientIp
);
+ // 工艺可能先到、总装后到：入库后再核实两边都有才发给 plan-user-id
+ final String productionOrder = summary.getProductionOrderNo();
+ CompletableFuture.runAsync(() ->
+ plmPlanCompleteNotifyService.notifyIfAssemblyAndRouteComplete(productionOrder, null));
return R.ok("接收成功", summary);
} catch (Exception e) {
plmReceiveLogService.record(
@@ -92,6 +101,20 @@ public class AssemblyBomReceiveController extends BaseController {
}
}
+ /**
+ * 总装 BOM 与工艺都已入库后，按令号重发生管通知（工艺计划表 + Markdown）。
+ * 两边缺一则只返回原因，不发钉钉。
+ *
+ * POST /system/plm/planCompleteNotify?productionOrderNo=令号
+ */
+ @SaIgnore
+ @Log(title = "PLM工艺完成通知重发", businessType = BusinessType.OTHER)
+ @PostMapping("/planCompleteNotify")
+ public R planCompleteNotify(@RequestParam("productionOrderNo") String productionOrderNo) {
+ String result = plmPlanCompleteNotifyService.notifyIfAssemblyAndRouteComplete(productionOrderNo, null);
+ return R.ok(result);
+ }
+
private static String resolveOrderNo(List body) {
if (body == null) {
return null;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BomDetailsController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BomDetailsController.java
index 0999649..df900e9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BomDetailsController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BomDetailsController.java
@@ -22,6 +22,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.JsyyOrderNo;
+import com.ruoyi.common.utils.ProjectStatusLock;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.ProcessRoute;
import com.ruoyi.system.domain.dto.*;
@@ -96,6 +98,9 @@ public class BomDetailsController extends BaseController {
private final DingTalkProperties dingTalkProperties;
+ /** 电气 BOM 导入成功后发「无需做工艺」钉钉，并写入推送日志 */
+ private final SkipProcessNotifyService skipProcessNotifyService;
+
/**
* 查询bom明细列表
*/
@@ -437,6 +442,156 @@ public class BomDetailsController extends BaseController {
|| "PLM".equalsIgnoreCase(material.getUpdateBy());
}
+ /**
+ * 电气 Excel BOM：bomType=1，且不是 PLM 项目、也不是 PLM 推送的材料 BOM。
+ */
+ private static boolean isElectricalExcelBom(BomDetails material, ProcessOrderPro project) {
+ if (material == null || !"1".equals(material.getBomType())) {
+ return false;
+ }
+ if (project != null && ProcessOrderProSource.PLM.equals(project.getSource())) {
+ return false;
+ }
+ return !"PLM".equalsIgnoreCase(material.getCreateBy())
+ && !"PLM".equalsIgnoreCase(material.getUpdateBy());
+ }
+
+ private static boolean containsElectricalExcelBom(List materials, ProcessOrderPro project) {
+ if (materials == null) {
+ return false;
+ }
+ for (BomDetails material : materials) {
+ if (isElectricalExcelBom(material, project)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static String firstNonBlankTrim(String... values) {
+ if (values == null) {
+ return null;
+ }
+ for (String value : values) {
+ if (StringUtils.isNotBlank(value)) {
+ return value.trim();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 单台数量：{@code 1/4}、{@code 1/3} 拆成分子和分母；普通数字分母为 1。
+ */
+ private static void applyElectricalQuantity(BomDetails bomDetails, String rawQuantity) {
+ bomDetails.setDenominator(1.0);
+ if (StringUtils.isBlank(rawQuantity)) {
+ bomDetails.setQuantity(null);
+ return;
+ }
+ String text = rawQuantity.trim().replace('／', '/');
+ int slash = text.indexOf('/');
+ if (slash > 0 && slash == text.lastIndexOf('/')) {
+ String numeratorText = text.substring(0, slash).trim();
+ String denominatorText = text.substring(slash + 1).trim();
+ Double numerator = parsePositiveNumber(numeratorText);
+ Double denominator = parsePositiveNumber(denominatorText);
+ if (numerator != null && denominator != null && denominator > 0) {
+ bomDetails.setQuantity(formatQuantityNumber(numerator));
+ bomDetails.setDenominator(denominator);
+ return;
+ }
+ }
+ Double number = parsePositiveNumber(text);
+ bomDetails.setQuantity(number == null ? text : formatQuantityNumber(number));
+ }
+
+ private static Double parsePositiveNumber(String text) {
+ if (StringUtils.isBlank(text)) {
+ return null;
+ }
+ try {
+ double value = Double.parseDouble(text);
+ if (value < 0 || Double.isInfinite(value) || Double.isNaN(value)) {
+ return null;
+ }
+ return value;
+ } catch (NumberFormatException e) {
+ return null;
+ }
+ }
+
+ private static String formatQuantityNumber(double value) {
+ if (value == Math.rint(value) && value <= Long.MAX_VALUE) {
+ return String.valueOf((long) value);
+ }
+ return BigDecimal.valueOf(value).stripTrailingZeros().toPlainString();
+ }
+
+ /** 电气 Excel「型号/规格型号」入库在 material；仅电气建档写入金蝶 FSpecification */
+ private static String resolveElectricalSpecification(BomDetails details) {
+ return details == null ? null : StringUtils.trim(details.getMaterial());
+ }
+
+ private static void writeKingdeeElectricalSpecification(JsonObject model, BomDetails details) {
+ String spec = resolveElectricalSpecification(details);
+ if (StringUtils.isNotBlank(spec)) {
+ model.addProperty("FSpecification", spec);
+ log.info("[电气建档] 写入规格型号 FNumber={} FSpecification={}",
+ details.getPartNumber(), spec);
+ } else {
+ log.warn("[电气建档] 规格型号为空，未写入 FSpecification, FNumber={}",
+ details == null ? null : details.getPartNumber());
+ }
+ }
+
+ /** 电气单位在 remarks，不能按品牌 wareHouse 去 switch（品牌为空会 NPE，建档失败规格也进不去） */
+ private static void fillElectricalKingdeeUnit(JsonObject target, String unitText) {
+ if (target == null || StringUtils.isBlank(unitText)) {
+ return;
+ }
+ switch (unitText.trim()) {
+ case "把":
+ target.addProperty("FNumber", "002");
+ break;
+ case "包":
+ target.addProperty("FNumber", "012");
+ break;
+ case "个":
+ target.addProperty("FNumber", "001");
+ break;
+ case "根":
+ target.addProperty("FNumber", "003");
+ break;
+ case "米":
+ target.addProperty("FNumber", "005");
+ break;
+ case "卷":
+ target.addProperty("FNumber", "020");
+ break;
+ case "盒":
+ target.addProperty("FNumber", "014");
+ break;
+ case "件":
+ target.addProperty("FNumber", "jian");
+ break;
+ case "盘":
+ target.addProperty("FNumber", "011");
+ break;
+ case "瓶":
+ target.addProperty("FNumber", "016");
+ break;
+ case "条":
+ target.addProperty("FNumber", "017");
+ break;
+ case "套":
+ target.addProperty("FNumber", "007");
+ break;
+ default:
+ break;
+ }
+ }
+
/* 触发金蝶物料清单按钮 */
@Log(title = "金蝶物料清单更新")
@SaCheckPermission("system:details:updateMaterial")
@@ -473,9 +628,27 @@ public class BomDetailsController extends BaseController {
if (bomDetailParams == null || bomDetailParams.isEmpty()) {
return R.fail("请先选择要上传的物料");
}
+ for (Map param : bomDetailParams) {
+ String orderNo = param == null ? null : param.get("totalWeight");
+ String jsyyDeny = JsyyOrderNo.denyIfMatches(orderNo);
+ if (jsyyDeny != null) {
+ return R.fail(jsyyDeny);
+ }
+ if (StringUtils.isNotBlank(orderNo)) {
+ ProcessOrderPro orderForLock = iProcessOrderProService.selectByProjectNumber(orderNo);
+ if (orderForLock != null) {
+ String statusDeny = ProjectStatusLock.denyIfLocked(
+ orderForLock.getBomStatus(), ProjectStatusLock.Action.UPDATE_MATERIAL);
+ if (statusDeny != null) {
+ return R.fail(statusDeny);
+ }
+ }
+ }
+ }
List bomDetailsList = new ArrayList<>();
List logDTOS = new ArrayList<>();
List failedMaterials = new ArrayList<>(); // 用于跟踪处理失败的物料
+ Set electricalOrderNos = new LinkedHashSet<>();
String totalWeight = "";
// 遍历前端传来的数据
for (Map param : bomDetailParams) {
@@ -505,6 +678,9 @@ public class BomDetailsController extends BaseController {
failedMaterials.add(fnumber);
continue;
}
+ if (containsElectricalExcelBom(bomDetails, bo)) {
+ electricalOrderNos.add(bo.getProductionOrderNo());
+ }
// 第一步：处理所有物料的保存
for (BomDetails material : bomDetails) {
// 获取工艺表中的非委外工时
@@ -513,7 +689,7 @@ public class BomDetailsController extends BaseController {
if (material.getPartNumber().startsWith("015") || material.getPartNumber().startsWith("009")) {
return R.fail("015和009为管控物料，请先申请");
}
- if (material.getRemarks() != null && material.getRemarks().contains("甲供")) {
+ if (isOwnerSuppliedBom(material)) {
continue;
}
String state = determineState(material);
@@ -537,41 +713,46 @@ public class BomDetailsController extends BaseController {
}
}
- // 第二步：BOM校验和上传（在循环外部）
- ValidateBomResult validateResult = validateBOM(fnumber, bomDetails);
- boolean needUpload = !validateResult.isMatch();
- if (needUpload) {
- try {
- // 物料清单保存方法,判断是电气还是生产
- BOMUploadResult bomUploadResult = FBloadBillOfMaterialsPreservation(bomDetails, bo, groupName);
- if (bomUploadResult.isSuccess()) {
- KindegeeLogDTO logDTO = new KindegeeLogDTO();
- logDTO.setProjectCode(bo.getProductionOrderNo());
- logDTO.setMaterialCode(fnumber); // 使用物料编码而不是单个物料的编码
- logDTO.setCode("200");
- logDTO.setReason("成功上传" + "版本号：" + bomUploadResult.getNumber());
- logDTOS.add(logDTO);
- } else {
- KindegeeLogDTO logDTO = new KindegeeLogDTO();
- logDTO.setProjectCode(bo.getProductionOrderNo());
- logDTO.setMaterialCode(fnumber);
- logDTO.setCode("300");
- logDTO.setReason(bomUploadResult.getErrorMessage());
- logDTOS.add(logDTO);
- }
- bomDetailsList.addAll(bomDetails);
- } catch (Exception e) {
- log.error("保存BOM失败, 物料编码: {}, 错误: {}", fnumber, e.getMessage());
- failedMaterials.add(fnumber);
- }
+ // 第二步：BOM校验和上传（过滤甲供件，不进金蝶 BOM）
+ List uploadBomDetails = filterOwnerSuppliedFromBom(bomDetails);
+ if (uploadBomDetails.isEmpty()) {
+ log.info("过滤甲供件后无子项，跳过金蝶BOM上传, 物料编码: {}", fnumber);
} else {
- KindegeeLogDTO logDTO = new KindegeeLogDTO();
- logDTO.setProjectCode(bo.getProductionOrderNo());
- logDTO.setMaterialCode(fnumber);
- logDTO.setCode("100");
- logDTO.setReason("BOM已存在且一致，版本号：" + validateResult.getVersion());
- logDTOS.add(logDTO);
- log.info("BOM已存在且一致，物料编码: {}，跳过保存", fnumber);
+ ValidateBomResult validateResult = validateBOM(fnumber, uploadBomDetails);
+ boolean needUpload = !validateResult.isMatch();
+ if (needUpload) {
+ try {
+ // 物料清单保存方法,判断是电气还是生产
+ BOMUploadResult bomUploadResult = FBloadBillOfMaterialsPreservation(uploadBomDetails, bo, groupName);
+ if (bomUploadResult.isSuccess()) {
+ KindegeeLogDTO logDTO = new KindegeeLogDTO();
+ logDTO.setProjectCode(bo.getProductionOrderNo());
+ logDTO.setMaterialCode(fnumber); // 使用物料编码而不是单个物料的编码
+ logDTO.setCode("200");
+ logDTO.setReason("成功上传" + "版本号：" + bomUploadResult.getNumber());
+ logDTOS.add(logDTO);
+ } else {
+ KindegeeLogDTO logDTO = new KindegeeLogDTO();
+ logDTO.setProjectCode(bo.getProductionOrderNo());
+ logDTO.setMaterialCode(fnumber);
+ logDTO.setCode("300");
+ logDTO.setReason(bomUploadResult.getErrorMessage());
+ logDTOS.add(logDTO);
+ }
+ bomDetailsList.addAll(bomDetails);
+ } catch (Exception e) {
+ log.error("保存BOM失败, 物料编码: {}, 错误: {}", fnumber, e.getMessage());
+ failedMaterials.add(fnumber);
+ }
+ } else {
+ KindegeeLogDTO logDTO = new KindegeeLogDTO();
+ logDTO.setProjectCode(bo.getProductionOrderNo());
+ logDTO.setMaterialCode(fnumber);
+ logDTO.setCode("100");
+ logDTO.setReason("BOM已存在且一致，版本号：" + validateResult.getVersion());
+ logDTOS.add(logDTO);
+ log.info("BOM已存在且一致，物料编码: {}，跳过保存", fnumber);
+ }
}
}
}
@@ -584,7 +765,17 @@ public class BomDetailsController extends BaseController {
return R.fail("未找到生产令号对应的项目: " + totalWeight);
}
processOrderProBo.setDrawingType(JSONUtil.toJsonStr(logDTOS));
- processOrderProBo.setBomStatus(2L);
+ boolean electricalProject = electricalOrderNos.contains(processOrderProBo.getProductionOrderNo());
+ boolean productionDone = processOrderProBo.getBomStatus() != null
+ && processOrderProBo.getBomStatus() == ProjectStatusLock.PRODUCTION_DONE;
+ if (electricalProject) {
+ // 电气项目：物料清单更新成功后进入开始生产；已生产完成不回退
+ if (!productionDone) {
+ processOrderProBo.setBomStatus(ProjectStatusLock.IN_PRODUCTION);
+ }
+ } else {
+ processOrderProBo.setBomStatus(2L);
+ }
processOrderProMapper.updateById(processOrderProBo);
// 更新钉钉卡片数据
@@ -633,7 +824,12 @@ public class BomDetailsController extends BaseController {
}
// 返回处理结果
- return R.ok("成功", bomDetailsList);
+ String resultMsg = electricalOrderNos.contains(processOrderProBo.getProductionOrderNo())
+ && (processOrderProBo.getBomStatus() != null
+ && processOrderProBo.getBomStatus() == ProjectStatusLock.IN_PRODUCTION)
+ ? "成功，电气项目状态已改为开始生产"
+ : "成功";
+ return R.ok(resultMsg, bomDetailsList);
}
@@ -825,6 +1021,10 @@ public class BomDetailsController extends BaseController {
model.add("FTreeEntity", fTreeEntity);
ArrayList fTreeEntityList = new ArrayList<>();
for (BomDetails details : bomlist) {
+ if (isOwnerSuppliedBom(details)) {
+ log.info("跳过甲供件，不写入金蝶BOM: {}", details.getPartNumber());
+ continue;
+ }
// 创建FTreeEntity对象，并加入FTreeEntity数组
JsonObject fTreeEntityItem = new JsonObject();
fTreeEntity.add(fTreeEntityItem);
@@ -854,6 +1054,10 @@ public class BomDetailsController extends BaseController {
fTreeEntityItem.addProperty("FDENOMINATOR", details.getDenominator());
fTreeEntityList.add(fTreeEntityItem);
}
+ if (fTreeEntity.size() == 0) {
+ log.warn("过滤甲供件后无子项，跳过金蝶BOM保存, 父项: {}", bomDetails.getFNumber());
+ return 1;
+ }
String jsonData = json.toString();
log.debug("打印json:" + jsonData);
System.out.println(jsonData);
@@ -947,6 +1151,10 @@ public class BomDetailsController extends BaseController {
if (bomlist.isEmpty()) {
return null;
}
+ if (isOwnerSuppliedBom(details)) {
+ log.info("跳过甲供件，不写入金蝶BOM: {}", details.getPartNumber());
+ continue;
+ }
// 创建FTreeEntity对象，并加入FTreeEntity数组
JsonObject fTreeEntityItem = new JsonObject();
fTreeEntity.add(fTreeEntityItem);
@@ -1006,6 +1214,10 @@ public class BomDetailsController extends BaseController {
}
fTreeEntityList.add(fTreeEntityItem);
}
+ if (fTreeEntity.size() == 0) {
+ log.warn("过滤甲供件后无子项，跳过金蝶BOM保存, 图号={}", bomDetails1.getFNumber());
+ return BOMUploadResult.success(null, "SKIP_OWNER_SUPPLY");
+ }
try {
String resultJson = new K3CloudApi().save("ENG_BOM", json.toString());
// 直接用 Jackson 解析
@@ -1049,6 +1261,33 @@ public class BomDetailsController extends BaseController {
return StringUtils.isNotBlank(text) && ("伊特".equals(text.trim()) || text.contains("伊特"));
}
+ /** 备注或材质含「甲供」视为甲供件，不进入金蝶 BOM */
+ private static boolean isOwnerSuppliedBom(BomDetails details) {
+ if (details == null) {
+ return false;
+ }
+ return containsOwnerSupply(details.getRemarks()) || containsOwnerSupply(details.getMaterial());
+ }
+
+ private static boolean containsOwnerSupply(String text) {
+ return StringUtils.isNotBlank(text) && text.contains("甲供");
+ }
+
+ /** 生成/校验/上传金蝶 BOM 前过滤甲供件 */
+ private static List filterOwnerSuppliedFromBom(List bomDetails) {
+ if (bomDetails == null || bomDetails.isEmpty()) {
+ return Collections.emptyList();
+ }
+ List filtered = new ArrayList<>(bomDetails.size());
+ for (BomDetails detail : bomDetails) {
+ if (isOwnerSuppliedBom(detail)) {
+ continue;
+ }
+ filtered.add(detail);
+ }
+ return filtered;
+ }
+
/*
* 父级物料保存接口
* 单位 是台
@@ -1955,7 +2194,8 @@ public class BomDetailsController extends BaseController {
// 添加Model字段
model.addProperty("FMATERIALID", 0);
- model.addProperty("FSpecification", bomDetails1.getMaterial());// 规格 为存入的材质字段
+ // 电气规格型号：Excel「型号/规格型号」入库 material；生产建档仍走 loadMaterialPreservation，互不影响
+ writeKingdeeElectricalSpecification(model, bomDetails1);
model.addProperty("F_HBYT_PP", bomDetails1.getWareHouse());// 品牌 为存入的仓库字段
writeKingdeeChildDanZhong(model, bomDetails1, "电气子项物料建档");
model.addProperty("FNumber", bomDetails1.getPartNumber());
@@ -2006,46 +2246,10 @@ public class BomDetailsController extends BaseController {
// 创建FBaseUnitId对象，并加入SubHeadEntity
JsonObject fBaseUnitId = new JsonObject();
- switch (bomDetails1.getWareHouse()) {// 单位
- case "把":
- fBaseUnitId.addProperty("FNumber", "002");
- break;
- case "包":
- fBaseUnitId.addProperty("FNumber", "012");
- break;
- case "个":
- fBaseUnitId.addProperty("FNumber", "001");
- break;
- case "根":
- fBaseUnitId.addProperty("FNumber", "003");
- break;
- case "米":
- fBaseUnitId.addProperty("FNumber", "005");
- break;
- case "卷":
- fBaseUnitId.addProperty("FNumber", "020");
- break;
- case "盒":
- fBaseUnitId.addProperty("FNumber", "014");
- break;
- case "件":
- fBaseUnitId.addProperty("FNumber", "jian");
- break;
- case "盘":
- fBaseUnitId.addProperty("FNumber", "011");
- break;
- case "瓶":
- fBaseUnitId.addProperty("FNumber", "016");
- break;
- case "条":
- fBaseUnitId.addProperty("FNumber", "017");
- break;
- case "套":
- fBaseUnitId.addProperty("FNumber", "007");
- break;
- }
+ String electricalUnit = StringUtils.trim(bomDetails1.getRemarks());
+ fillElectricalKingdeeUnit(fBaseUnitId, electricalUnit);
subHeadEntity.add("FBaseUnitId", fBaseUnitId);
- if (states.equals("1")) {
+ if ("1".equals(states)) {
subHeadEntity.addProperty("FIsPurchase", true);
subHeadEntity.addProperty("FIsSale", true);
subHeadEntity.addProperty("FIsInventory", true);
@@ -2062,44 +2266,7 @@ public class BomDetailsController extends BaseController {
JsonObject subHeadEntity1 = new JsonObject();
model.add("SubHeadEntity1", subHeadEntity1);
JsonObject fStoreUnitId = new JsonObject();
- switch (bomDetails1.getWareHouse()) {
- case "把":
- fBaseUnitId.addProperty("FNumber", "002");
- break;
- case "包":
- fBaseUnitId.addProperty("FNumber", "012");
- break;
- case "个":
- fBaseUnitId.addProperty("FNumber", "001");
- break;
- case "根":
- fBaseUnitId.addProperty("FNumber", "003");
- break;
- case "米":
- fBaseUnitId.addProperty("FNumber", "005");
- break;
- case "卷":
- fBaseUnitId.addProperty("FNumber", "020");
- break;
- case "盒":
- fBaseUnitId.addProperty("FNumber", "014");
- break;
- case "件":
- fBaseUnitId.addProperty("FNumber", "jian");
- break;
- case "盘":
- fBaseUnitId.addProperty("FNumber", "011");
- break;
- case "瓶":
- fBaseUnitId.addProperty("FNumber", "016");
- break;
- case "条":
- fBaseUnitId.addProperty("FNumber", "017");
- break;
- case "套":
- fBaseUnitId.addProperty("FNumber", "007");
- break;
- }
+ fillElectricalKingdeeUnit(fStoreUnitId, electricalUnit);
subHeadEntity1.add("FStoreUnitID", fStoreUnitId);
subHeadEntity1.addProperty("FUnitConvertDir", "1");
@@ -2120,44 +2287,7 @@ public class BomDetailsController extends BaseController {
subHeadEntity1.addProperty("FBoxStandardQty", 0.0);
// 创建FPurchaseUnitId对象，并加入SubHeadEntity1
JsonObject fPurchaseUnitId = new JsonObject();
- switch (bomDetails1.getWareHouse()) {
- case "把":
- fBaseUnitId.addProperty("FNumber", "002");
- break;
- case "包":
- fBaseUnitId.addProperty("FNumber", "012");
- break;
- case "个":
- fBaseUnitId.addProperty("FNumber", "001");
- break;
- case "根":
- fBaseUnitId.addProperty("FNumber", "003");
- break;
- case "米":
- fBaseUnitId.addProperty("FNumber", "005");
- break;
- case "卷":
- fBaseUnitId.addProperty("FNumber", "020");
- break;
- case "盒":
- fBaseUnitId.addProperty("FNumber", "014");
- break;
- case "件":
- fBaseUnitId.addProperty("FNumber", "jian");
- break;
- case "盘":
- fBaseUnitId.addProperty("FNumber", "011");
- break;
- case "瓶":
- fBaseUnitId.addProperty("FNumber", "016");
- break;
- case "条":
- fBaseUnitId.addProperty("FNumber", "017");
- break;
- case "套":
- fBaseUnitId.addProperty("FNumber", "007");
- break;
- }
+ fillElectricalKingdeeUnit(fPurchaseUnitId, electricalUnit);
subHeadEntity1.add("FPurchaseUnitId", fPurchaseUnitId);
// 创建SubHeadEntity3对象，并加入Model
@@ -2166,44 +2296,7 @@ public class BomDetailsController extends BaseController {
// 创建FPurchasePriceUnitId对象，并加入SubHeadEntity3
JsonObject fPurchasePriceUnitId = new JsonObject();
- switch (bomDetails1.getWareHouse()) {
- case "把":
- fBaseUnitId.addProperty("FNumber", "002");
- break;
- case "包":
- fBaseUnitId.addProperty("FNumber", "012");
- break;
- case "个":
- fBaseUnitId.addProperty("FNumber", "001");
- break;
- case "根":
- fBaseUnitId.addProperty("FNumber", "003");
- break;
- case "米":
- fBaseUnitId.addProperty("FNumber", "005");
- break;
- case "卷":
- fBaseUnitId.addProperty("FNumber", "020");
- break;
- case "盒":
- fBaseUnitId.addProperty("FNumber", "014");
- break;
- case "件":
- fBaseUnitId.addProperty("FNumber", "jian");
- break;
- case "盘":
- fBaseUnitId.addProperty("FNumber", "011");
- break;
- case "瓶":
- fBaseUnitId.addProperty("FNumber", "016");
- break;
- case "条":
- fBaseUnitId.addProperty("FNumber", "017");
- break;
- case "套":
- fBaseUnitId.addProperty("FNumber", "007");
- break;
- }
+ fillElectricalKingdeeUnit(fPurchasePriceUnitId, electricalUnit);
subHeadEntity3.add("FPurchasePriceUnitId", fPurchasePriceUnitId);
subHeadEntity3.addProperty("FIsQuota", false);
@@ -2212,18 +2305,18 @@ public class BomDetailsController extends BaseController {
JsonObject subHeadEntity6 = new JsonObject();
model.add("SubHeadEntity6", subHeadEntity6);
// 不同的属性不同的检验方案
- if (states.equals("1")) {
+ if ("1".equals(states)) {
// 外购
subHeadEntity6.addProperty("FCheckIncoming", true);
subHeadEntity6.addProperty("FCheckStock", true);
}
- if (states.equals("2")) {
+ if ("2".equals(states)) {
// 自制
subHeadEntity6.addProperty("FCheckProduct", true);
subHeadEntity6.addProperty("FCheckStock", true);
subHeadEntity6.addProperty("FCheckReturnMtrl", true);
}
- if (states.equals("3")) {
+ if ("3".equals(states)) {
// 委外
subHeadEntity6.addProperty("FCheckIncoming", true);
subHeadEntity6.addProperty("FCheckProduct", true);
@@ -2236,44 +2329,7 @@ public class BomDetailsController extends BaseController {
// 创建FProduceUnitId对象，并加入SubHeadEntity5
JsonObject fProduceUnitId = new JsonObject();
- switch (bomDetails1.getWareHouse()) {
- case "把":
- fBaseUnitId.addProperty("FNumber", "002");
- break;
- case "包":
- fBaseUnitId.addProperty("FNumber", "012");
- break;
- case "个":
- fBaseUnitId.addProperty("FNumber", "001");
- break;
- case "根":
- fBaseUnitId.addProperty("FNumber", "003");
- break;
- case "米":
- fBaseUnitId.addProperty("FNumber", "005");
- break;
- case "卷":
- fBaseUnitId.addProperty("FNumber", "020");
- break;
- case "盒":
- fBaseUnitId.addProperty("FNumber", "014");
- break;
- case "件":
- fBaseUnitId.addProperty("FNumber", "jian");
- break;
- case "盘":
- fBaseUnitId.addProperty("FNumber", "011");
- break;
- case "瓶":
- fBaseUnitId.addProperty("FNumber", "016");
- break;
- case "条":
- fBaseUnitId.addProperty("FNumber", "017");
- break;
- case "套":
- fBaseUnitId.addProperty("FNumber", "007");
- break;
- }
+ fillElectricalKingdeeUnit(fProduceUnitId, electricalUnit);
subHeadEntity5.add("FProduceUnitId", fProduceUnitId);
// 创建FProduceBillType对象，并加入SubHeadEntity5
@@ -2283,46 +2339,9 @@ public class BomDetailsController extends BaseController {
// 创建FBOMUnitId对象，并加入SubHeadEntity5
JsonObject fBOMUnitId = new JsonObject();
- switch (bomDetails1.getRemarks()) {
- case "把":
- fBaseUnitId.addProperty("FNumber", "002");
- break;
- case "包":
- fBaseUnitId.addProperty("FNumber", "012");
- break;
- case "个":
- fBaseUnitId.addProperty("FNumber", "001");
- break;
- case "根":
- fBaseUnitId.addProperty("FNumber", "003");
- break;
- case "米":
- fBaseUnitId.addProperty("FNumber", "005");
- break;
- case "卷":
- fBaseUnitId.addProperty("FNumber", "020");
- break;
- case "盒":
- fBaseUnitId.addProperty("FNumber", "014");
- break;
- case "件":
- fBaseUnitId.addProperty("FNumber", "jian");
- break;
- case "盘":
- fBaseUnitId.addProperty("FNumber", "011");
- break;
- case "瓶":
- fBaseUnitId.addProperty("FNumber", "016");
- break;
- case "条":
- fBaseUnitId.addProperty("FNumber", "017");
- break;
- case "套":
- fBaseUnitId.addProperty("FNumber", "007");
- break;
- }
+ fillElectricalKingdeeUnit(fBOMUnitId, electricalUnit);
subHeadEntity5.add("FBOMUnitId", fBOMUnitId);
- subHeadEntity5.addProperty("FIsMainPrd", !states.equals("1"));
+ subHeadEntity5.addProperty("FIsMainPrd", !"1".equals(states));
subHeadEntity5.addProperty("FIssueType", "1");
// 创建FPickStockId对象，并加入SubHeadEntity5
@@ -2382,6 +2401,13 @@ public class BomDetailsController extends BaseController {
}
}
+ @Log(title = "电气BOM导入模板", businessType = BusinessType.EXPORT)
+ @SaCheckPermission("system:details:importElectricalBom")
+ @PostMapping("/importElectricalBomTemplate")
+ public void importElectricalBomTemplate(HttpServletResponse response) {
+ ExcelUtil.exportExcel(new ArrayList<>(), "电气BOM", ElectricalMaterialBomVO.class, response);
+ }
+
/**
* 导入BOM
* daorubaon
@@ -2392,8 +2418,9 @@ public class BomDetailsController extends BaseController {
@Log(title = "导入电气bom", businessType = BusinessType.IMPORT)
@SaCheckPermission("system:details:importElectricalBom")
@PostMapping(value = "/importElectricalBom", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- public R> importElectricalBom(@RequestPart("file") MultipartFile file) {
- Map resp = new HashMap<>();
+ public R> importElectricalBom(
+ @RequestPart("file") MultipartFile file,
+ @RequestParam(value = "productionOrderNo", required = false) String productionOrderNo) {
try {
if (file == null || file.isEmpty() || StringUtils.isEmpty(file.getOriginalFilename())) {
return R.fail("请选择有效的Excel文件");
@@ -2404,12 +2431,37 @@ public class BomDetailsController extends BaseController {
return R.fail("仅支持Excel文件(xls/xlsx)");
}
- List rows = ExcelUtil.importExcel(file.getInputStream(), ElectricalMaterialBomVO.class);
+ List rows;
+ try {
+ rows = ExcelUtil.importExcel(file.getInputStream(), ElectricalMaterialBomVO.class);
+ } catch (Exception parseEx) {
+ log.error("电气BOM Excel解析失败: {}", filename, parseEx);
+ return R.fail("Excel解析失败，请检查表头是否包含：生产令号、物料编码、物料名称、上级部件、上级部件图号");
+ }
+
int total = rows != null ? rows.size() : 0;
+ int skippedLingYong = 0;
+ int skippedEmpty = 0;
List list = new ArrayList<>();
+ Set orderNos = new LinkedHashSet<>();
+ if (StringUtils.isNotBlank(productionOrderNo)) {
+ orderNos.add(productionOrderNo.trim());
+ }
if (rows != null) {
for (ElectricalMaterialBomVO bomVO : rows) {
+ if (bomVO == null) {
+ skippedEmpty++;
+ continue;
+ }
+ if (StringUtils.isNotBlank(bomVO.getProductionOrderNo())) {
+ orderNos.add(bomVO.getProductionOrderNo().trim());
+ }
+ if (StringUtils.isBlank(bomVO.getDrawingNo()) && StringUtils.isBlank(bomVO.getDrawingName())) {
+ skippedEmpty++;
+ continue;
+ }
if (bomVO.getRemark() != null && bomVO.getRemark().contains("领用")) {
+ skippedLingYong++;
continue;
}
BomDetails bomDetails = new BomDetails();
@@ -2418,7 +2470,8 @@ public class BomDetailsController extends BaseController {
bomDetails.setFName(bomVO.getParentPart());
bomDetails.setPartNumber(bomVO.getDrawingNo());
bomDetails.setName(bomVO.getDrawingName());
- bomDetails.setMaterial(bomVO.getModel());
+ String specification = firstNonBlankTrim(bomVO.getModel(), bomVO.getSpecificationModel());
+ bomDetails.setMaterial(specification);
bomDetails.setWareHouse(bomVO.getBrand());
String brand = bomVO.getBrand();
if (brand != null && brand.contains("伊特")) {
@@ -2426,10 +2479,9 @@ public class BomDetailsController extends BaseController {
} else {
bomDetails.setStats("外购");
}
- bomDetails.setQuantity(bomVO.getQuantity() == null ? null : bomVO.getQuantity().toString());
+ applyElectricalQuantity(bomDetails, bomVO.getQuantity());
bomDetails.setRemarks(bomVO.getUnit());
bomDetails.setUpdateTime(new Date());
- bomDetails.setDenominator(1.0);
bomDetails.setBomType("1");
list.add(bomDetails);
}
@@ -2437,21 +2489,140 @@ public class BomDetailsController extends BaseController {
List vos = BeanUtil.copyToList(list, BomDetailsVo.class);
List toInsert = saveBomDetails(vos);
- boolean saved = false;
- if (!toInsert.isEmpty()) {
- saved = bomDetailsMapper.insertBatch(toInsert);
+ int matchedMaterial = 0;
+ int unmatchedMaterial = 0;
+ int nameMismatch = 0;
+ for (BomDetails item : toInsert) {
+ String flag = item.getUnitWeight();
+ if ("是".equals(flag)) {
+ matchedMaterial++;
+ } else if ("编码名称不符".equals(flag)) {
+ nameMismatch++;
+ } else {
+ unmatchedMaterial++;
+ }
}
+ int savedCount = 0;
+ boolean saved = false;
+ if (!toInsert.isEmpty()) {
+ saved = Boolean.TRUE.equals(bomDetailsMapper.insertBatch(toInsert));
+ savedCount = saved ? toInsert.size() : 0;
+ }
+
+ Map resp = new HashMap<>();
resp.put("totalRows", total);
resp.put("parsedRows", list.size());
- resp.put("savedRows", saved);
- resp.put("message", "导入完成");
- return R.ok(resp);
+ resp.put("skippedLingYong", skippedLingYong);
+ resp.put("skippedEmpty", skippedEmpty);
+ resp.put("savedCount", savedCount);
+ resp.put("matchedMaterial", matchedMaterial);
+ resp.put("unmatchedMaterial", unmatchedMaterial);
+ resp.put("nameMismatch", nameMismatch);
+ resp.put("bomStatus", ProjectStatusLock.DRAWING_DONE);
+ resp.put("needProcess", 0);
+
+ if (!saved) {
+ String failMsg;
+ if (total == 0) {
+ failMsg = "导入失败：Excel没有读到数据，请确认是否用对模板、表头是否在第一行";
+ } else if (list.isEmpty() && skippedLingYong > 0) {
+ failMsg = "导入失败：有效物料为0（领用行 " + skippedLingYong + " 条已跳过）";
+ } else if (list.isEmpty()) {
+ failMsg = "导入失败：没有可保存的物料行";
+ } else {
+ failMsg = "导入失败：物料解析了 " + list.size() + " 条，但写入数据库失败";
+ }
+ resp.put("success", false);
+ resp.put("resultType", "error");
+ resp.put("skipProcessOrders", Collections.emptyList());
+ resp.put("productionDoneOrders", Collections.emptyList());
+ resp.put("unmatchedOrderNos", Collections.emptyList());
+ resp.put("message", failMsg);
+ return R.fail(failMsg, resp);
+ }
+
+ List electricalOrders = applyElectricalSkipProcess(orderNos, resp);
+ // 匹配到的令号发「电气BOM已上传」通知（含已生产完成、仅改 needProcess 的）
+ skipProcessNotifyService.notifyElectricalBomUploaded(electricalOrders, savedCount);
+ @SuppressWarnings("unchecked")
+ List skipProcessOrders = (List) resp.get("skipProcessOrders");
+ @SuppressWarnings("unchecked")
+ List unmatchedOrderNos = (List) resp.get("unmatchedOrderNos");
+ boolean statusUpdated = skipProcessOrders != null && !skipProcessOrders.isEmpty();
+ StringBuilder msg = new StringBuilder("导入成功，已保存 ").append(savedCount).append(" 条物料");
+ if (statusUpdated) {
+ msg.append("；令号 ").append(String.join("、", skipProcessOrders))
+ .append(" 已跳过工艺，状态改为设计出图完成");
+ } else if (unmatchedOrderNos != null && !unmatchedOrderNos.isEmpty()) {
+ msg.append("；未匹配到项目令号 ").append(String.join("、", unmatchedOrderNos))
+ .append("，状态未改");
+ }
+ String resultType = statusUpdated ? "success" : "warning";
+ resp.put("success", true);
+ resp.put("resultType", resultType);
+ resp.put("message", msg.toString());
+ return R.ok(msg.toString(), resp);
} catch (Exception e) {
- return R.fail("导入失败: " + e.getMessage());
+ log.error("导入电气BOM失败", e);
+ String detail = e.getMessage();
+ if (StringUtils.isBlank(detail)) {
+ detail = e.getClass().getSimpleName();
+ }
+ return R.fail("导入失败：" + detail);
}
}
+ /**
+ * 电气 BOM 不走工艺审核：对应令号标记不做工艺，状态改为设计出图完成。
+ * 开始生产改在更新物料清单时，确认是电气项目后再写。已生产完成的令号不回退状态。
+ *
+ * @return 匹配到的项目，供钉钉通知使用（含未改状态的已完工令号）
+ */
+ private List applyElectricalSkipProcess(Set orderNos, Map resp) {
+ List updated = new ArrayList<>();
+ List productionDone = new ArrayList<>();
+ List matched = new ArrayList<>();
+ Set found = new HashSet<>();
+ if (orderNos != null && !orderNos.isEmpty()) {
+ List orders = processOrderProMapper.selectList(
+ new LambdaQueryWrapper().in(ProcessOrderPro::getProductionOrderNo, orderNos));
+ for (ProcessOrderPro order : orders) {
+ if (order == null || order.getId() == null) {
+ continue;
+ }
+ found.add(order.getProductionOrderNo());
+ ProcessOrderPro patch = new ProcessOrderPro();
+ patch.setId(order.getId());
+ patch.setNeedProcess(0);
+ // 内存对象同步，供后续钉钉通知读最新标记
+ order.setNeedProcess(0);
+ if (order.getBomStatus() != null && order.getBomStatus() == ProjectStatusLock.PRODUCTION_DONE) {
+ // 已生产完成：只改 needProcess，不回退状态
+ productionDone.add(order.getProductionOrderNo());
+ } else {
+ patch.setBomStatus(ProjectStatusLock.DRAWING_DONE);
+ order.setBomStatus(ProjectStatusLock.DRAWING_DONE);
+ updated.add(order.getProductionOrderNo());
+ }
+ processOrderProMapper.updateById(patch);
+ matched.add(order);
+ }
+ }
+ List unmatched = new ArrayList<>();
+ if (orderNos != null) {
+ for (String no : orderNos) {
+ if (StringUtils.isNotBlank(no) && !found.contains(no)) {
+ unmatched.add(no);
+ }
+ }
+ }
+ resp.put("skipProcessOrders", updated);
+ resp.put("productionDoneOrders", productionDone);
+ resp.put("unmatchedOrderNos", unmatched);
+ return matched;
+ }
+
// 保存到 BomDetails 表中
//TODO: 使用本地库加速
private List saveBomDetails(List bomDetailsVos) {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/ImMaterialController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/ImMaterialController.java
index ed79616..f762f53 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/ImMaterialController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/ImMaterialController.java
@@ -22,8 +22,10 @@ import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.excel.ExcelResult;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.JdUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.PlmDrawingFileNames;
import com.ruoyi.common.utils.file.PlmPdfArchiveExtractor;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.ImMaterial;
@@ -39,6 +41,7 @@ import com.ruoyi.system.mapper.ImMaterialMapper;
import com.ruoyi.system.service.IImMaterialService;
import com.ruoyi.system.service.IPartCostService;
import com.ruoyi.system.service.IPlmPdfZipPushService;
+import com.ruoyi.system.service.PlmDrawingArriveNotifyService;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.Data;
import lombok.RequiredArgsConstructor;
@@ -94,6 +97,7 @@ public class ImMaterialController extends BaseController {
private final IPartCostService iPartCostService;
private final IPlmPdfZipPushService plmPdfZipPushService;
+ private final PlmDrawingArriveNotifyService plmDrawingArriveNotifyService;
@Value("${plm.pdf.base-dir:D:/plm/pdf}")
private String plmPdfBaseDir;
@@ -222,6 +226,16 @@ public class ImMaterialController extends BaseController {
if (cleaned > 0) {
resp.put("cleanedParentPdfCount", String.valueOf(cleaned));
}
+ Map notifyItem = new HashMap<>(8);
+ notifyItem.put("materialCode", materialCode);
+ notifyItem.put("materialName", materialName);
+ notifyItem.put("savedFileName", targetFile.getFileName().toString());
+ if (isDrawingChanged != null) {
+ notifyItem.put("isDrawingChanged", formatPlmBool(isDrawingChanged));
+ }
+ plmDrawingArriveNotifyService.notifyAsync(
+ productionOrderNo, "/system/material/plm/pdf", "单张",
+ null, null, Collections.singletonList(notifyItem));
return R.ok(resp);
} catch (Exception e) {
log.error("接收PLM PDF图纸失败: productionOrderNo={}, materialCode={}", productionOrderNo, materialCode, e);
@@ -324,6 +338,14 @@ public class ImMaterialController extends BaseController {
return R.fail("以下items声明的文件未上传: " + String.join(", ", missingFiles));
}
+ Long processOrderProId;
+ try {
+ // 落盘前校验：令号必须已存在，不再自动建项目
+ processOrderProId = plmPdfZipPushService.ensureProcessOrderProForPlmPdf(productionOrderNo, null);
+ } catch (ServiceException e) {
+ return R.fail(e.getMessage());
+ }
+
String safeProductionOrderNo = sanitizePathPart(productionOrderNo);
String separator = resolvePlmPdfNameSeparator();
Path dir = Paths.get(plmPdfBaseDir, safeProductionOrderNo);
@@ -357,11 +379,13 @@ public class ImMaterialController extends BaseController {
}
Long pushRecordId = null;
- Long processOrderProId = null;
try {
- processOrderProId = plmPdfZipPushService.ensureProcessOrderProForPlmPdf(productionOrderNo);
+ // 落盘后按推送明细补默认产品（项目已存在）
+ processOrderProId = plmPdfZipPushService.ensureProcessOrderProForPlmPdf(productionOrderNo, saved);
pushRecordId = plmPdfZipPushService.savePushRecord(
itemsJson, "batch", productionOrderNo, dir.toString(), saved);
+ } catch (ServiceException e) {
+ return R.fail(e.getMessage());
} catch (Exception e) {
log.error("[PLM-PDF] 批量推送记录入库失败 productionOrderNo={}", productionOrderNo, e);
}
@@ -395,6 +419,9 @@ public class ImMaterialController extends BaseController {
if (cleaned > 0) {
resp.put("cleanedParentPdfCount", cleaned);
}
+ plmDrawingArriveNotifyService.notifyAsync(
+ productionOrderNo, "/system/material/plm/pdf/batch", "批量",
+ processOrderProId, pushRecordId, saved);
return R.ok(resp);
} catch (Exception e) {
log.error("批量接收PLM PDF图纸失败: productionOrderNo={}", productionOrderNo, e);
@@ -413,6 +440,15 @@ public class ImMaterialController extends BaseController {
if (parsed.failed()) {
return R.fail(parsed.message);
}
+
+ Long processOrderProId;
+ try {
+ // 落盘前校验：令号必须已存在，不再自动建项目
+ processOrderProId = plmPdfZipPushService.ensureProcessOrderProForPlmPdf(parsed.productionOrderNo, null);
+ } catch (ServiceException e) {
+ return R.fail(e.getMessage());
+ }
+
Path dir = Paths.get(plmPdfBaseDir, sanitizePathPart(parsed.productionOrderNo));
Path dwgDir = dir.resolve(PLM_DWG_SUBDIR);
String separator = resolvePlmPdfNameSeparator();
@@ -472,11 +508,13 @@ public class ImMaterialController extends BaseController {
}
Long pushRecordId = null;
- Long processOrderProId = null;
try {
- processOrderProId = plmPdfZipPushService.ensureProcessOrderProForPlmPdf(parsed.productionOrderNo);
+ // 落盘后按推送明细补默认产品（项目已存在）
+ processOrderProId = plmPdfZipPushService.ensureProcessOrderProForPlmPdf(parsed.productionOrderNo, saved);
pushRecordId = plmPdfZipPushService.savePushRecord(
manifestJson, parsed.archiveName, parsed.productionOrderNo, dir.toString(), saved);
+ } catch (ServiceException e) {
+ return R.fail(e.getMessage());
} catch (Exception e) {
log.error("[PLM-PDF] 推送记录入库失败 productionOrderNo={}, archive={}",
parsed.productionOrderNo, parsed.archiveName, e);
@@ -516,6 +554,9 @@ public class ImMaterialController extends BaseController {
}
log.info("[PLM-PDF] 接收完成 productionOrderNo={}, count={}, archive={}, pushRecordId={}, processOrderProId={}, cleanedParentPdfCount={}",
parsed.productionOrderNo, saved.size(), parsed.archiveName, pushRecordId, processOrderProId, cleaned);
+ plmDrawingArriveNotifyService.notifyAsync(
+ parsed.productionOrderNo, "/system/material/plm/pdf/zip", "压缩包",
+ processOrderProId, pushRecordId, saved);
return R.ok(resp);
}
} catch (IllegalArgumentException e) {
@@ -719,6 +760,7 @@ public class ImMaterialController extends BaseController {
/**
* 同令号同图号覆盖：先删除目录内该图号的旧文件（含历史时间戳后缀），再落盘为标准名。
+ * 按完整图号匹配，不会把 {@code 图号-MP} 等更长图号当成同一张图。
*
* @param extension 不含点，如 pdf / dwg
*/
@@ -732,7 +774,7 @@ public class ImMaterialController extends BaseController {
}
/**
- * 删除目录中与指定图号匹配的图纸（标准名、时间戳后缀名均清理）
+ * 删除目录中与指定图号匹配的图纸（标准名、历史时间戳后缀名均清理；不按「图号-」前缀误伤 -MP 等更长图号）
*/
private static void deleteExistingDrawingsByMaterialCode(Path dir, String materialCode,
String separator, String extension) {
@@ -741,15 +783,12 @@ public class ImMaterialController extends BaseController {
}
String code = sanitizeFileNamePart(materialCode);
String sep = StringUtils.isNotBlank(separator) ? separator : "_";
- String prefixWithSep = code + sep;
String ext = extension.startsWith(".") ? extension.toLowerCase(Locale.ROOT)
: ("." + extension.toLowerCase(Locale.ROOT));
try (DirectoryStream stream = Files.newDirectoryStream(dir, "*" + ext)) {
for (Path file : stream) {
String name = file.getFileName().toString();
- if (name.equalsIgnoreCase(code + ext)
- || name.regionMatches(true, 0, prefixWithSep, 0, prefixWithSep.length())
- || name.regionMatches(true, 0, code + "-", 0, code.length() + 1)) {
+ if (PlmDrawingFileNames.matchesMaterialCode(name, code, sep, extension)) {
try {
Files.deleteIfExists(file);
log.info("[PLM-PDF] 同令号同图号覆盖，已删除旧文件: {}", file);
@@ -941,7 +980,7 @@ public class ImMaterialController extends BaseController {
}
/**
- * 查询物料检索列表
+ * 查询物料检索列表（实时金蝶物料）
*/
@SaCheckPermission("system:material:list")
@GetMapping("/list")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/IndexController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/IndexController.java
index af5dfdb..f0e2be0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/IndexController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/IndexController.java
@@ -7,8 +7,7 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.utils.JdUtils;
-import com.ruoyi.system.domain.ImMaterial;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.bo.ImMaterialBo;
import com.ruoyi.system.domain.bo.ImProductionPlanBo;
import com.ruoyi.system.domain.dto.*;
@@ -17,15 +16,12 @@ import com.ruoyi.system.domain.vo.InventoryInfoVO;
import com.ruoyi.system.runner.JdUtil;
import com.ruoyi.system.service.IImMaterialService;
import com.ruoyi.system.service.IImProductionPlanService;
-import io.netty.util.concurrent.CompleteFuture;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
import java.util.concurrent.*;
@RequiredArgsConstructor
@@ -33,6 +29,8 @@ import java.util.concurrent.*;
@RequestMapping("/index")
@Slf4j
public class IndexController {
+ private static final int MAX_MATERIAL_CODES = 50;
+
private final IImMaterialService iImMaterialService;
private final IImProductionPlanService imProductionPlanService;
@@ -42,111 +40,123 @@ public class IndexController {
}
/**
- * 金蝶chaxun
+ * 金蝶库存查询（支持单个或多个物料编码）
+ *
+ * 前端一次传入多个编码；后端对每个物料按原逻辑精确查询后汇总返回（金蝶侧不支持可靠的多码 IN 拼接）。
+ * 参数任选其一：
+ * - materialCode：单个物料编码（兼容旧调用）
+ * - materialCodes：多个物料编码，逗号分隔
*/
@GetMapping("/inventory")
- public R handleData(String materialCode) {
- // 创建线程池
+ public R> handleData(
+ @RequestParam(value = "materialCode", required = false) String materialCode,
+ @RequestParam(value = "materialCodes", required = false) String materialCodes) {
+ List codes = parseMaterialCodes(materialCode, materialCodes);
+ if (codes.isEmpty()) {
+ return R.fail("请指定物料编码");
+ }
+ if (codes.size() > MAX_MATERIAL_CODES) {
+ return R.fail("单次最多查询 " + MAX_MATERIAL_CODES + " 个物料");
+ }
+
+ int poolSize = Math.min(Math.max(codes.size(), 4), 10);
ExecutorService executorService = new ThreadPoolExecutor(
- 4, // 线程池核心线程数
- 4, // 线程池最大线程数
- 0L, // 线程空闲时间
- TimeUnit.MILLISECONDS, // 时间单位
- new LinkedBlockingQueue<>(10), // 线程队列
- new ThreadPoolExecutor.DiscardPolicy() // 拒绝策略
+ poolSize,
+ poolSize,
+ 0L,
+ TimeUnit.MILLISECONDS,
+ new LinkedBlockingQueue<>(Math.max(codes.size() * 2, 10)),
+ new ThreadPoolExecutor.CallerRunsPolicy()
);
try {
- // 并行执行多个查询任务
- CompletableFuture inventoryFuture = CompletableFuture.supplyAsync(() -> {
- log.info("开始查询即时库存数量: {}", materialCode);
- return Optional.ofNullable(JdUtil.getKuCun(materialCode))
- .map(list -> list.stream()
- .mapToDouble(JDInventoryDTO::getFBaseQty)
- .sum())
- .orElse(0.0);
- }, executorService);
-
- CompletableFuture noPickedFuture = CompletableFuture.supplyAsync(() -> {
- log.info("开始查询生产用料清单子项未领料数量: {}", materialCode);
- return Optional.ofNullable(JdUtil.getWeiLingliao(materialCode))
- .map(list -> list.stream()
- .mapToDouble(JDProductionDTO::getFNoPickedQty)
- .sum())
- .orElse(0.0);
- }, executorService);
-
- CompletableFuture productionFuture = CompletableFuture.supplyAsync(() -> {
- log.info("开始查询生产订单未入库数量: {}", materialCode);
- return Optional.ofNullable(JdUtil.getProMoList(materialCode))
- .map(list -> list.stream()
- .mapToDouble(ProMoDTO::getFQty)
- .sum())
- .orElse(0.0);
- }, executorService);
-
- CompletableFuture purchaseFuture = CompletableFuture.supplyAsync(() -> {
- log.info("开始查询采购订单未入库数量: {}", materialCode);
- return Optional.ofNullable(JdUtil.getPurchaseOrderList(materialCode))
- .map(list -> list.stream()
- .mapToDouble(PurchaseOrderDTO::getFRemainStockINQty)
- .sum())
- .orElse(0.0);
- }, executorService);
- CompletableFuture salesOrderFuture = CompletableFuture.supplyAsync(() -> {
- log.info("开始查询销售订单未入库数量: {}", materialCode);
- return Optional.ofNullable(JdUtil.getSalesOrderList(materialCode))
- .map(list -> list.stream()
- .mapToDouble(SalesOrderDTO::getFBaseRemainOutQty)
- .sum())
- .orElse(0.0);
- }, executorService);
-
- // 等待所有任务完成并获取结果
- CompletableFuture resultFuture = CompletableFuture.allOf(inventoryFuture, noPickedFuture, productionFuture, purchaseFuture,salesOrderFuture)
- .thenApply(v -> {
- try {
- double inventoryQty = inventoryFuture.get();
- double fNoPickedQty = noPickedFuture.get();
- double productionQty = productionFuture.get();
- double purchaseQty = purchaseFuture.get();
- double salesOrder = salesOrderFuture.get();
-
- // 计算预计可用库存 即时库存+生产未入库+(采购申请-采购未入库)-子项未领料-销售实际未出库数量
- double keyong = inventoryQty + productionQty + purchaseQty - fNoPickedQty-salesOrder;
- InventoryInfoVO inventoryInfoVO = new InventoryInfoVO();
- inventoryInfoVO.setMaterialCode(materialCode);
- inventoryInfoVO.setKucun(String.valueOf(inventoryQty));
- inventoryInfoVO.setQuantity(String.valueOf(fNoPickedQty));
- inventoryInfoVO.setMaterialName(String.valueOf(purchaseQty));
- inventoryInfoVO.setStockName(String.valueOf(productionQty));
- inventoryInfoVO.setStockUnit(String.valueOf(keyong));
- inventoryInfoVO.setSalesOrder(String.valueOf(salesOrder));
-
- return inventoryInfoVO;
- } catch (Exception e) {
- log.error("处理库存数据时发生错误", e);
- throw new CompletionException(e);
- }
- });
-
- // 获取最终结果
- return R.ok(resultFuture.get(30, TimeUnit.SECONDS));
+ List> futures = new ArrayList<>(codes.size());
+ for (String code : codes) {
+ futures.add(CompletableFuture.supplyAsync(() -> queryOne(code), executorService));
+ }
+ CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]))
+ .get(Math.max(30, codes.size() * 10L), TimeUnit.SECONDS);
+ List result = new ArrayList<>(codes.size());
+ for (CompletableFuture future : futures) {
+ result.add(future.get());
+ }
+ return R.ok(result);
} catch (Exception e) {
log.error("查询库存信息失败", e);
return R.fail("查询库存信息失败：" + e.getMessage());
} finally {
- // 关闭线程池
executorService.shutdown();
}
}
+ /**
+ * 单个物料精确查询（与原先单码接口同一套金蝶条件），供多码并行汇总。
+ */
+ private InventoryInfoVO queryOne(String materialCode) {
+ try {
+ double inventoryQty = Optional.ofNullable(JdUtil.getKuCun(materialCode))
+ .map(list -> list.stream().mapToDouble(JDInventoryDTO::getFBaseQty).sum())
+ .orElse(0.0);
+ double fNoPickedQty = Optional.ofNullable(JdUtil.getWeiLingliao(materialCode))
+ .map(list -> list.stream().mapToDouble(JDProductionDTO::getFNoPickedQty).sum())
+ .orElse(0.0);
+ double productionQty = Optional.ofNullable(JdUtil.getProMoList(materialCode))
+ .map(list -> list.stream().mapToDouble(ProMoDTO::getFQty).sum())
+ .orElse(0.0);
+ double purchaseQty = Optional.ofNullable(JdUtil.getPurchaseOrderList(materialCode))
+ .map(list -> list.stream().mapToDouble(PurchaseOrderDTO::getFRemainStockINQty).sum())
+ .orElse(0.0);
+ double salesOrder = Optional.ofNullable(JdUtil.getSalesOrderList(materialCode))
+ .map(list -> list.stream().mapToDouble(SalesOrderDTO::getFBaseRemainOutQty).sum())
+ .orElse(0.0);
+ double keyong = inventoryQty + productionQty + purchaseQty - fNoPickedQty - salesOrder;
+
+ InventoryInfoVO vo = new InventoryInfoVO();
+ vo.setMaterialCode(materialCode);
+ vo.setKucun(String.valueOf(inventoryQty));
+ vo.setQuantity(String.valueOf(fNoPickedQty));
+ vo.setMaterialName(String.valueOf(purchaseQty));
+ vo.setStockName(String.valueOf(productionQty));
+ vo.setStockUnit(String.valueOf(keyong));
+ vo.setSalesOrder(String.valueOf(salesOrder));
+ return vo;
+ } catch (Exception e) {
+ log.error("查询单个物料库存失败: {}", materialCode, e);
+ InventoryInfoVO vo = new InventoryInfoVO();
+ vo.setMaterialCode(materialCode);
+ vo.setKucun("0.0");
+ vo.setQuantity("0.0");
+ vo.setMaterialName("0.0");
+ vo.setStockName("0.0");
+ vo.setStockUnit("0.0");
+ vo.setSalesOrder("0.0");
+ return vo;
+ }
+ }
+
+ private static List parseMaterialCodes(String materialCode, String materialCodes) {
+ LinkedHashSet set = new LinkedHashSet<>();
+ addCodes(set, materialCodes);
+ addCodes(set, materialCode);
+ return new ArrayList<>(set);
+ }
+
+ private static void addCodes(Set set, String raw) {
+ if (StringUtils.isBlank(raw)) {
+ return;
+ }
+ for (String part : raw.split(",")) {
+ if (StringUtils.isNotBlank(part)) {
+ set.add(part.trim());
+ }
+ }
+ }
+
@Log(title = "生产计划")
@PostMapping("/JDList")
- public void synchronize_lists() {
+ public void synchronize_lists() {
K3CloudApi client = new K3CloudApi();
- //请求参数，要求为json字符串
JsonObject json = new JsonObject();
json.addProperty("FormId", "PRD_MO");
json.addProperty("FieldKeys", "FID,F_UCHN_Text,FBillType.FNUMBER,FMaterialId.FNumber,FMaterialName,FQty,FBillType.FNUMBER,FWorkShopID.FNumber,FDate,FProductType,FPickMtrlStatus");
@@ -168,19 +178,16 @@ public class IndexController {
String jsonData = json.toString();
try {
-
- // 调用接口并获取结果
String input = String.valueOf(client.executeBillQuery(jsonData));
input = input.substring(2, input.length() - 2);
String[] split = input.split("]\\, \\[");
for (String imProductionn : split) {
ImProductionPlanBo imProductionPlan = new ImProductionPlanBo();
- String[] imPro= imProductionn.split(",");
+ String[] imPro = imProductionn.split(",");
imProductionPlan.setFID(Long.valueOf(imPro[0]));
imProductionPlan.setProductionCode(imPro[1]);
imProductionPlan.setTypeName(imPro[2]);
imProductionPlan.setWorkShop(imPro[7]);
- // 解析时间
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
Date parse = simpleDateFormat.parse(imPro[8]);
imProductionPlan.setDateF(parse);
@@ -188,14 +195,13 @@ public class IndexController {
imProductionPlan.setProductTyp(imPro[10]);
imProductionPlan.setFigureNumber(imPro[3]);
imProductionPlan.setFigureName(imPro[4]);
- // imProductionPlan.setOneNumber(imPro[5]);
imProductionPlan.setPickmtrlStatus(imPro[10]);
imProductionPlan.setUpdateTime(new Date());
imProductionPlan.setSearchValue("1");
imProductionPlan.setUpdateBy("admin");
imProductionPlan.setCreateTime(new Date());
imProductionPlan.setCreateBy("admin");
- imProductionPlanService.insertByBo(imProductionPlan) ;
+ imProductionPlanService.insertByBo(imProductionPlan);
}
} catch (Exception e) {
e.printStackTrace();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/PlmProductionOrderController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/PlmProductionOrderController.java
index 6730727..22f5fc5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/PlmProductionOrderController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/PlmProductionOrderController.java
@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaIgnore;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.ProjectStatusLock;
import com.ruoyi.system.domain.bo.ProcessOrderProBo;
import com.ruoyi.system.domain.vo.ProcessOrderProVo;
import com.ruoyi.system.domain.vo.plm.PlmProductionOrderVo;
@@ -45,8 +46,7 @@ public class PlmProductionOrderController extends BaseController {
public TableDataInfo productionOrders(ProcessOrderProBo bo, PageQuery pageQuery) {
TableDataInfo page = processOrderProService.queryPageList(bo, pageQuery);
List rows = page.getRows();
- List mapped = rows == null ? Collections.emptyList()
- : rows.stream().map(this::toPlmVo).collect(Collectors.toList());
+ List mapped = rows == null ? Collections.emptyList() : rows.stream().map(this::toPlmVo).collect(Collectors.toList());
TableDataInfo result = new TableDataInfo<>(mapped, page.getTotal());
result.setCode(page.getCode());
result.setMsg(page.getMsg());
@@ -63,7 +63,7 @@ public class PlmProductionOrderController extends BaseController {
vo.setUnit(src.getUnit());
vo.setNeedProcess(src.getNeedProcess());
vo.setBomStatus(src.getBomStatus());
- vo.setBomStatusLabel(resolveBomStatusLabel(src.getBomStatus()));
+ vo.setBomStatusLabel(src.getBomStatus() == null ? null : ProjectStatusLock.statusLabel(src.getBomStatus()));
vo.setRouteStatus(src.getRouteStatus());
vo.setRouteStatusLabel(resolveRouteStatusLabel(src.getRouteStatus()));
vo.setPlanStartTime(src.getPlanStartTime());
@@ -72,39 +72,6 @@ public class PlmProductionOrderController extends BaseController {
return vo;
}
- /**
- * 项目状态：0方案设计完成 … 2工艺待审核 … 6开始生产 … 8工艺审核完成 … 9工艺审核拒绝
- */
- private static String resolveBomStatusLabel(Long status) {
- if (status == null) {
- return null;
- }
- switch (status.intValue()) {
- case 0:
- return "方案设计完成";
- case 1:
- return "设计出图完成";
- case 2:
- return "工艺待审核";
- case 3:
- return "已推送BOM";
- case 4:
- return "已推送工艺";
- case 5:
- return "已核算MRP";
- case 6:
- return "开始生产";
- case 7:
- return "生产完成";
- case 8:
- return "工艺审核完成";
- case 9:
- return "工艺审核拒绝";
- default:
- return String.valueOf(status);
- }
- }
-
/** 工艺审核：0未审核 1已审核 2已拒绝 */
private static String resolveRouteStatusLabel(Long status) {
if (status == null) {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/ProcessOrderProController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/ProcessOrderProController.java
index 107c2a2..00e5ea1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/ProcessOrderProController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/ProcessOrderProController.java
@@ -26,6 +26,7 @@ import com.ruoyi.common.poi.DynamicDataMapping;
import com.ruoyi.system.constant.ProcessOrderProSource;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.domain.bo.KingdeeOrderReceiveBatchBo;
+import com.ruoyi.system.domain.bo.OrderProBomStatusBo;
import com.ruoyi.system.domain.dto.KingdeePrdMoDTO;
import com.ruoyi.system.domain.dto.KingdeePurchaseOrderDTO;
import com.ruoyi.system.domain.dto.MaterialUseDTO;
@@ -53,6 +54,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;
@@ -133,6 +135,28 @@ public class ProcessOrderProController extends BaseController {
ExcelUtil.exportExcel(exportList, "项目令号", ProcessOrderProExportVo.class, response);
}
+ /**
+ * 临时导入模板：生产令号 / 出图时间 / 项目完成时间 / 工艺完成时间 / 计划排产时间 / BOM/物料更新 / 设计人
+ */
+ @Log(title = "预计出图时间导入模板", businessType = BusinessType.EXPORT)
+ @SaCheckPermission("system:orderPro:importDrawingByTemplate")
+ @PostMapping("/importDrawingByTemplate")
+ public void importDrawingByTemplate(HttpServletResponse response) {
+ ExcelUtil.exportExcel(new ArrayList<>(), "项目时间导入", OrderProDrawingImportVo.class, response);
+ }
+
+ /**
+ * 临时导入：按生产令号更新已填写字段，空单元格不更新
+ */
+ @Log(title = "导入预计出图时间", businessType = BusinessType.IMPORT)
+ @SaCheckPermission("system:orderPro:importDrawingBy")
+ @PostMapping(value = "/importDrawingBy", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+ public R> importDrawingBy(@RequestPart("file") MultipartFile file) {
+ Map result = iProcessOrderProService.importDrawingByExcel(file);
+ String message = result.get("message") != null ? String.valueOf(result.get("message")) : "导入完成";
+ return R.ok(message, result);
+ }
+
/**
* 获取项目令号详细信息
*
@@ -170,6 +194,18 @@ public class ProcessOrderProController extends BaseController {
return toAjax(iProcessOrderProService.updateByBo(bo));
}
+ /**
+ * 批量设置项目状态。
+ * 独立接口，避免走 PUT /system/orderPro 的 EditGroup（设计人必填）导致只改状态失败。
+ */
+ @SaCheckPermission("system:orderPro:edit")
+ @Log(title = "设置项目状态", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PutMapping("/bomStatus")
+ public R updateBomStatus(@Validated @RequestBody OrderProBomStatusBo bo) {
+ return toAjax(iProcessOrderProService.updateBomStatus(bo.getIds(), bo.getBomStatus()));
+ }
+
/**
* 清空项目关联数据（保留项目）
*
@@ -258,6 +294,18 @@ public class ProcessOrderProController extends BaseController {
return R.ok();
}
+ /**
+ * 设置出图模式：normal 正常 / part 零部件
+ */
+ @SaCheckPermission("system:orderPro:edit")
+ @Log(title = "设置出图模式", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PutMapping("/drawingMode/{id}")
+ public R updateDrawingMode(@PathVariable Long id, @RequestBody ProcessOrderProBo bo) {
+ String mode = bo == null ? null : bo.getDrawingMode();
+ return toAjax(iProcessOrderProService.updateDrawingMode(id, mode));
+ }
+
@SaCheckPermission("system:orderPro:executDrawing")
@Log(title = "执行出图", businessType = BusinessType.INSERT)
@RepeatSubmit()
@@ -361,6 +409,7 @@ public class ProcessOrderProController extends BaseController {
os.flush();
}
log.info("下载PDF ZIP 输出完成: id={}, file={}", id, file.getName());
+ iProcessOrderProService.cleanupPdfRunDir(filePath);
} catch (Exception e) {
if (response.isCommitted()) {
@@ -430,6 +479,7 @@ public class ProcessOrderProController extends BaseController {
}
os.flush();
}
+ iProcessOrderProService.cleanupPdfRunDir(zipFile.getAbsolutePath());
} catch (Exception e) {
if (response.isCommitted()) {
@@ -1947,7 +1997,8 @@ public class ProcessOrderProController extends BaseController {
}
/**
- * 出图完成后由前端触发：先推送「出图完成」Markdown，再生成工艺计划表 Excel 并发至钉钉 notifyUserId。
+ * 出图完成后由前端触发：先推送「出图完成」Markdown，再生成工艺计划表 Excel 并发至钉钉 notifyUserId（工艺）。
+ * 项目「是否做工艺=否」时不推送。
*/
@SaCheckPermission("system:orderPro:sendProcessRoutePlanExcel")
@Log(title = "发送工艺计划表", businessType = BusinessType.OTHER)
@@ -1956,6 +2007,16 @@ public class ProcessOrderProController extends BaseController {
return iProcessOrderProService.sendProcessRoutePlanExcel(id);
}
+ /**
+ * 设计人员确认本令号图纸已全部上传，确认后方可下载 PDF / PLM DWG。
+ */
+ @SaCheckPermission("system:orderPro:issueDrawingQty")
+ @Log(title = "确认图纸已齐", businessType = BusinessType.UPDATE)
+ @PostMapping("/issueDrawingQty/{id}")
+ public R> issueDrawingQty(@NotNull(message = "项目ID不能为空") @PathVariable Long id) {
+ return iProcessOrderProService.issueDrawingQty(id);
+ }
+
/**
* 查询工艺计划表钉钉发送成功次数（用于按钮文案）
*/
@@ -2821,6 +2882,11 @@ public class ProcessOrderProController extends BaseController {
writeJsonFail(response, "项目未配置生产令号");
return;
}
+ if (ProcessOrderProSource.PLM.equals(orderPro.getSource())
+ && !Integer.valueOf(1).equals(orderPro.getDrawingQtyIssued())) {
+ writeJsonFail(response, "请先点击「确认图纸已齐」，图纸全部上传完成后再下载图纸");
+ return;
+ }
List dwgFiles = plmPdfZipPushService.listDownloadableDwgFiles(orderPro.getProductionOrderNo());
String zipName = orderPro.getProductionOrderNo().trim() + "_PLM_DWG.zip";
String encoded = URLEncoder.encode(zipName, "UTF-8").replaceAll("\\+", "%20");
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/ProcessRouteController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/ProcessRouteController.java
index c75e2ae..e683b26 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/ProcessRouteController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/ProcessRouteController.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
import cn.hutool.json.JSONUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
@@ -25,9 +26,12 @@ import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.FtpUtil;
import com.ruoyi.common.utils.KingdeeRouteDepartmentHelper;
+import com.ruoyi.common.utils.JsyyOrderNo;
+import com.ruoyi.common.utils.ProjectStatusLock;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.SmbUtil;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.constant.DingTodoSceneCodes;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.domain.bo.ProcessRouteBo;
import com.ruoyi.system.domain.dto.*;
@@ -66,8 +70,6 @@ import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
/**
* 工艺路线
@@ -98,8 +100,13 @@ public class ProcessRouteController extends BaseController {
private ISysOssService iSysOssService;
@Autowired
private IProcessOrderProService processOrderProService;
- /** 计划表落盘 + 按 plan-user-id 推送（与 PLM 导出共用） */
+ /**
+ * 计划表落盘 + 按 plan-user-id 推送（与 PLM 导出共用）
+ */
private final ProcessPlanExcelPushService processPlanExcelPushService;
+ private final IDrawingRouteOperLogService drawingRouteOperLogService;
+ private final IDingTodoDispatchService dingTodoDispatchService;
+ private final DrawingFileQueryService drawingFileQueryService;
@Autowired
private ISysUserService userService;
@@ -175,9 +182,9 @@ public class ProcessRouteController extends BaseController {
}
/**
- * 查询工艺路线列表
+ * 查询工艺路线列表。项目令号「查看工艺」只分配 processlist 时也要能拉数。
*/
- @SaCheckPermission("system:route:list")
+ @SaCheckPermission(value = {"system:route:list", "system:orderPro:processlist"}, mode = SaMode.OR)
@GetMapping("/list")
public TableDataInfo list(ProcessRouteBo bo, PageQuery pageQuery) {
try {
@@ -400,7 +407,8 @@ public class ProcessRouteController extends BaseController {
@Log(title = "生产工艺计划表导入", businessType = BusinessType.IMPORT)
@SaCheckPermission("system:route:importRoute")
@PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- public R importData(@RequestParam("file") MultipartFile file) throws Exception {
+ public R importData(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "productionOrderNo", required = false) String expectedOrderNo) throws Exception {
String originalFilename = file.getOriginalFilename();
log.info("读取文件名: " + originalFilename);
@@ -410,23 +418,57 @@ public class ProcessRouteController extends BaseController {
// 读取总装部分sheet
ExcelResult result1 = ExcelUtil.importExcelSheet1(file.getInputStream(), ProductionOrderVo.class, true);
List list = result1.getList();
- String productionOrderNo = list1.get(0).getRouteDescription();
- List bomDetails = iBomDetailsService.selectByProjectNumber(list1.get(0).getRouteDescription());
- List route = iProcessRouteService.selectByProjectNumber(list1.get(0).getRouteDescription());
- if (list1.isEmpty()) {
- return R.fail("项目 " + productionOrderNo + "工艺生产计划表为空,请检查此表或将sheet移动至第七个!");
+ long started = System.currentTimeMillis();
+ if (list1 == null || list1.isEmpty()) {
+ recordRouteUpload(null, expectedOrderNo, originalFilename, 0,
+ IDrawingRouteOperLogService.STATUS_FAIL, "工艺生产计划表为空", started);
+ return R.fail("工艺生产计划表为空,请检查此表或将sheet移动至第七个!");
}
+ // 防呆：当前项目令号必须与文件内「生产令号」一致
+ String orderNoMismatch = validateImportOrderNo(expectedOrderNo, list1, list);
+ if (orderNoMismatch != null) {
+ ProcessOrderPro orderForMismatch = StringUtils.isNotBlank(expectedOrderNo)
+ ? processOrderProService.selectByProjectNumber(expectedOrderNo.trim()) : null;
+ recordRouteUpload(orderForMismatch, expectedOrderNo, originalFilename, list1.size(),
+ IDrawingRouteOperLogService.STATUS_FAIL, orderNoMismatch, started);
+ return R.fail(orderNoMismatch);
+ }
+ String resolvedOrderNo = firstNonBlankRouteDescription(list1);
+ if (StringUtils.isBlank(resolvedOrderNo) && StringUtils.isNotBlank(expectedOrderNo)) {
+ resolvedOrderNo = expectedOrderNo.trim();
+ }
+ // 后面异步推送会捕获令号，必须是 effectively final
+ final String productionOrderNo = resolvedOrderNo;
+ ProcessOrderPro orderForLock = processOrderProService.selectByProjectNumber(productionOrderNo);
+ if (orderForLock != null) {
+ String statusDeny = ProjectStatusLock.denyIfLocked(orderForLock.getBomStatus(), ProjectStatusLock.Action.UPLOAD_ROUTE);
+ if (statusDeny != null) {
+ recordRouteUpload(orderForLock, productionOrderNo, originalFilename, list1.size(),
+ IDrawingRouteOperLogService.STATUS_FAIL, statusDeny, started);
+ return R.fail(statusDeny);
+ }
+ }
+ List bomDetails = iBomDetailsService.selectByProjectNumber(productionOrderNo);
+ List route = iProcessRouteService.selectByProjectNumber(productionOrderNo);
if (!bomDetails.isEmpty()) {
+ recordRouteUpload(orderForLock, productionOrderNo, originalFilename, list1.size(),
+ IDrawingRouteOperLogService.STATUS_FAIL, "已导入过BOM,请先清空再上传", started);
return R.fail("项目 " + productionOrderNo + "已导入过BOM,请先清空再上传");
}
if (!route.isEmpty()) {
+ recordRouteUpload(orderForLock, productionOrderNo, originalFilename, list1.size(),
+ IDrawingRouteOperLogService.STATUS_FAIL, "已导入过工艺,请先清空再上传", started);
return R.fail("项目 " + productionOrderNo + "已导入过工艺 ,请先清空再上传");
}
String workCenterError = validateImportWorkCenters(list1);
if (workCenterError != null) {
+ recordRouteUpload(orderForLock, productionOrderNo, originalFilename, list1.size(),
+ IDrawingRouteOperLogService.STATUS_FAIL, "工段校验失败", started);
return R.fail("生产工艺计划表工段校验失败：\n" + workCenterError);
}
if (iProcessRouteService.saveData(list1, list)) {
+ recordRouteUpload(orderForLock, productionOrderNo, originalFilename, list1.size(),
+ IDrawingRouteOperLogService.STATUS_SUCCESS, null, started);
// 计划表落到服务器固定目录（app.plan-excel.base-dir/令号/），保留不删
File savedPlanFile = null;
try {
@@ -456,12 +498,38 @@ public class ProcessRouteController extends BaseController {
log.warn("获取当前登录用户昵称失败", e);
}
+ String todoProjectName = orderForLock == null ? null : orderForLock.getProductionName();
+ Date todoProjectEndTime = orderForLock == null ? null : orderForLock.getProjectEndTime();
+ String planUserIds = dingTalkProperties.getPlanUserId();
// 异步：按 plan-user-id 发文件 + 发工艺审核卡片（落盘文件保留）
String finalNickName = currentUserNickName;
+ String operator = drawingRouteOperLogService.currentOperator();
+ String clientIp = drawingRouteOperLogService.currentClientIp();
+ Long projectId = orderForLock == null ? null : orderForLock.getId();
+ ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
CompletableFuture.runAsync(() -> {
- // 与 PLM 导出推送同一套接收人
- processPlanExcelPushService.sendToPlanUsers(uploadFile, originalFilename);
-
+ Thread.currentThread().setContextClassLoader(contextClassLoader);
+ long notifyStarted = System.currentTimeMillis();
+ ProcessPlanExcelPushService.FilePushResult filePush =
+ processPlanExcelPushService.sendToPlanUsers(uploadFile, originalFilename);
+ String todoError = dingTodoDispatchService.sendIfEnabled(
+ DingTodoSceneCodes.ROUTE_UPLOAD_PLAN,
+ productionOrderNo,
+ todoProjectName,
+ todoProjectEndTime,
+ uploadFile,
+ planUserIds);
+ if (StringUtils.isNotBlank(todoError) && filePush != null) {
+ filePush.setErrorMsg(StringUtils.isBlank(filePush.getErrorMsg())
+ ? "待办: " + todoError
+ : filePush.getErrorMsg() + "; 待办: " + todoError);
+ if (filePush.getSuccessCount() > 0) {
+ filePush.setFailCount(filePush.getFailCount() + 1);
+ }
+ }
+ boolean cardOk = false;
+ String cardError = null;
+ String outTrackId = null;
try {
ProcessOrderPro order = processOrderProService.selectByProjectNumber(productionOrderNo);
if (order != null) {
@@ -476,7 +544,7 @@ public class ProcessRouteController extends BaseController {
cardDataMap.put("lastMessage", "请尽快处理");
cardDataMap.put("status", StringUtils.defaultIfEmpty("待审批", "待审批"));
- String outTrackId = "audit-card-" + System.currentTimeMillis();
+ outTrackId = "audit-card-" + System.currentTimeMillis();
// 调用发送给工艺负责人的方法 createAndDeliverCardToUser
DingUtil.createAndDeliverCardToUser(
accessToken,
@@ -497,17 +565,172 @@ public class ProcessRouteController extends BaseController {
// 更新审核状态为1（已审核/提交审核）
update.setRouteStatus(0L);
proMapper.updateById(update);
+ cardOk = true;
+ } else {
+ cardError = "项目不存在，未发送审核卡片";
}
} catch (Exception e) {
+ cardError = e.getMessage();
log.error("发送钉钉卡片异常", e);
}
+ recordRouteNotifyAfterUpload(productionOrderNo, projectId, originalFilename, finalNickName,
+ filePush, cardOk, cardError, outTrackId, operator, clientIp, notifyStarted);
});
return R.ok("上传物料成功");
} else {
+ recordRouteUpload(orderForLock, productionOrderNo, originalFilename, list1.size(),
+ IDrawingRouteOperLogService.STATUS_FAIL, "导入失败", started);
return R.fail("导入失败");
}
}
+ /**
+ * 防呆：页面所选项目令号须与 Excel「生产令号」一致。
+ * 工艺 sheet（routeDescription）与总装 sheet（productionOrderNo）都会检查。
+ *
+ * @return 错误提示；通过则 null
+ */
+ private String validateImportOrderNo(String expectedOrderNo, List routes,
+ List products) {
+ LinkedHashSet fileNos = new LinkedHashSet<>();
+ if (routes != null) {
+ for (ProcessRouteVo row : routes) {
+ if (row != null && StringUtils.isNotBlank(row.getRouteDescription())) {
+ fileNos.add(row.getRouteDescription().trim());
+ }
+ }
+ }
+ if (products != null) {
+ for (ProductionOrderVo row : products) {
+ if (row != null && StringUtils.isNotBlank(row.getProductionOrderNo())) {
+ fileNos.add(row.getProductionOrderNo().trim());
+ }
+ }
+ }
+ if (fileNos.isEmpty()) {
+ return "导入文件未读到生产令号，请检查工艺计划表「生产令号」列";
+ }
+ // 大小写不同仍视为同一令号，避免 Excel 大小写差异误报多个令号
+ String fileNo = null;
+ for (String no : fileNos) {
+ if (fileNo == null) {
+ fileNo = no;
+ } else if (!fileNo.equalsIgnoreCase(no)) {
+ return "导入文件中存在多个生产令号：" + String.join("、", fileNos) + "，请确认是否导错文件";
+ }
+ }
+ if (StringUtils.isBlank(expectedOrderNo)) {
+ return "请先选择要导入的项目令号";
+ }
+ String expected = expectedOrderNo.trim();
+ if (!expected.equalsIgnoreCase(fileNo)) {
+ return "导入令号不一致：当前项目为「" + expected + "」，文件中为「" + fileNo + "」，请确认后重新导入";
+ }
+ return null;
+ }
+
+ /**
+ * 取工艺表中第一条非空生产令号。
+ */
+ private static String firstNonBlankRouteDescription(List routes) {
+ if (routes == null) {
+ return null;
+ }
+ for (ProcessRouteVo row : routes) {
+ if (row != null && StringUtils.isNotBlank(row.getRouteDescription())) {
+ return row.getRouteDescription().trim();
+ }
+ }
+ return null;
+ }
+
+ private void recordRouteUpload(ProcessOrderPro order, String productionOrderNo, String fileName,
+ int lineCount, String status, String errorMsg, long started) {
+ Map summary = new LinkedHashMap<>();
+ summary.put("lineCount", lineCount);
+ summary.put("fileName", fileName);
+ drawingRouteOperLogService.record(IDrawingRouteOperLogService.BIZ_ROUTE_UPLOAD, row -> {
+ row.setChannel(IDrawingRouteOperLogService.CHANNEL_MANUAL);
+ row.setApiPath("/system/route/importData");
+ row.setProjectId(order == null ? null : order.getId());
+ row.setProductionOrderNo(productionOrderNo);
+ row.setFileName(fileName);
+ row.setStatus(status);
+ row.setErrorMsg(errorMsg);
+ row.setSummaryJson(JSONUtil.toJsonStr(summary));
+ row.setDurationMs(System.currentTimeMillis() - started);
+ });
+ }
+
+ private void recordRouteNotifyAfterUpload(String productionOrderNo, Long projectId, String fileName,
+ String nickName, ProcessPlanExcelPushService.FilePushResult filePush,
+ boolean cardOk, String cardError, String outTrackId,
+ String operator, String clientIp, long started) {
+ String fileStatus = filePush == null ? IDrawingRouteOperLogService.STATUS_FAIL : filePush.resolveStatus();
+ boolean fileOk = IDrawingRouteOperLogService.STATUS_SUCCESS.equals(fileStatus);
+ String status;
+ if (fileOk && cardOk) {
+ status = IDrawingRouteOperLogService.STATUS_SUCCESS;
+ } else if (!fileOk && !cardOk) {
+ status = IDrawingRouteOperLogService.STATUS_FAIL;
+ } else {
+ status = IDrawingRouteOperLogService.STATUS_PARTIAL;
+ }
+ StringBuilder error = new StringBuilder();
+ if (filePush != null && StringUtils.isNotBlank(filePush.getErrorMsg())) {
+ error.append("文件: ").append(filePush.getErrorMsg());
+ }
+ if (StringUtils.isNotBlank(cardError)) {
+ if (error.length() > 0) {
+ error.append("; ");
+ }
+ error.append("卡片: ").append(cardError);
+ }
+ Map summary = new LinkedHashMap<>();
+ summary.put("fileStatus", fileStatus);
+ summary.put("fileSuccessCount", filePush == null ? 0 : filePush.getSuccessCount());
+ summary.put("fileFailCount", filePush == null ? 0 : filePush.getFailCount());
+ summary.put("cardOk", cardOk);
+ summary.put("outTrackId", outTrackId);
+ summary.put("submitter", nickName);
+ String notifyUsers = joinNotifyUsers(
+ filePush == null ? null : filePush.getUserIds(),
+ dingTalkProperties.getRouteApprovalId());
+ drawingRouteOperLogService.record(IDrawingRouteOperLogService.BIZ_ROUTE_NOTIFY, row -> {
+ row.setChannel(IDrawingRouteOperLogService.CHANNEL_MANUAL);
+ row.setApiPath("/system/route/importData");
+ row.setProjectId(projectId);
+ row.setProductionOrderNo(productionOrderNo);
+ row.setNotifyType(IDrawingRouteOperLogService.NOTIFY_FILE_AND_CARD);
+ row.setNotifyUserIds(notifyUsers);
+ row.setMessageTitle(nickName + "提交工艺审核");
+ row.setFileName(fileName);
+ row.setStatus(status);
+ row.setErrorMsg(error.length() == 0 ? null : error.toString());
+ row.setSummaryJson(JSONUtil.toJsonStr(summary));
+ row.setOperator(operator);
+ row.setClientIp(clientIp);
+ row.setDurationMs(System.currentTimeMillis() - started);
+ });
+ }
+
+ private static String joinNotifyUsers(String... parts) {
+ StringBuilder sb = new StringBuilder();
+ if (parts == null) {
+ return null;
+ }
+ for (String part : parts) {
+ if (StringUtils.isBlank(part)) {
+ continue;
+ }
+ if (sb.length() > 0) {
+ sb.append(",");
+ }
+ sb.append(part.trim());
+ }
+ return sb.length() == 0 ? null : sb.toString();
+ }
+
/**
* 查询组焊件集合
*/
@@ -549,9 +772,51 @@ public class ProcessRouteController extends BaseController {
@SaCheckPermission("system:route:pushRouteBom")
@PostMapping("/pushRouteBom")
public R pushRouteBom(@RequestParam String rooteProdet, @RequestParam String groupName) {
+ String jsyyDeny = JsyyOrderNo.denyIfMatches(rooteProdet);
+ if (jsyyDeny != null) {
+ return R.fail(jsyyDeny);
+ }
+ ProcessOrderPro orderForLock = processOrderProService.selectByProjectNumber(rooteProdet);
+ if (orderForLock != null) {
+ String statusDeny = ProjectStatusLock.denyIfLocked(orderForLock.getBomStatus(), ProjectStatusLock.Action.PUSH_ROUTE);
+ if (statusDeny != null) {
+ return R.fail(statusDeny);
+ }
+ }
return iProcessRouteService.pushRouteBom(rooteProdet, groupName);
}
+ /**
+ * 按物料推送工艺：只推所选物料，不改项目整单状态。
+ */
+ @Log(title = "按物料推送工艺工序")
+ @SaCheckPermission("system:route:pushRouteBom")
+ @PostMapping("/pushRouteBomByMaterial")
+ public R pushRouteBomByMaterial(@RequestParam String rooteProdet,
+ @RequestParam String groupName,
+ @RequestParam String materialCodes) {
+ String jsyyDeny = JsyyOrderNo.denyIfMatches(rooteProdet);
+ if (jsyyDeny != null) {
+ return R.fail(jsyyDeny);
+ }
+ ProcessOrderPro orderForLock = processOrderProService.selectByProjectNumber(rooteProdet);
+ if (orderForLock != null) {
+ String statusDeny = ProjectStatusLock.denyIfLocked(orderForLock.getBomStatus(), ProjectStatusLock.Action.PUSH_ROUTE);
+ if (statusDeny != null) {
+ return R.fail(statusDeny);
+ }
+ }
+ if (StringUtils.isBlank(materialCodes)) {
+ return R.fail("请选择要推送的物料");
+ }
+ List codes = Arrays.stream(materialCodes.split("[,，;；\\s]+"))
+ .map(String::trim)
+ .filter(StringUtils::isNotBlank)
+ .distinct()
+ .collect(Collectors.toList());
+ return iProcessRouteService.pushRouteBomByMaterial(rooteProdet, groupName, codes);
+ }
+
@Log(title = "审核通过（发送钉钉通知，不推送金蝶）")
@SaCheckPermission("system:route:approveRoute")
@PostMapping("/approveRoute")
@@ -583,41 +848,54 @@ public class ProcessRouteController extends BaseController {
return iProcessRouteService.getSelecPlanRouteList(rooteProdet);
}
- @Log(title = "生成项目图纸PDF")
+ @Log(title = "生成工序计划单PDF")
@SaCheckPermission("system:route:generatePDFs")
@GetMapping("/generatePDFs")
- public void generatePDFs(String rooteProdet, HttpServletResponse response) throws IOException {
- // 调用服务层方法生成 ZIP 文件并获取其路径
- String zipFilePath = iProcessRouteService.generatePDFs(rooteProdet);
- ProcessOrderPro processOrderPro = proMapper.selectByProjectNumber(rooteProdet);
- processOrderPro.setBomStatus(5L);
- proMapper.updateById(processOrderPro);
- // 读取文件为字节数组
- File zipFile = new File(zipFilePath);
- if (!zipFile.exists()) {
- throw new FileNotFoundException("ZIP 文件未找到: " + zipFilePath);
+ public void generatePDFs(String rooteProdet,
+ @RequestParam(value = "materialCode", required = false) String materialCode,
+ HttpServletResponse response) throws IOException {
+ if (StringUtils.isBlank(rooteProdet)) {
+ throw new ServiceException("生产令号不能为空");
}
- if (zipFile.length() <= 0) {
- throw new IOException("ZIP 文件为空: " + zipFilePath);
+ // 有物料编码：单份 PDF；无物料编码：令号下全部 PDF 压缩包
+ String filePath = iProcessRouteService.generatePDFs(rooteProdet, materialCode);
+ File outFile = new File(filePath);
+ if (!outFile.exists()) {
+ throw new FileNotFoundException("文件未找到: " + filePath);
}
- try (ZipFile zf = new ZipFile(zipFile)) {
- Enumeration entries = zf.entries();
- if (entries == null || !entries.hasMoreElements()) {
- throw new IOException("ZIP 文件中没有PDF: " + zipFilePath);
+ if (outFile.length() <= 0) {
+ throw new IOException("文件为空: " + filePath);
+ }
+ boolean isPdf = filePath.toLowerCase().endsWith(".pdf");
+ boolean isZip = filePath.toLowerCase().endsWith(".zip");
+ if (!isPdf && !isZip) {
+ throw new IOException("未生成PDF或压缩包: " + filePath);
+ }
+ response.setContentType(isPdf ? "application/pdf" : "application/zip");
+ String encoded = URLEncoder.encode(outFile.getName(), "UTF-8").replaceAll("\\+", "%20");
+ response.setHeader("Content-Disposition", "attachment; filename*=UTF-8''" + encoded);
+ try (FileInputStream fis = new FileInputStream(outFile);
+ OutputStream outputStreams = response.getOutputStream()) {
+ byte[] buffer = new byte[1024];
+ int len;
+ while ((len = fis.read(buffer)) != -1) {
+ outputStreams.write(buffer, 0, len);
}
+ outputStreams.flush();
}
- FileInputStream fis = new FileInputStream(zipFile);
- OutputStream outputStreams = response.getOutputStream();
- response.setContentType("application/zip");
- byte[] buffer = new byte[1024];
- int len;
- while ((len = fis.read(buffer)) != -1) {
- outputStreams.write(buffer, 0, len);
- }
- outputStreams.flush();
+ }
- fis.close();
- outputStreams.close();
+ /**
+ * 下载 PLM 图纸/模型。后端校验项目来源后转发文件服务。
+ */
+ @Log(title = "下载图纸模型", businessType = BusinessType.EXPORT)
+ @SaCheckPermission("system:route:downloadDrawingModel")
+ @GetMapping("/downloadDrawingModel")
+ public void downloadDrawingModel(@RequestParam String productionOrderNo,
+ @RequestParam String materialCode,
+ @RequestParam String fileType,
+ HttpServletResponse response) {
+ drawingFileQueryService.download(productionOrderNo, materialCode, fileType, response);
}
@Log(title = "更新计划时间")
@@ -719,7 +997,7 @@ public class ProcessRouteController extends BaseController {
log.info("读取文件名: " + originalFilename);
ExcelResult result = ExcelUtil.importExcelSheet6(file.getInputStream(), ProcessRouteVo.class, true);
List list = result.getList();
- List list1 = iProcessRouteService.importDataTime(list);
+ iProcessRouteService.importDataTime(list);
return R.ok("更新成功");
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/ProcessRoutePushReceiveController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/ProcessRoutePushReceiveController.java
index 942f868..35cee6e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/ProcessRoutePushReceiveController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/ProcessRoutePushReceiveController.java
@@ -13,8 +13,10 @@ import com.ruoyi.system.domain.ProcessOrderPro;
import com.ruoyi.system.domain.bo.plm.PlmProcessRoutePushBo;
import com.ruoyi.system.domain.bo.plm.PlmProcessRoutePushNormalizer;
import com.ruoyi.system.mapper.ProcessOrderProMapper;
+import com.ruoyi.system.service.IDrawingRouteOperLogService;
import com.ruoyi.system.service.IPlmProcessRoutePushService;
import com.ruoyi.system.service.IPlmReceiveLogService;
+import com.ruoyi.system.service.PlmPlanCompleteNotifyService;
import com.ruoyi.system.service.ProcessPlanExcelPushService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -46,8 +48,11 @@ public class ProcessRoutePushReceiveController extends BaseController {
private final IPlmProcessRoutePushService plmProcessRoutePushService;
private final IPlmReceiveLogService plmReceiveLogService;
private final ProcessOrderProMapper processOrderProMapper;
- /** 导出计划表落盘 + 按 plan-user-id 推送（与手动上传一致） */
+ /** 导出计划表落盘；总装已到才按 plan-user-id 推送 */
private final ProcessPlanExcelPushService processPlanExcelPushService;
+ /** 总装 BOM 与工艺都到齐后发给 plan-user-id */
+ private final PlmPlanCompleteNotifyService plmPlanCompleteNotifyService;
+ private final IDrawingRouteOperLogService drawingRouteOperLogService;
/**
* 接收一个生产令号下的物料、材料 BOM、工艺路线及工步数据。
@@ -81,6 +86,8 @@ public class ProcessRoutePushReceiveController extends BaseController {
summaryMap.put("savedBomCount", summary.getSavedBomCount());
summaryMap.put("savedMaterialBomCount", summary.getSavedMaterialBomCount());
summaryMap.put("savedRouteCount", summary.getSavedRouteCount());
+ summaryMap.put("appended", summary.isAppended());
+ summaryMap.put("replaced", summary.isReplaced());
int saved = summary.getSavedBomCount() + summary.getSavedMaterialBomCount() + summary.getSavedRouteCount();
plmReceiveLogService.record(
IPlmReceiveLogService.BIZ_PROCESS_ROUTE,
@@ -95,8 +102,17 @@ public class ProcessRoutePushReceiveController extends BaseController {
null,
clientIp
);
+ drawingRouteOperLogService.record(IDrawingRouteOperLogService.BIZ_ROUTE_UPLOAD, row -> {
+ row.setChannel(IDrawingRouteOperLogService.CHANNEL_PLM);
+ row.setApiPath(API_PATH);
+ row.setProductionOrderNo(summary.getProductionOrder());
+ row.setStatus(IDrawingRouteOperLogService.STATUS_SUCCESS);
+ row.setSummaryJson(JSON.toJSONString(summaryMap));
+ row.setOperator("PLM");
+ row.setClientIp(clientIp);
+ });
- // 入库成功后异步：导出工艺计划表 → 落盘 → 推送给 plan-user-id（与手动上传同一套用户）
+ // 入库成功后异步：导出落盘；有总装才发给 plan-user-id，没有就等总装到达
final String productionOrder = summary.getProductionOrder();
CompletableFuture.runAsync(() -> exportAndPushPlanExcel(productionOrder));
@@ -119,18 +135,38 @@ public class ProcessRoutePushReceiveController extends BaseController {
e.getMessage(),
clientIp
);
+ drawingRouteOperLogService.record(IDrawingRouteOperLogService.BIZ_ROUTE_UPLOAD, row -> {
+ row.setChannel(IDrawingRouteOperLogService.CHANNEL_PLM);
+ row.setApiPath(API_PATH);
+ row.setProductionOrderNo(orderNo);
+ row.setStatus(IDrawingRouteOperLogService.STATUS_FAIL);
+ row.setErrorMsg(e.getMessage());
+ row.setOperator("PLM");
+ row.setClientIp(clientIp);
+ });
throw e;
}
}
/**
- * PLM 工艺入库后：按模板导出计划表，存到 app.plan-excel.base-dir，再按 plan-user-id 推送。
+ * PLM 工艺入库后：按模板导出计划表并落盘；总装已到才发给 plan-user-id。
*/
private void exportAndPushPlanExcel(String productionOrder) {
+ long started = System.currentTimeMillis();
try {
ProcessOrderPro order = processOrderProMapper.selectByProjectNumber(productionOrder);
if (order == null || order.getId() == null) {
log.warn("PLM 导出计划表跳过：项目不存在 productionOrder={}", productionOrder);
+ drawingRouteOperLogService.record(IDrawingRouteOperLogService.BIZ_ROUTE_NOTIFY, row -> {
+ row.setChannel(IDrawingRouteOperLogService.CHANNEL_PLM);
+ row.setApiPath(API_PATH);
+ row.setProductionOrderNo(productionOrder);
+ row.setNotifyType(IDrawingRouteOperLogService.NOTIFY_FILE);
+ row.setStatus(IDrawingRouteOperLogService.STATUS_FAIL);
+ row.setErrorMsg("项目不存在，跳过导出计划表");
+ row.setOperator("PLM");
+ row.setDurationMs(System.currentTimeMillis() - started);
+ });
return;
}
// 复用现有导出（PLM 来源会走 generateRoute3ExcelFromPlm）
@@ -139,12 +175,23 @@ public class ProcessRoutePushReceiveController extends BaseController {
File generated = new File(generatedPath);
if (!generated.exists() || generated.length() <= 0) {
log.warn("PLM 导出计划表失败：文件为空 path={}", generatedPath);
+ drawingRouteOperLogService.record(IDrawingRouteOperLogService.BIZ_ROUTE_NOTIFY, row -> {
+ row.setChannel(IDrawingRouteOperLogService.CHANNEL_PLM);
+ row.setApiPath(API_PATH);
+ row.setProjectId(order.getId());
+ row.setProductionOrderNo(productionOrder);
+ row.setNotifyType(IDrawingRouteOperLogService.NOTIFY_FILE);
+ row.setStatus(IDrawingRouteOperLogService.STATUS_FAIL);
+ row.setErrorMsg("导出计划表失败：文件为空");
+ row.setOperator("PLM");
+ row.setDurationMs(System.currentTimeMillis() - started);
+ });
return;
}
- // 落到固定目录，再推送；临时生成文件可删
+ // 落到固定目录；有总装才钉钉推送，没有就只落盘等总装
File saved = processPlanExcelPushService.savePlanExcel(productionOrder, generated, generated.getName());
File toSend = saved != null ? saved : generated;
- processPlanExcelPushService.sendToPlanUsers(toSend, toSend.getName());
+ plmPlanCompleteNotifyService.notifyIfAssemblyAndRouteComplete(productionOrder, toSend);
if (saved != null && generated.exists() && !generated.getAbsolutePath().equals(saved.getAbsolutePath())) {
if (!generated.delete()) {
log.warn("删除临时计划表失败: {}", generated.getAbsolutePath());
@@ -152,6 +199,16 @@ public class ProcessRoutePushReceiveController extends BaseController {
}
} catch (Exception e) {
log.error("PLM 工艺推送后导出/推送计划表失败 productionOrder={}", productionOrder, e);
+ drawingRouteOperLogService.record(IDrawingRouteOperLogService.BIZ_ROUTE_NOTIFY, row -> {
+ row.setChannel(IDrawingRouteOperLogService.CHANNEL_PLM);
+ row.setApiPath(API_PATH);
+ row.setProductionOrderNo(productionOrder);
+ row.setNotifyType(IDrawingRouteOperLogService.NOTIFY_FILE);
+ row.setStatus(IDrawingRouteOperLogService.STATUS_FAIL);
+ row.setErrorMsg(e.getMessage());
+ row.setOperator("PLM");
+ row.setDurationMs(System.currentTimeMillis() - started);
+ });
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/RatioBuildCapacityController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/RatioBuildCapacityController.java
index 1829bc8..3da6982 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/RatioBuildCapacityController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/RatioBuildCapacityController.java
@@ -2,14 +2,20 @@ package com.ruoyi.system.controller;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.domain.dto.ratio.RatioBuildCapacityDTO;
+import com.ruoyi.system.domain.dto.ratio.RatioImportResultDTO;
+import com.ruoyi.system.domain.dto.ratio.RatioModelOptionDTO;
+import com.ruoyi.system.service.IRatioBomImportService;
import com.ruoyi.system.service.IRatioBuildCapacityService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
-import java.math.BigDecimal;
+import java.util.List;
@RequiredArgsConstructor
@RestController
@@ -17,11 +23,32 @@ import java.math.BigDecimal;
public class RatioBuildCapacityController {
private final IRatioBuildCapacityService ratioBuildCapacityService;
+ private final IRatioBomImportService ratioBomImportService;
+
+ @GetMapping("/ratios")
+ public R> ratios(@RequestParam("seriesType") String seriesType) {
+ return R.ok(ratioBuildCapacityService.listRatios(seriesType));
+ }
+
+ @GetMapping("/models")
+ public R> models(@RequestParam("seriesType") String seriesType,
+ @RequestParam("ratioValue") String ratioValue) {
+ return R.ok(ratioBuildCapacityService.listModels(seriesType, ratioValue));
+ }
@GetMapping("/buildCapacity")
- public R buildCapacity(@RequestParam("ratioValue") BigDecimal ratioValue,
+ public R buildCapacity(@RequestParam("seriesType") String seriesType,
+ @RequestParam("ratioValue") String ratioValue,
+ @RequestParam("modelId") Long modelId,
@RequestParam("qty") Integer qty) {
- return R.ok(ratioBuildCapacityService.queryByRatio(ratioValue, qty));
+ return R.ok(ratioBuildCapacityService.queryByRatio(seriesType, ratioValue, modelId, qty));
+ }
+
+ @PostMapping("/import")
+ public R importBom(@RequestPart("file") MultipartFile file,
+ @RequestParam("seriesType") String seriesType) {
+ RatioImportResultDTO result = ratioBomImportService.importExcel(file, seriesType);
+ return R.ok(result.getMessage(), result);
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/ProcessOrderPro.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/ProcessOrderPro.java
index 3e88ba4..8e453ae 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/ProcessOrderPro.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/ProcessOrderPro.java
@@ -37,6 +37,14 @@ public class ProcessOrderPro extends BaseEntity {
* 是否可以下载
*/
private Integer isDownload;
+ /**
+ * 图纸是否已齐：0否 1是。设计人员确认图纸上传完成后置1，方可下载 PDF；本批数量在下载时现算，不落库。
+ */
+ private Integer drawingQtyIssued;
+ /**
+ * 出图模式：{@link com.ruoyi.system.constant.DrawingMode#NORMAL} / {@link com.ruoyi.system.constant.DrawingMode#PART}；执行出图前必填
+ */
+ private String drawingMode;
/**
* 是否做工艺：0否 1是
*/
@@ -89,7 +97,7 @@ public class ProcessOrderPro extends BaseEntity {
private String drawingPath;
/**
- * 项目状态(0方案设计完成,1设计出图完成,2工艺待审核,3已推送BOM,4已推送工艺,5已核算MRP,6开始生产,7生产完成,8工艺审核完成,9工艺审核拒绝)
+ * 项目状态(0方案设计完成,1设计出图完成,2工艺待审核,3已推送BOM,4已推送工艺,6开始生产,7生产完成,8工艺审核完成,9工艺审核拒绝)
*/
private Long bomStatus;
/**
@@ -129,7 +137,7 @@ public class ProcessOrderPro extends BaseEntity {
*/
private Date drawingTime;
/**
- * 出图人
+ * 设计人（字典 plan_proer，多人逗号分隔）
*/
private String drawingBy;
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RatioAccessory.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RatioAccessory.java
index 6facc72..6313faf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RatioAccessory.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RatioAccessory.java
@@ -7,6 +7,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
+
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("ratio_accessory")
@@ -17,16 +19,24 @@ public class RatioAccessory extends BaseEntity {
private Long ratioConfigId;
+ /** 减速机型号ID，空表示该速比通用件 */
+ private Long ratioModelId;
+
private String materialCode;
private String materialName;
private String danzhong;
+ /** 材料 */
private String canzhi;
+ /** 配件类别：通用件 / 轴套 / 行星架 / 法兰 */
private String partCategory;
+ /** 单台用量 */
+ private BigDecimal bomQty;
+
private Integer status;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RatioConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RatioConfig.java
index 1ba19e3..852c6eb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/RatioConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/RatioConfig.java
@@ -17,7 +17,11 @@ public class RatioConfig extends BaseEntity {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- private BigDecimal ratioValue;
+ /** 机型：KP08 / KP14 */
+ private String seriesType;
+
+ /** 速比值，例如 91B */
+ private String ratioValue;
private BigDecimal maxTorqueNm;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SfcOperationPlanningDetail.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SfcOperationPlanningDetail.java
index d0392aa..2f0341f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SfcOperationPlanningDetail.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SfcOperationPlanningDetail.java
@@ -86,7 +86,7 @@ public class SfcOperationPlanningDetail extends BaseEntity {
*/
private String operator;
/**
- * 状态
+ * 工序状态（金蝶 FOperStatus 原始码：0创建 1计划 2计划确认 3下达 4开工 5完工 6关闭）
*/
private String operStatus;
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SfcOperationPlanningMain.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SfcOperationPlanningMain.java
index 9365b28..8a56d4e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SfcOperationPlanningMain.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SfcOperationPlanningMain.java
@@ -66,4 +66,19 @@ public class SfcOperationPlanningMain extends BaseEntity {
*/
private Date planFinishTime;
+ /**
+ * 单据状态（来自生产订单 PRD_MO.FDocumentStatus）：A创建 B审核中 C已审核 D重新审核 E暂存
+ */
+ private String documentStatus;
+
+ /**
+ * 业务状态（来自生产订单 PRD_MO.FStatus）：1计划 2计划确认 3下达 4开工 5完工 6结案 7结算
+ */
+ private String billStatus;
+
+ /**
+ * 工序计划单据状态（SFC_OperationPlanning.FDocumentStatus）
+ */
+ private String planDocumentStatus;
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/FigureSaveBo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/FigureSaveBo.java
index 2896aec..def5fe1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/FigureSaveBo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/FigureSaveBo.java
@@ -81,31 +81,26 @@ public class FigureSaveBo extends BaseEntity {
/**
* 文件类型
*/
- @NotBlank(message = "文件类型不能为空", groups = { AddGroup.class, EditGroup.class })
private String fileType;
/**
* 出图人
*/
- @NotBlank(message = "出图人不能为空", groups = { AddGroup.class, EditGroup.class })
private String drawBy;
/**
* 是否延期：0否 1是
*/
- @NotNull(message = "是否延期：0否 1是不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer whetherDelay;
/**
* 延期天数
*/
- @NotNull(message = "延期天数不能为空", groups = { AddGroup.class, EditGroup.class })
private Long delayDay;
/**
- * 出图时间
+ * 出图时间（项目级维护，产品不再必填）
*/
- @NotNull(message = "出图时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date drawTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/ProcessOrderProBo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/ProcessOrderProBo.java
index 268d072..c256179 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/ProcessOrderProBo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/ProcessOrderProBo.java
@@ -1,14 +1,18 @@
package com.ruoyi.system.domain.bo;
import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
import com.ruoyi.common.annotation.Translation;
import com.ruoyi.common.constant.TransConstant;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.utils.StringUtils;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
+import java.util.Collection;
import java.util.Date;
import java.util.List;
@@ -86,6 +90,16 @@ public class ProcessOrderProBo extends BaseEntity {
*/
private Integer isDownload;
+ /**
+ * 图纸是否已齐：0否 1是
+ */
+ private Integer drawingQtyIssued;
+
+ /**
+ * 出图模式：normal正常 / part零部件（执行出图前必填）
+ */
+ private String drawingMode;
+
/**
* 是否做工艺：0否 1是
*/
@@ -131,14 +145,17 @@ public class ProcessOrderProBo extends BaseEntity {
/**
* 工艺上传更新时间
*/
+ @NotNull(message = "工艺上传更新不能为空", groups = { AddGroup.class })
private Date routeUptime;
/**
* 排产计划更新时间
*/
+ @NotNull(message = "排产计划更新不能为空", groups = { AddGroup.class })
private Date planUptime;
/**
* BOM/物料更新时间
*/
+ @NotNull(message = "BOM/物料更新不能为空", groups = { AddGroup.class })
private Date bomUptime;
/**
* bom数量
@@ -153,13 +170,64 @@ public class ProcessOrderProBo extends BaseEntity {
*/
private Long routeCount;
/**
- * 出图时间
+ * 出图时间（项目整体；新增必填）
*/
+ @NotNull(message = "出图时间不能为空", groups = { AddGroup.class })
private Date drawingTime;
/**
- * 出图人
+ * 设计人（字典 plan_proer，多人逗号分隔）。
+ * 前端表单绑定的是 drawer 数组，提交时再折成本字段；校验看 drawingBy。
*/
+ @NotBlank(message = "设计人不能为空", groups = { AddGroup.class, EditGroup.class })
private String drawingBy;
+
+ /**
+ * JSON 反序列化设计人。
+ * {@code Nulls.SKIP}：请求体里 drawingBy 为 null 时不覆盖，避免把 drawer 已解析出的值冲掉。
+ */
+ @JsonSetter(nulls = Nulls.SKIP)
+ public void setDrawingBy(String drawingBy) {
+ if (StringUtils.isNotBlank(drawingBy)) {
+ this.drawingBy = drawingBy.trim();
+ }
+ }
+
+ /**
+ * 兼容前端多选字段 drawer：仅当 drawingBy 仍为空时，把数组/字符串折成逗号分隔写入 drawingBy。
+ */
+ @JsonSetter("drawer")
+ public void unpackDrawer(Object drawer) {
+ if (StringUtils.isNotBlank(this.drawingBy) || drawer == null) {
+ return;
+ }
+ String joined = joinDesignerValue(drawer);
+ if (StringUtils.isNotBlank(joined)) {
+ this.drawingBy = joined;
+ }
+ }
+
+ /** 将设计人数组或单个值规范为逗号分隔字符串；空值忽略。 */
+ private static String joinDesignerValue(Object value) {
+ if (value instanceof Collection) {
+ StringBuilder sb = new StringBuilder();
+ for (Object item : (Collection) value) {
+ if (item == null) {
+ continue;
+ }
+ String s = String.valueOf(item).trim();
+ if (s.isEmpty() || "null".equalsIgnoreCase(s)) {
+ continue;
+ }
+ if (sb.length() > 0) {
+ sb.append(',');
+ }
+ sb.append(s);
+ }
+ return sb.length() == 0 ? null : sb.toString();
+ }
+ String s = String.valueOf(value).trim();
+ return s.isEmpty() || "null".equalsIgnoreCase(s) ? null : s;
+ }
/**
* 审核卡片Id
*/
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SfcOperationPlanningMainBo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SfcOperationPlanningMainBo.java
index 6c58664..beb553b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SfcOperationPlanningMainBo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SfcOperationPlanningMainBo.java
@@ -85,5 +85,13 @@ public class SfcOperationPlanningMainBo extends BaseEntity {
private String workCenterName;
+ /** 单据状态（生产订单 PRD_MO.FDocumentStatus） */
+ private String documentStatus;
+
+ /** 业务状态（生产订单 PRD_MO.FStatus） */
+ private String billStatus;
+
+ /** 工序计划单据状态（SFC_OperationPlanning.FDocumentStatus） */
+ private String planDocumentStatus;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/plm/PlmProcessRoutePushNormalizer.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/plm/PlmProcessRoutePushNormalizer.java
index 4fcbd4b..613740c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/plm/PlmProcessRoutePushNormalizer.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/plm/PlmProcessRoutePushNormalizer.java
@@ -114,6 +114,10 @@ public final class PlmProcessRoutePushNormalizer {
private int savedMaterialBomCount;
/** 实际写入 process_route 的行数（已过滤 PLM 占位工序） */
private int savedRouteCount;
+ /** 同令号已有工艺且本次总图号不同，追加写入 */
+ private boolean appended;
+ /** 同令号已有工艺且本次覆盖（同总图或无法比较总图） */
+ private boolean replaced;
private boolean received = true;
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OperationPlanResultDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OperationPlanResultDTO.java
index ae8efe2..22e0949 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OperationPlanResultDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OperationPlanResultDTO.java
@@ -55,6 +55,36 @@ public class OperationPlanResultDTO {
*/
private Long fid;
+ /**
+ * 单据状态码（生产订单 PRD_MO.FDocumentStatus）
+ */
+ private String documentStatus;
+
+ /**
+ * 单据状态名称
+ */
+ private String documentStatusName;
+
+ /**
+ * 业务状态码（生产订单 PRD_MO.FStatus）
+ */
+ private String billStatus;
+
+ /**
+ * 业务状态名称
+ */
+ private String billStatusName;
+
+ /**
+ * 工序计划单据状态码（SFC_OperationPlanning.FDocumentStatus）
+ */
+ private String planDocumentStatus;
+
+ /**
+ * 工序计划单据状态名称
+ */
+ private String planDocumentStatusName;
+
/**
* 原生计划开始时间（内部排序用，不输出到JSON）
*/
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OperationPlanningDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OperationPlanningDTO.java
index d8ce7ec..5e2ae5a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OperationPlanningDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OperationPlanningDTO.java
@@ -61,6 +61,12 @@ public class OperationPlanningDTO {
@JsonProperty("FBillNo")
private String fBillNo;
+ /**
+ * 工序计划单据状态：A创建 B审核中 C已审核 D重新审核 E暂存
+ */
+ @JsonProperty("FDocumentStatus")
+ private String fDocumentStatus;
+
/**
* 工序号
*/
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ProcessDetailDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ProcessDetailDTO.java
index 5554d0e..b895b3b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ProcessDetailDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ProcessDetailDTO.java
@@ -43,10 +43,18 @@ public class ProcessDetailDTO {
private Double ngQty;
/**
- * 状态
+ * 工序状态码 FOperStatus：0创建 1计划 2计划确认 3下达 4开工 5完工 6关闭
+ */
+ private String operStatus;
+
+ /**
+ * 业务展示状态（未开工/生产中/质检中/工序完成/已转出/已关闭）
*/
private String status;
+ /**
+ * 金蝶工序状态名称
+ */
private String k3Status;
/**
* 转出数量
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productionorder/AssemblyBomReceiveSummary.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productionorder/AssemblyBomReceiveSummary.java
index c573c35..70abb9c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productionorder/AssemblyBomReceiveSummary.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/productionorder/AssemblyBomReceiveSummary.java
@@ -14,5 +14,9 @@ public class AssemblyBomReceiveSummary {
private int insertedCount;
+ /** 同令号已有数据且本次为全量/同主产品覆盖 */
private boolean replaced;
+
+ /** 同令号已有数据且本次主产品图号不同，追加写入 */
+ private boolean appended;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ratio/RatioBuildCapacityDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ratio/RatioBuildCapacityDTO.java
index 90740f4..c2db4b3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ratio/RatioBuildCapacityDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ratio/RatioBuildCapacityDTO.java
@@ -10,7 +10,13 @@ public class RatioBuildCapacityDTO {
private Long ratioConfigId;
- private BigDecimal ratioValue;
+ private String seriesType;
+
+ private String ratioValue;
+
+ private Long modelId;
+
+ private String modelCode;
private BigDecimal maxTorqueNm;
@@ -18,6 +24,9 @@ public class RatioBuildCapacityDTO {
private Long maxBuildQty;
+ /** 该型号没有轴套、行星架、法兰时，结果只有通用件。 */
+ private Boolean onlyCommonParts;
+
private List items;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ratio/RatioMaterialItemDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ratio/RatioMaterialItemDTO.java
index 812f87d..74b20c0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ratio/RatioMaterialItemDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ratio/RatioMaterialItemDTO.java
@@ -17,6 +17,9 @@ public class RatioMaterialItemDTO {
private String canzhi;
+ /** Excel 中的单台数量 */
+ private Double bomQty;
+
private Double requiredQty;
private Double onHandQty;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ElectricalMaterialBomVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ElectricalMaterialBomVO.java
index 6be6e28..7e10ed5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ElectricalMaterialBomVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ElectricalMaterialBomVO.java
@@ -1,13 +1,15 @@
package com.ruoyi.system.domain.vo;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.convert.NullableDoubleConverter;
+import com.ruoyi.common.convert.NullableQuantityTextConverter;
import lombok.Data;
/**
* 电气物料BOM
* 2025-09-25
*/
@Data
+@ExcelIgnoreUnannotated
public class ElectricalMaterialBomVO {
/**
@@ -33,22 +35,28 @@ public class ElectricalMaterialBomVO {
@ExcelProperty(value = "物料名称")
private String drawingName;
/**
- * 型号
+ * 型号（部分模板表头为「规格型号」）
*/
@ExcelProperty(value = "型号")
- private String Model;
+ private String model;
+
+ /**
+ * 规格型号（与「型号」二选一，导入时都会写入 material）
+ */
+ @ExcelProperty(value = "规格型号")
+ private String specificationModel;
/**
* 品牌
*/
@ExcelProperty(value = "品牌")
- private String Brand;
+ private String brand;
/**
- * 单台数量
+ * 单台数量。普通数字原样入库；文本分数如 1/4、1/3 在导入时拆成分子和分母。
*/
- @ExcelProperty(value = "单台数量", converter = NullableDoubleConverter.class)
- private Double quantity;
+ @ExcelProperty(value = "单台数量", converter = NullableQuantityTextConverter.class)
+ private String quantity;
/**
* 批次数量
*/
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ProcessOrderProExportVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ProcessOrderProExportVo.java
index 3aef819..05f7a8c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ProcessOrderProExportVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ProcessOrderProExportVo.java
@@ -3,8 +3,7 @@ package com.ruoyi.system.domain.vo;
import cn.hutool.core.date.DateUtil;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.utils.ProjectStatusLock;
import com.ruoyi.common.utils.StringUtils;
import lombok.Data;
@@ -43,8 +42,7 @@ public class ProcessOrderProExportVo {
@ExcelProperty(value = "生产令号")
private String productionOrderNo;
- @ExcelProperty(value = "项目状态", converter = ExcelDictConvert.class)
- @ExcelDictFormat(dictType = "process_status")
+ @ExcelProperty(value = "项目状态")
private String bomStatus;
@ExcelProperty(value = "项目名称")
@@ -101,7 +99,7 @@ public class ProcessOrderProExportVo {
return row;
}
row.setProductionOrderNo(vo.getProductionOrderNo());
- row.setBomStatus(vo.getBomStatus() == null ? null : String.valueOf(vo.getBomStatus()));
+ row.setBomStatus(vo.getBomStatus() == null ? null : ProjectStatusLock.statusLabel(vo.getBomStatus()));
row.setProductionName(vo.getProductionName());
row.setSource(formatSource(vo.getSource()));
row.setWhetherDelayLabel(Integer.valueOf(1).equals(vo.getWhetherDelay()) ? "延期" : "正常");
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ProcessOrderProVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ProcessOrderProVo.java
index e5804f7..fd428b7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ProcessOrderProVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ProcessOrderProVo.java
@@ -52,6 +52,18 @@ public class ProcessOrderProVo {
@ExcelProperty(value = "是否可以下载")
private Integer isDownload;
+ /**
+ * 图纸是否已齐：0否 1是
+ */
+ @ExcelProperty(value = "图纸已齐")
+ private Integer drawingQtyIssued;
+
+ /**
+ * 出图模式：normal正常 / part零部件（执行出图前必填）
+ */
+ @ExcelProperty(value = "出图模式")
+ private String drawingMode;
+
/**
* 是否做工艺：0否 1是
*/
@@ -151,8 +163,10 @@ public class ProcessOrderProVo {
*/
private Long routeCount;
/**
- * 出图人
+ * 设计人（字典 plan_proer，多人逗号分隔）
*/
+ @ExcelProperty(value = "设计人", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "plan_proer")
private String drawingBy;
/**
* 出图时间
@@ -210,6 +224,18 @@ public class ProcessOrderProVo {
@ExcelIgnore
private Boolean productionComplete;
+ /**
+ * 设计出图进度（非库字段）：进行中 / 延期 / 设计出图完成
+ */
+ @ExcelIgnore
+ private String drawingProgress;
+
+ /**
+ * 等效 A4 合计（非库字段，来自图纸工作量）
+ */
+ @ExcelProperty(value = "等效A4")
+ private Integer equivalentA4Total;
+
/**
* 列表/导出：金蝶订单状态摘要（非库字段）
*/
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SfcOperationPlanningMainVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SfcOperationPlanningMainVo.java
index d1374e5..4b38d45 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SfcOperationPlanningMainVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SfcOperationPlanningMainVo.java
@@ -86,5 +86,22 @@ public class SfcOperationPlanningMainVo {
@ExcelProperty(value = "计划结束时间")
private Date planFinishTime;
+ /**
+ * 单据状态（生产订单 PRD_MO.FDocumentStatus）
+ */
+ @ExcelProperty(value = "单据状态")
+ private String documentStatus;
+
+ /**
+ * 业务状态（生产订单 PRD_MO.FStatus）
+ */
+ @ExcelProperty(value = "业务状态")
+ private String billStatus;
+
+ /**
+ * 工序计划单据状态（SFC_OperationPlanning.FDocumentStatus）
+ */
+ @ExcelProperty(value = "工序计划单据状态")
+ private String planDocumentStatus;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/plm/PlmProductionOrderVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/plm/PlmProductionOrderVo.java
index 61d32f5..48532b5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/plm/PlmProductionOrderVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/plm/PlmProductionOrderVo.java
@@ -40,7 +40,6 @@ public class PlmProductionOrderVo {
* 2 工艺待审核
* 3 已推送BOM
* 4 已推送工艺
- * 5 已核算MRP
* 6 开始生产
* 7 生产完成
* 8 工艺审核完成
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/job/SfcOperationPlanningJob.java b/ruoyi-system/src/main/java/com/ruoyi/system/job/SfcOperationPlanningJob.java
index 54187d7..a61d4e8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/job/SfcOperationPlanningJob.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/job/SfcOperationPlanningJob.java
@@ -1,8 +1,16 @@
package com.ruoyi.system.job;
+import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.enums.UserType;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.helper.JobLoginContext;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.bo.SfcOperationPlanningMainBo;
import com.ruoyi.system.service.ISfcOperationPlanningMainService;
+import com.ruoyi.system.service.ISysUserService;
import com.xxl.job.core.context.XxlJobHelper;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.RequiredArgsConstructor;
@@ -21,6 +29,7 @@ import org.springframework.stereotype.Component;
public class SfcOperationPlanningJob {
private final ISfcOperationPlanningMainService iSfcOperationPlanningMainService;
+ private final ISysUserService sysUserService;
/**
* 定时同步K3工序计划数据
@@ -30,8 +39,8 @@ public class SfcOperationPlanningJob {
public void syncOperationPlanningJobHandler() throws Exception {
XxlJobHelper.log("XXL-JOB, 开始同步K3工序计划数据...");
long startTime = System.currentTimeMillis();
-
try {
+ loginAsAdmin();
Boolean result = iSfcOperationPlanningMainService.syncOperationPlanning();
if (result) {
XxlJobHelper.log("XXL-JOB, 同步K3工序计划数据成功！耗时: {}ms", (System.currentTimeMillis() - startTime));
@@ -44,9 +53,29 @@ public class SfcOperationPlanningJob {
log.error("同步K3工序计划数据异常", e);
XxlJobHelper.log("XXL-JOB, 同步K3工序计划数据异常: {}", e.getMessage());
XxlJobHelper.handleFail("同步异常: " + e.getMessage());
+ } finally {
+ JobLoginContext.logout();
}
}
+ /**
+ * 同步线程没有页面登录态，用管理员账号补上，创建人/更新人才能自动填充。
+ */
+ private void loginAsAdmin() {
+ SysUser admin = sysUserService.selectUserById(UserConstants.ADMIN_ID);
+ if (admin == null || StringUtils.isBlank(admin.getUserName())) {
+ throw new ServiceException("未找到管理员账号，工序计划同步无法登录");
+ }
+ LoginUser loginUser = new LoginUser();
+ loginUser.setUserId(admin.getUserId());
+ loginUser.setDeptId(admin.getDeptId());
+ loginUser.setUsername(admin.getUserName());
+ loginUser.setUserType(StringUtils.isNotBlank(admin.getUserType())
+ ? admin.getUserType() : UserType.SYS_USER.getUserType());
+ JobLoginContext.login(loginUser);
+ XxlJobHelper.log("XXL-JOB, 已以用户 {} 登录", loginUser.getUsername());
+ }
+
/**
* 项目进度推送：生成进度 Excel，用「信息发送」机器人私发给配置人员。
* JobHandler：pushOperationPlanningProgress
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/listener/FileToZip.java b/ruoyi-system/src/main/java/com/ruoyi/system/listener/FileToZip.java
index 48318da..da14514 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/listener/FileToZip.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/listener/FileToZip.java
@@ -27,6 +27,10 @@ public class FileToZip {
private static void zipFileRecursive(File fileToZip, String fileName, ZipOutputStream zos) throws IOException {
if (fileToZip.isHidden()) return;
+ // 跳过盖章残留的 *_temp.pdf，避免解压后出现双份
+ if (fileToZip.isFile() && fileToZip.getName().toLowerCase().endsWith("_temp.pdf")) {
+ return;
+ }
if (fileToZip.isDirectory()) {
if (!fileName.endsWith("/")) fileName += "/";
zos.putNextEntry(new ZipEntry(fileName));
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/runner/CodeConverter.java b/ruoyi-system/src/main/java/com/ruoyi/system/runner/CodeConverter.java
index 4930c9d..5304de8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/runner/CodeConverter.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/runner/CodeConverter.java
@@ -14,7 +14,7 @@ public class CodeConverter {
//nameToCodeMap.put("焊接工段", "WC000003");
nameToCodeMap.put("装一工段", "WC000004"); // 装配车间
nameToCodeMap.put("装二工段", "WC000005");
- nameToCodeMap.put("电钳工段", "WC000006");
+ nameToCodeMap.put("电钳工段", "WC000023");
nameToCodeMap.put("机加委外", "WC000008");
nameToCodeMap.put("下料工段", "WC000010"); // 铆焊车间
nameToCodeMap.put("焊接工段", "WC000011");
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/runner/JdUtil.java b/ruoyi-system/src/main/java/com/ruoyi/system/runner/JdUtil.java
index 0dd272e..607a9ef 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/runner/JdUtil.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/runner/JdUtil.java
@@ -16,6 +16,7 @@ import com.ruoyi.system.domain.BomDetails;
import com.ruoyi.system.domain.PartCost;
import com.ruoyi.system.domain.dto.*;
import com.ruoyi.system.domain.vo.*;
+import com.ruoyi.system.service.support.OperationPlanningResultAssembler;
import com.ruoyi.system.jdmain.rouplan.FidEntryIdDTO;
import com.ruoyi.system.jdmain.rouplan.Model;
import org.aspectj.bridge.MessageUtil;
@@ -854,7 +855,7 @@ public class JdUtil {
JsonArray filterString = new JsonArray();
JsonObject filterObject = new JsonObject();
filterObject.addProperty("FieldName", "FMaterialId.FNumber");
- filterObject.addProperty("Compare", "="); // 改为等号运算符
+ filterObject.addProperty("Compare", "=");
filterObject.addProperty("Value", materialCode);
filterObject.addProperty("Left", "");
filterObject.addProperty("Right", "");
@@ -1125,20 +1126,21 @@ public class JdUtil {
JsonArray filterString = new JsonArray();
JsonObject filterObject = new JsonObject();
filterObject.addProperty("FieldName", "FMaterialId.FNumber");
- filterObject.addProperty("Compare", "="); // 改为等号运算符
+ filterObject.addProperty("Compare", "=");
filterObject.addProperty("Value", materialCode);
filterObject.addProperty("Left", "");
filterObject.addProperty("Right", "");
filterObject.addProperty("Logic", 0);// 从 PlanOrderVo 获取生产令号
filterString.add(filterObject);
- JsonObject filterObject1 = new JsonObject();
- filterObject1.addProperty("FieldName", "FMRPCloseStatus");
- filterObject1.addProperty("Compare", "105"); // 改为等号运算符
- filterObject1.addProperty("Value", "A");
- filterObject1.addProperty("Left", "");
- filterObject1.addProperty("Right", "");
- filterObject1.addProperty("Logic", 0);// 从 PlanOrderVo 获取生产令号
- filterString.add(filterObject1);
+ // 整单未关闭
+ JsonObject filterObjectClose = new JsonObject();
+ filterObjectClose.addProperty("FieldName", "FCloseStatus");
+ filterObjectClose.addProperty("Compare", "105");
+ filterObjectClose.addProperty("Value", "A");
+ filterObjectClose.addProperty("Left", "");
+ filterObjectClose.addProperty("Right", "");
+ filterObjectClose.addProperty("Logic", 0);
+ filterString.add(filterObjectClose);
json.add("FilterString", filterString);
json.addProperty("OrderString", "");
json.addProperty("TopRowCount", 0);
@@ -1194,14 +1196,15 @@ public class JdUtil {
filterObject.addProperty("Right", "");
filterObject.addProperty("Logic", 0);
filterString.add(filterObject);
- JsonObject filterObject1 = new JsonObject();
- filterObject1.addProperty("FieldName", "FMRPCloseStatus");
- filterObject1.addProperty("Compare", "105");
- filterObject1.addProperty("Value", "A");
- filterObject1.addProperty("Left", "");
- filterObject1.addProperty("Right", "");
- filterObject1.addProperty("Logic", 0);
- filterString.add(filterObject1);
+ // 整单未关闭
+ JsonObject filterObjectClose = new JsonObject();
+ filterObjectClose.addProperty("FieldName", "FCloseStatus");
+ filterObjectClose.addProperty("Compare", "105");
+ filterObjectClose.addProperty("Value", "A");
+ filterObjectClose.addProperty("Left", "");
+ filterObjectClose.addProperty("Right", "");
+ filterObjectClose.addProperty("Logic", 0);
+ filterString.add(filterObjectClose);
JsonObject filterObject2 = new JsonObject();
filterObject2.addProperty("FieldName", "F_UCHN_Text2");
filterObject2.addProperty("Compare", "83");
@@ -4109,7 +4112,8 @@ public class JdUtil {
JsonObject json = new JsonObject();
json.addProperty("FormId", "SFC_OperationPlanning");
json.addProperty("FieldKeys",
- "FID,FENTITY_FEntryID,FSubEntity_FDetailID,F_HBYT_SCLH,F_HBYT_XMH,FMONumber,FProductId.FNumber,FProductName,FProSpecification,FBillNo,FOperNumber," +
+ "FID,FENTITY_FEntryID,FSubEntity_FDetailID,F_HBYT_SCLH,F_HBYT_XMH,FMONumber,FProductId.FNumber,FProductName,FProSpecification,FBillNo," +
+ "FDocumentStatus,FOperNumber," +
"FOperQty,FQualifiedQty,FTransOutQty,FUnqualifiedQty,FWastageQty,FTransInQty,FDepartmentId.FName,FWorkCenterId.FName," +
"FProcessId.FName,F_HBYT_ZYRY,FOperStatus,FSeqPlanStartTime,FSeqPlanFinishTime,FOperPlanStartTime,FOperPlanFinishTime," +
"FOptCtrlCodeId.FName,FKeyOper,FActivity1Name,FOperDescription,FPlanStartTime,FPlanFinishTime,F_HBYT_SB");
@@ -4237,6 +4241,14 @@ public class JdUtil {
.filter(item -> item.getFid() != null)
.collect(java.util.stream.Collectors.groupingBy(OperationPlanningDTO::getFid));
+ // 生产订单单据状态/业务状态：均来自 PRD_MO（FDocumentStatus / FStatus）
+ Set moNumbers = rawList.stream()
+ .map(OperationPlanningDTO::getFMoNumber)
+ .filter(StringUtils::isNotBlank)
+ .map(String::trim)
+ .collect(java.util.stream.Collectors.toCollection(LinkedHashSet::new));
+ Map moStatusMap = queryProductionOrderStatusMap(moNumbers);
+
List resultList = new ArrayList<>();
for (Map.Entry> entry : groupedMap.entrySet()) {
@@ -4255,6 +4267,19 @@ public class JdUtil {
resultDTO.setPlanStartTime(firstItem.getFPlanStartTime());
resultDTO.setPlanFinishTime(firstItem.getFPlanFinishTime());
resultDTO.setFid(firstItem.getFid());
+ String[] moStatus = firstItem.getFMoNumber() == null
+ ? null
+ : moStatusMap.get(firstItem.getFMoNumber().trim());
+ String moDocumentStatus = moStatus == null ? null : moStatus[0];
+ String billStatus = moStatus == null ? null : moStatus[1];
+ // 工序计划自身单据状态
+ resultDTO.setPlanDocumentStatus(firstItem.getFDocumentStatus());
+ resultDTO.setPlanDocumentStatusName(OperationPlanningResultAssembler.mapDocumentStatusName(firstItem.getFDocumentStatus()));
+ // 生产订单单据状态 / 业务状态
+ resultDTO.setDocumentStatus(moDocumentStatus);
+ resultDTO.setDocumentStatusName(OperationPlanningResultAssembler.mapDocumentStatusName(moDocumentStatus));
+ resultDTO.setBillStatus(billStatus);
+ resultDTO.setBillStatusName(OperationPlanningResultAssembler.mapBillStatusName(billStatus));
List processList = new ArrayList<>();
for (OperationPlanningDTO item : items) {
@@ -4284,26 +4309,9 @@ public class JdUtil {
detail.setK3DetailId(item.getFSubEntityFDetailId());
detail.setEntityEntryId(item.getFEntityFEntryId());
- // 状态映射：K3里4通常表示已完工
- String statusStr = item.getFOperStatus();
- if ("0".equals(statusStr)) {
- detail.setStatus("创建");
- }
- else if ("1".equals(statusStr)) {
- detail.setStatus("计划");
- } else if ("2".equals(statusStr)) {
- detail.setStatus("计划确认");
- } else if ("3".equals(statusStr)) {
- detail.setStatus("下达");
- } else if ("4".equals(statusStr)) {
- detail.setStatus("开工");
- } else if ("5".equals(statusStr)) {
- detail.setStatus("完工");
- } else if ("6".equals(statusStr)) {
- detail.setStatus("关闭");
- } else {
- detail.setStatus(statusStr);
- }
+ // 入库存原始 FOperStatus 码；展示名由 Assembler 统一映射
+ detail.setOperStatus(item.getFOperStatus());
+ OperationPlanningResultAssembler.enrichProcessDetailStatus(detail);
processList.add(detail);
}
@@ -4318,6 +4326,69 @@ public class JdUtil {
return resultList;
}
+ /**
+ * 按生产订单编号批量查 PRD_MO 的单据状态/业务状态。
+ *
+ * @return key=FBillNo，value=[FDocumentStatus, FStatus]
+ */
+ private static Map queryProductionOrderStatusMap(Collection moNumbers) {
+ Map result = new HashMap<>();
+ if (moNumbers == null || moNumbers.isEmpty()) {
+ return result;
+ }
+ List list = moNumbers.stream()
+ .filter(StringUtils::isNotBlank)
+ .map(String::trim)
+ .distinct()
+ .collect(java.util.stream.Collectors.toList());
+ K3CloudApi client = new K3CloudApi();
+ ObjectMapper objectMapper = new ObjectMapper();
+ int batchSize = 200;
+ for (int i = 0; i < list.size(); i += batchSize) {
+ List batch = list.subList(i, Math.min(i + batchSize, list.size()));
+ JsonObject json = new JsonObject();
+ json.addProperty("FormId", "PRD_MO");
+ json.addProperty("FieldKeys", "FBillNo,FDocumentStatus,FStatus");
+ JsonArray filterString = new JsonArray();
+ JsonObject filterObject = new JsonObject();
+ filterObject.addProperty("FieldName", "FBillNo");
+ filterObject.addProperty("Compare", "338");
+ filterObject.addProperty("Value", String.join(",", batch));
+ filterObject.addProperty("Left", "");
+ filterObject.addProperty("Right", "");
+ filterObject.addProperty("Logic", 0);
+ filterString.add(filterObject);
+ json.add("FilterString", filterString);
+ json.addProperty("OrderString", "");
+ json.addProperty("TopRowCount", 0);
+ json.addProperty("StartRow", 0);
+ json.addProperty("Limit", batch.size());
+ json.addProperty("SubSystemId", "");
+ try {
+ String resultJson = String.valueOf(client.billQuery(json.toString()));
+ JsonArray jsonArray = new Gson().fromJson(resultJson, JsonArray.class);
+ if (jsonArray == null || jsonArray.size() == 0) {
+ continue;
+ }
+ List rows = objectMapper.readValue(jsonArray.toString(),
+ new TypeReference>() {
+ });
+ if (rows == null) {
+ continue;
+ }
+ for (ProMoDTO row : rows) {
+ if (row == null || StringUtils.isBlank(row.getBillNo())) {
+ continue;
+ }
+ result.put(row.getBillNo().trim(), new String[]{row.getDocumentStatus(), row.getStatus()});
+ }
+ } catch (Exception e) {
+ log.warn("批量查询生产订单状态失败, size={}, err={}", batch.size(), e.getMessage());
+ }
+ }
+ return result;
+ }
+
// ===================== ND3 阶段性产品报表 · 金蝶查询 =====================
@@ -4555,7 +4626,7 @@ public class JdUtil {
"FBillNo,F_UCHN_Text2,FDate,FDeliveryDate,FQty,FRemainStockINQty,FMaterialId.FNumber,FMaterialName");
JsonArray filterString = new JsonArray();
filterString.add(nd3Filter("FMaterialId.FNumber", "=", materialCode));
- filterString.add(nd3Filter("FMRPCloseStatus", "105", "A"));
+ filterString.add(nd3Filter("FCloseStatus", "105", "A"));
filterString.add(nd3Filter("F_UCHN_Text2", "83", proCode));
json.add("FilterString", filterString);
nd3BillQueryDefaults(json);
@@ -4573,7 +4644,7 @@ public class JdUtil {
"FBillNo,F_UCHN_Text2,FDate,FDeliveryDate,FQty,FRemainStockINQty,FMaterialId.FNumber,FMaterialName");
JsonArray filterString = new JsonArray();
filterString.add(nd3Filter("FMaterialId.FNumber", "=", materialCode));
- filterString.add(nd3Filter("FMRPCloseStatus", "105", "A"));
+ filterString.add(nd3Filter("FCloseStatus", "105", "A"));
json.add("FilterString", filterString);
nd3BillQueryDefaults(json);
return nd3ParseList(client, json, PurchaseOrderDTO.class, "PUR_PurchaseOrder", materialCode, null);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/runner/PDFGenerator.java b/ruoyi-system/src/main/java/com/ruoyi/system/runner/PDFGenerator.java
index e06ef7d..c7f055d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/runner/PDFGenerator.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/runner/PDFGenerator.java
@@ -131,6 +131,14 @@ public class PDFGenerator {
}
public static String writeToPdf(List combinedVoList, String rooteProdet, List fontPaths) {
+ return writeToPdf(combinedVoList, rooteProdet, fontPaths, null);
+ }
+
+ /**
+ * @param singlePdfFileName 非空时不打 zip，把本批 PDF 合成/直接返回该文件名（一个物料一份）
+ */
+ public static String writeToPdf(List combinedVoList, String rooteProdet, List fontPaths,
+ String singlePdfFileName) {
String[] fontCandidates = (fontPaths == null || fontPaths.isEmpty())
? new String[] {
"C:\\Users\\Administrator\\Desktop\\arial unicode ms.ttf"
@@ -380,6 +388,14 @@ public class PDFGenerator {
if (generatedPdfFiles.isEmpty()) {
throw new RuntimeException("目录中未找到已生成PDF: " + directoryPath);
}
+ // 指定了单物料文件名：一份物料一份 PDF，多张生产订单则合并
+ if (singlePdfFileName != null && !singlePdfFileName.trim().isEmpty()) {
+ try {
+ return packAsSinglePdf(directoryPath, generatedPdfFiles, singlePdfFileName.trim());
+ } catch (IOException e) {
+ throw new RuntimeException("合并单物料PDF失败: " + e.getMessage(), e);
+ }
+ }
// 生成ZIP文件
String zipFilePath = directoryPath + "\\" + rooteProdet + "_工序计划单.zip";
try {
@@ -395,6 +411,27 @@ public class PDFGenerator {
}
+ /**
+ * 将已生成的多份 PDF 合成一份（同一物料多张金蝶生产订单时）。
+ */
+ private static String packAsSinglePdf(String directoryPath, List pdfFiles, String fileName) throws IOException {
+ File dest = new File(directoryPath, fileName);
+ if (pdfFiles.size() == 1) {
+ File src = pdfFiles.get(0);
+ if (!src.getCanonicalPath().equals(dest.getCanonicalPath())) {
+ Files.copy(src.toPath(), dest.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+ }
+ return dest.getAbsolutePath();
+ }
+ PDFMergerUtility merger = new PDFMergerUtility();
+ for (File pdf : pdfFiles) {
+ merger.addSource(pdf);
+ }
+ merger.setDestinationFileName(dest.getAbsolutePath());
+ merger.mergeDocuments(null);
+ return dest.getAbsolutePath();
+ }
+
/**
* 创建ZIP文件
*
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IDrawingWorkloadService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDrawingWorkloadService.java
index a2f290b..430bae7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IDrawingWorkloadService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDrawingWorkloadService.java
@@ -8,10 +8,20 @@ import com.ruoyi.system.domain.vo.DrawingWorkloadVo;
public interface IDrawingWorkloadService {
/**
- * 从 FTP 下载「{令号}图纸数量统计表.xlsx」，解析 Sheet1/Sheet2 后入库（按项目覆盖）。
+ * 从该令号对应目录下载「图纸数量统计表」并入库。目录中没有该表时工作量记为 0，不再用其它文件凑数。
*/
DrawingWorkloadVo syncFromFtp(Long orderProId);
+ /**
+ * 本机对应令号目录已有图纸数量统计表时解析入库；没有文件则返回 null。
+ */
+ DrawingWorkloadVo syncFromLocalIfExists(Long orderProId);
+
+ /**
+ * 批量从 FTP 读取图纸工作量。不因单条失败中断。
+ */
+ java.util.Map syncFromFtpBatch(java.util.Collection orderProIds);
+
/**
* 查询已入库的图纸工作量（含明细）。
*/
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IPlmPdfZipPushService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IPlmPdfZipPushService.java
index eb2dda6..c452c52 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IPlmPdfZipPushService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IPlmPdfZipPushService.java
@@ -16,12 +16,18 @@ public interface IPlmPdfZipPushService {
String savedDir, List> savedItems);
/**
- * 图纸 zip/批量推送时：若 process_order_pro 尚无该令号，则自动建项目（source=PLM）。
+ * 图纸 zip/批量推送：校验 process_order_pro 已存在该令号，否则抛「生产令号不存在」。
+ * 项目下尚无产品时，可补一条 figure_save（型号/名称/数量/类型/出图时间）。
*
- * @return 新建返回项目 id；已存在返回已有 id；令号为空返回 null
+ * @return 已有项目 id
*/
Long ensureProcessOrderProForPlmPdf(String productionOrderNo);
+ /**
+ * 同上；可用本次推送明细推断主产品型号/名称/数量（优先 .00 总装图）。
+ */
+ Long ensureProcessOrderProForPlmPdf(String productionOrderNo, List> savedItems);
+
/**
* 清理总令号目录中与子令号重复的图纸（保留子令号侧）：
*
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IPlmProcessRoutePushService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IPlmProcessRoutePushService.java
index d92c062..1ae83d8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IPlmProcessRoutePushService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IPlmProcessRoutePushService.java
@@ -9,7 +9,8 @@ import com.ruoyi.system.domain.bo.plm.PlmProcessRoutePushNormalizer;
public interface IPlmProcessRoutePushService {
/**
- * 将 PLM 推送的 BOM、材料 BOM、工艺路线写入本地库（同令号先删后插）。
+ * 将 PLM 推送的 BOM、材料 BOM、工艺路线写入本地库。
+ * 已审核且总图号（物料编码以 .00 结尾）相同则拒绝；总图号不同则追加；未审核且相同则覆盖该总图。
*/
PlmProcessRoutePushNormalizer.PlmProcessRoutePushSummary persist(PlmProcessRoutePushBo body);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IProcessOrderProService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IProcessOrderProService.java
index 30e1425..3f5efa7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IProcessOrderProService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IProcessOrderProService.java
@@ -17,6 +17,7 @@ import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import java.util.Set;
/**
@@ -52,6 +53,11 @@ public interface IProcessOrderProService {
*/
Boolean updateByBo(ProcessOrderProBo bo);
+ /**
+ * 批量设置项目状态（不校验设计人等整单字段）
+ */
+ Boolean updateBomStatus(List ids, Long bomStatus);
+
/**
* 清空项目关联数据（保留项目本身）
*/
@@ -72,6 +78,11 @@ public interface IProcessOrderProService {
void addProduct( RigidChainModelDTO orderPro);
+ /**
+ * 设置项目出图模式（normal / part）。零部件模式下若已有产品且图纸路径不一致则拒绝。
+ */
+ Boolean updateDrawingMode(Long id, String drawingMode);
+
String executDrawing(ProcessOrderProBo orderPro);
/**
@@ -81,6 +92,16 @@ public interface IProcessOrderProService {
*/
R uploadPDF(Long id);
+ /**
+ * 下载流结束后清理本次出图临时目录（run_*），不影响其他人正在用的目录。
+ */
+ void cleanupPdfRunDir(String zipPath);
+
+ /**
+ * 设计人员确认图纸已齐，允许下载 PDF（本批数量不落库，下载时按图纸推送明细取值）。
+ */
+ R> issueDrawingQty(Long id);
+
String uploadContractPDF(Integer id, String originalFilename, MultipartFile filePath);
List getOverdueProjects();
@@ -124,4 +145,9 @@ public interface IProcessOrderProService {
* 刷新并计算项目延期状态
*/
void refreshDelayStatus();
+
+ /**
+ * 临时导入：按生产令号更新出图时间、项目完成时间、工艺完成时间、计划排产时间、BOM/物料更新、设计人
+ */
+ Map importDrawingByExcel(MultipartFile file);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IProcessRouteService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IProcessRouteService.java
index 814cbfa..12e92bc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IProcessRouteService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IProcessRouteService.java
@@ -58,16 +58,19 @@ public interface IProcessRouteService {
Boolean deleteWithValidByIds(Collection ids, Boolean isValid);
Boolean updateOrInsertRoute(List bomDetailsVos);
+
/**
* 保存数据
*/
boolean saveData(List routeVoList, List productionOrderVos);
+
/**
* 查询组焊件集合
*/
List pushGroupWeldments(ProcessRoute processRoute);
+
/**
* 获取所有的项目令号
*/
@@ -82,11 +85,19 @@ public interface IProcessRouteService {
* 查询工艺工序集合
*/
List getProcessRoute(String rooteProdet);
+
/**
* 推送工艺路线
*/
- R pushRouteBom(String rooteProdet,String groupName);
+ R pushRouteBom(String rooteProdet, String groupName);
+
+ /**
+ * 按物料推送工艺路线（不改项目整单状态，不影响全量推送）。
+ *
+ * @param materialCodes 本项目下要推送的物料编码，不可空
+ */
+ R pushRouteBomByMaterial(String rooteProdet, String groupName, Collection materialCodes);
/**
* 获取所有的项目令号
@@ -94,14 +105,18 @@ public interface IProcessRouteService {
List getSelecPlanRouteList(String rooteProdet);
/**
- * 生成这个项目的pdf
+ * 生成工序计划单：物料编码为空时按令号打全部 PDF 压缩包；有物料编码时只生成该物料一份 PDF。
+ *
+ * @param materialCode 物料编码，可空
*/
- String generatePDFs(String rooteProdet) throws IOException;
+ String generatePDFs(String rooteProdet, String materialCode) throws IOException;
+
/**
* 更新计划时间
*/
List updateProcessPlan(String rooteProdet) throws Exception;
+
/**
* 获取所有项目
*/
@@ -111,7 +126,7 @@ public interface IProcessRouteService {
R addRoute(List list);
- List getProcessMaterialList(String materialCode,String materialName, String productionOrderNo);
+ List getProcessMaterialList(String materialCode, String materialName, String productionOrderNo);
List deleteRoute(ProcessRoute processRoute);
@@ -122,18 +137,22 @@ public interface IProcessRouteService {
List getSelectProcessRoute(String materilCode);
List getSelectStandProcessRoute(String materilCode);
+
//根据项目令号删除 材料bom 总装bom 工艺路线
R delByProjectCode(String productionOrderNo);
- List getProcessRouteList(String materialCode, String materialName, String productionOrderNo);
+ List getProcessRouteList(String materialCode, String materialName, String productionOrderNo);
+
//获取物料的非委外的工作时长
Double getFbWorkTime(BomDetails material);
Double getFaWorkTime(BomDetails material);
+
//根据令号和物料编码 查询工艺路线
List getProcessRoutesByOrder(String productionOrderNo, String materialCode);
+
//根据物料编码查询工艺路线
- List getSingleWeght( String materialCode);
+ List getSingleWeght(String materialCode);
List updateProcesTime(String rooteProdet) throws Exception;
@@ -141,18 +160,19 @@ public interface IProcessRouteService {
List getProcessMaterialListAll(String routeDescription);
- List getProcessRouteGD(List list,String rooteProdet);
+ List getProcessRouteGD(List list, String rooteProdet);
+
//获取物料首个工序的工作中心
- String getRouteCode(String materialCode,String code);
+ String getRouteCode(String materialCode, String code);
List selectByProjectNumber(String productionOrderNo);
R viewGetBomUploadStatus(String rooteProdet);
//根据令号和物料编码 查询工艺路线
- ProcessRoute getProcessRoutesXuTime(String productionOrderNo, String materialCode,String xu);
+ ProcessRoute getProcessRoutesXuTime(String productionOrderNo, String materialCode, String xu);
- List updateProductionOrders(String rooteProdet,String cangKuNum) throws Exception;
+ List updateProductionOrders(String rooteProdet, String cangKuNum) throws Exception;
List updateCgOrders(String rooteProdet, String cangKuNum) throws Exception;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IProductionOrderService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IProductionOrderService.java
index 8f607c6..52e1258 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IProductionOrderService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IProductionOrderService.java
@@ -99,7 +99,8 @@ public interface IProductionOrderService {
Map resolveSingleWeightByMaterialCodes(Collection materialCodes);
/**
- * 接收 PLM 总装配 BOM JSON，按生产令号全量替换入库。
+ * 接收 PLM 总装配 BOM JSON。
+ * 已审核且主产品图号相同则拒绝；主产品图号不同则追加；未审核且相同则覆盖该主产品。
*/
AssemblyBomReceiveSummary receiveAssemblyBom(List items);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRatioBuildCapacityService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRatioBuildCapacityService.java
index e5f90d0..d0d0fb2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRatioBuildCapacityService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IRatioBuildCapacityService.java
@@ -1,10 +1,16 @@
package com.ruoyi.system.service;
import com.ruoyi.system.domain.dto.ratio.RatioBuildCapacityDTO;
+import com.ruoyi.system.domain.dto.ratio.RatioModelOptionDTO;
-import java.math.BigDecimal;
+import java.util.List;
public interface IRatioBuildCapacityService {
- RatioBuildCapacityDTO queryByRatio(BigDecimal ratioValue, Integer qty);
+
+ List listRatios(String seriesType);
+
+ List listModels(String seriesType, String ratioValue);
+
+ RatioBuildCapacityDTO queryByRatio(String seriesType, String ratioValue, Long modelId, Integer qty);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/KingdeeOrderReceiveService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/KingdeeOrderReceiveService.java
index 1b36a48..a1255b5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/KingdeeOrderReceiveService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/KingdeeOrderReceiveService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.config.DingTalkProperties;
import com.ruoyi.common.dingding.robot.RobotGroupService;
+import com.ruoyi.common.utils.ProjectStatusLock;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.ProcessOrderPro;
import com.ruoyi.system.domain.KingdeePrdMo;
@@ -202,6 +203,7 @@ public class KingdeeOrderReceiveService {
/**
* 金蝶推送入库后，回写项目令号：有生产/采购明细则对应标志置 1（已建）。
+ * 只有本次含生产订单才把项目状态改为开始生产；仅采购订单不改状态。已生产完成的不回退。
*/
private void markProjectKingdeeOrderFlags(String productionOrderNo, int moCount, int poCount) {
if (moCount <= 0 && poCount <= 0) {
@@ -209,7 +211,7 @@ public class KingdeeOrderReceiveService {
}
ProcessOrderPro project = resolveProjectByProductionOrderNo(productionOrderNo);
if (project == null) {
- log.warn("金蝶订单接收：未找到生产令号对应项目，跳过标志更新。推送令号={}，请确认 process_order_pro.production_order_no 与金蝶 F_HBYT_SCLH 一致或为父令号",
+ log.warn("金蝶订单接收：未找到生产令号对应项目，跳过标志与状态更新。推送令号={}，请确认 process_order_pro.production_order_no 与金蝶令号完全一致",
productionOrderNo);
return;
}
@@ -221,42 +223,40 @@ public class KingdeeOrderReceiveService {
if (poCount > 0) {
uw.set(ProcessOrderPro::getNeedKingdeePurchaseOrder, 1);
}
+ boolean alreadyDone = project.getBomStatus() != null
+ && project.getBomStatus() == ProjectStatusLock.PRODUCTION_DONE;
+ boolean startProduction = moCount > 0 && !alreadyDone;
+ if (startProduction) {
+ uw.set(ProcessOrderPro::getBomStatus, ProjectStatusLock.IN_PRODUCTION);
+ }
int rows = processOrderProMapper.update(null, uw);
if (rows <= 0) {
log.warn("金蝶订单接收：更新项目标志影响行数为 0，项目 id={}，令号={}",
project.getId(), project.getProductionOrderNo());
return;
}
- if (!productionOrderNo.equals(project.getProductionOrderNo())) {
- log.info("金蝶订单接收：推送令号 {} 已回写至父项目 {}（id={}）",
- productionOrderNo, project.getProductionOrderNo(), project.getId());
+ log.info("金蝶订单接收：已更新项目 {}（id={}）金蝶订单标志，生产 {} 条，采购 {} 条",
+ productionOrderNo, project.getId(), moCount, poCount);
+ if (alreadyDone) {
+ log.info("金蝶订单接收：项目 {} 已是生产完成，不回退开始生产", project.getProductionOrderNo());
+ } else if (startProduction) {
+ log.info("金蝶订单接收：项目 {} 含生产订单，状态已更新为开始生产", project.getProductionOrderNo());
} else {
- log.info("金蝶订单接收：已更新项目 {} 金蝶订单标志，生产 {} 条，采购 {} 条",
- productionOrderNo, moCount, poCount);
+ log.info("金蝶订单接收：项目 {} 仅采购订单，不更新为开始生产", project.getProductionOrderNo());
}
}
/**
- * 先精确匹配；若无则取「项目令号为金蝶令号前缀」的最长匹配（如 FB-26-038-FW-01 → FB-26-038-FW）。
+ * 仅按生产令号精确匹配项目，找不到则不更新。
*/
private ProcessOrderPro resolveProjectByProductionOrderNo(String productionOrderNo) {
if (StringUtils.isBlank(productionOrderNo)) {
return null;
}
- String key = productionOrderNo.trim();
- ProcessOrderPro exact = processOrderProMapper.selectOne(
+ return processOrderProMapper.selectOne(
Wrappers.lambdaQuery()
- .eq(ProcessOrderPro::getProductionOrderNo, key)
+ .eq(ProcessOrderPro::getProductionOrderNo, productionOrderNo.trim())
.last("LIMIT 1"));
- if (exact != null) {
- return exact;
- }
- List prefixMatches = processOrderProMapper.selectList(
- Wrappers.lambdaQuery()
- .apply("{0} LIKE CONCAT(production_order_no, '%')", key)
- .ne(ProcessOrderPro::getProductionOrderNo, "")
- .last("ORDER BY LENGTH(production_order_no) DESC LIMIT 1"));
- return prefixMatches.isEmpty() ? null : prefixMatches.get(0);
}
private void notifyDingTalkGroup(List summaries, Date receiveTime) {
@@ -275,13 +275,26 @@ public class KingdeeOrderReceiveService {
markdown.append("> **接收时间**：").append(sdf.format(receiveTime)).append("\n\n");
markdown.append("> **项目数量**：").append(summaries.size()).append(" 个\n\n");
markdown.append("---\n\n");
+ boolean hasProductionOrder = false;
+ boolean hasPurchaseOnly = false;
for (OrderReceiveSummary summary : summaries) {
markdown.append("> **生产令号**：").append(summary.productionOrderNo).append("\n\n");
markdown.append("> 生产订单 **").append(summary.moCount).append("** 条 · ");
markdown.append("采购订单 **").append(summary.poCount).append("** 条\n\n");
+ if (summary.moCount > 0) {
+ hasProductionOrder = true;
+ } else {
+ hasPurchaseOnly = true;
+ }
}
markdown.append("---\n\n");
- markdown.append("金蝶生产、采购订单已审核并下达，请相关人员关注。");
+ if (hasProductionOrder && hasPurchaseOnly) {
+ markdown.append("含生产订单的项目状态已更新为开始生产；仅采购订单的项目状态不变。");
+ } else if (hasProductionOrder) {
+ markdown.append("金蝶生产订单已审核并下达，项目状态已更新为开始生产；请相关人员关注。");
+ } else {
+ markdown.append("金蝶采购订单已审核并下达；本次无生产订单，项目状态未改为开始生产。");
+ }
robotGroupService.sendMarkdown(conversationId, "金蝶订单接收通知", markdown.toString());
} catch (Exception e) {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/MssqlQueryService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/MssqlQueryService.java
index bdefbc5..c1309f4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/MssqlQueryService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/MssqlQueryService.java
@@ -7,10 +7,13 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.ImMaterial;
+import com.ruoyi.system.domain.bo.ImMaterialBo;
import com.ruoyi.system.domain.bo.KingdeeOrderTraceQueryBo;
import com.ruoyi.system.domain.bo.KingdeeWorkCenterDataBo;
import com.ruoyi.system.domain.dto.JjSubcontractTransferDetailDTO;
import com.ruoyi.system.domain.dto.SubcontractOperationTransferRowDTO;
+import com.ruoyi.system.domain.vo.ImMaterialVo;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -1222,5 +1225,238 @@ public class MssqlQueryService {
}
return result;
}
+
+ private static final String KINGDEE_MATERIAL_FROM = ""
+ + " FROM T_BD_MATERIAL m "
+ + " LEFT JOIN T_BD_MATERIAL_L ml ON m.FMATERIALID = ml.FMATERIALID AND ml.FLOCALEID = 2052 "
+ + " LEFT JOIN T_BD_MATERIALBASE b ON m.FMATERIALID = b.FMATERIALID "
+ + " LEFT JOIN T_BD_UNIT_L ul ON b.FBASEUNITID = ul.FUNITID AND ul.FLOCALEID = 2052 "
+ + " LEFT JOIN T_BD_MATERIALCATEGORY c ON b.FCATEGORYID = c.FCATEGORYID "
+ + " LEFT JOIN T_BD_MATERIALPURCHASE p ON m.FMATERIALID = p.FMATERIALID "
+ + " LEFT JOIN T_BAS_ASSISTANTDATAENTRY ass ON m.F_SVRI_ASSISTANT = ass.FENTRYID "
+ + " LEFT JOIN T_BAS_ASSISTANTDATAENTRY_L assl ON ass.FENTRYID = assl.FENTRYID AND assl.FLOCALEID = 2052 ";
+
+ private static final String KINGDEE_MATERIAL_SELECT = ""
+ + "SELECT m.FMATERIALID AS materialId, m.FNUMBER AS materialCode, ml.FNAME AS materialName, "
+ + "COALESCE(NULLIF(LTRIM(RTRIM(ml.FSPECIFICATION)), ''), assl.FDATAVALUE) AS materialQuality, "
+ + "m.F_HBYT_DZ AS singleWeight, ul.FNAME AS unit, "
+ + "c.FNUMBER AS imCategory, b.FERPCLSID AS classificationNumber, "
+ + "COALESCE(p.FISVMIBUSINESS, b.FISVMIBUSINESS) AS isVmi, "
+ + "m.FMODIFYDATE AS modifyDate, m.FFORBIDSTATUS AS forbidStatus ";
+
+ /**
+ * 分页查询金蝶物料（T_BD_MATERIAL），仅未禁用。
+ */
+ @DS("sqlserver")
+ public KingdeeMaterialPage queryMaterialPage(ImMaterialBo bo, int pageNum, int pageSize, boolean onlyEnabled) {
+ List