2026-11-05

TID接口路径放至配置文件

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);
         }

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);
         }

src/main/resources/application-dev.yml

@@ -228,3 +228,10 @@ u8:
   workhour:
     add:
       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'

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>