From 53a29a0cb6c6d1f79b37898b4ac00aefafe66a1b Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 6 Nov 2026 16:31:40 +0800
Subject: [PATCH] =?UTF-8?q?2026-11-05=20TID=E6=8E=A5=E5=8F=A3=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E6=94=BE=E8=87=B3=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schedule/controller/ScheduleController.java   | 11 +++++++----
 .../service/impl/ScheduleServiceImpl.java         | 15 +++++++--------
 src/main/resources/application-dev.yml            |  9 ++++++++-
 .../resources/mapper/schedule/ScheduleMapper.xml  |  3 +++
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
index 91c2a29..247b49d 100644
--- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
+++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
@@ -58,13 +58,13 @@ public class ScheduleController extends AbstractController {
     @Autowired
     private RestTemplate restTemplate;
 
-    @Value("${mes.logs.base-url:http://logs.bt.in/api/logs}")
+    @Value("${mes.logs.base-url}")
     private String mesLogsBaseUrl;
 
-    @Value("${mes.logs.username:BOINGTECH}")
+    @Value("${mes.logs.username}")
     private String mesLogsUsername;
 
-    @Value("${mes.logs.password:xT8@mN5#vQwZ$2pL}")
+    @Value("${mes.logs.password}")
     private String mesLogsPassword;
     /**
      * TODO 获取排产班次的休息时间
@@ -2607,7 +2607,10 @@ public class ScheduleController extends AbstractController {
     }
 
     private String buildMesApiUrl(String path) {
-        String baseUrl = StringUtils.hasText(mesLogsBaseUrl) ? mesLogsBaseUrl.trim() : "http://logs.bt.in/api/logs";
+        if (!StringUtils.hasText(mesLogsBaseUrl)) {
+            throw new XJException("未配置TID接口地址 mes.logs.base-url");
+        }
+        String baseUrl = mesLogsBaseUrl.trim();
         if (baseUrl.endsWith("/")) {
             baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
         }
diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index 0344404..7f34b25 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
@@ -119,17 +119,13 @@ public class ScheduleServiceImpl implements ScheduleService {
     @Autowired
     private RestTemplate restTemplate;
 
-    // 测试环境接口
-    @Value("${mes.logs.base-url:https://www.rfid2print.net/CloudProdLogsD/api/logs}")
+    @Value("${mes.logs.base-url}")
     private String mesLogsBaseUrl;
 
-//    @Value("${mes.logs.base-url:http://logs.bt.in/api/logs}")
-//    private String mesLogsBaseUrl;
-
-    @Value("${mes.logs.username:BOINGTECH}")
+    @Value("${mes.logs.username}")
     private String mesLogsUsername;
 
-    @Value("${mes.logs.password:xT8@mN5#vQwZ$2pL}")
+    @Value("${mes.logs.password}")
     private String mesLogsPassword;
 
 
@@ -5244,7 +5240,10 @@ public class ScheduleServiceImpl implements ScheduleService {
     }
 
     private String buildMesLogsUrl(String path) {
-        String baseUrl = StringUtils.hasText(mesLogsBaseUrl) ? mesLogsBaseUrl.trim() : "http://logs.bt.in/api/logs";
+        if (!StringUtils.hasText(mesLogsBaseUrl)) {
+            throw new XJException("未配置TID接口地址 mes.logs.base-url");
+        }
+        String baseUrl = mesLogsBaseUrl.trim();
         if (baseUrl.endsWith("/")) {
             baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
         }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index ea790ff..5154248 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -227,4 +227,11 @@ toacc:
 u8:
   workhour:
     add:
-      url: http://192.168.7.109:8011/InterfaceService.svc/WorkHour/Add
\ No newline at end of file
+      url: http://192.168.7.109:8011/InterfaceService.svc/WorkHour/Add
+
+# TID日志接口（/upload、/checkRolls、/checkQuantity 等共用）
+mes:
+  logs:
+    base-url: https://www.rfid2print.net/CloudProdLogsD/api/logs
+    username: BOINGTECH
+    password: 'xT8@mN5#vQwZ$2pL'
\ No newline at end of file
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index 0ad1ce0..424a3f4 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -2183,6 +2183,9 @@
           AND CreatedOpsSeqNo = #{seqNo}
           AND tid_pass_flag = 'N'
           AND tid_roll_type = N'正常卷'
+        AND status <![CDATA[ <> ]]> '*'
+        AND RollType ='下道流转'
+        AND VirtualNewRollFlag ='N'
         ORDER BY RollNo
     </select>