From 4e8dc8cd84e3d3d4099d9cf0ed866dbd7e8ed9aa Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期一, 24 八月 2026 11:45:31 +0800
Subject: [PATCH] feat 功能修正
---
.gitignore | 6 +++++-
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/ctc/ProductCtcServiceImpl.java | 2 +-
yudao-server/src/main/resources/application-local.yaml | 1 -
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index a140560..d2da0c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,11 @@
*.iws
*.iml
*.ipr
-
+*.sql
+*.md
+*.xlsx
+*.docx
+*.txt
### NetBeans ###
nbproject/private/
build/*
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/ctc/ProductCtcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/ctc/ProductCtcServiceImpl.java
index 6b268e7..be4169d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/ctc/ProductCtcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/ctc/ProductCtcServiceImpl.java
@@ -144,7 +144,7 @@
double l2 = reqVO.getReelWidth().doubleValue();
double ct = reqVO.getCtcThickness().doubleValue();
double cw = reqVO.getCtcWidth().doubleValue();
- if (d1 <= d2 || l2 <= 0 || ct <= 0 || cw <= 0) {
+ if (d1 - 70 <= d2 || l2 <= 0 || ct <= 0 || cw <= 0) {
throw exception(PD_CTC_CALC_PARAM_INVALID);
}
// 鐩樺叿瀹归噺鍏紡锛堝弬鐓ч渶姹傛枃妗ｇ洏鍏疯绠� sheet锛夛細
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index ea2a296..50a63a0 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -200,7 +200,6 @@
compress-quality: 0.5 # 鍘嬬缉璐ㄩ噺(0.0-1.0)
# MES 鏁伴噰锛堣澶囨暟鎹噰闆嗭級閰嶇疆锛屽閮ㄦ暟閲囨湇鍔″湴鍧�鎸夊疄闄呴儴缃插～鍐�
-yudao:
mes:
telemetry:
base-url: http://106.227.91.252:3100 # 鏁伴噰鏈嶅姟鍦板潃
--
Gitblit v1.9.3