From 0f03263ea54a92e7d9b948034f4bbd7542199736 Mon Sep 17 00:00:00 2001
From: itzhang <2019326567@qq.com>
Date: Tue, 5 Aug 2025 16:55:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E8=B7=9F=E8=B8=AA?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/GoodsPlanController.java       | 35 +++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/management/controller/GoodsPlanController.java b/src/main/java/com/management/controller/GoodsPlanController.java
index 48e749d..71ed961 100644
--- a/src/main/java/com/management/controller/GoodsPlanController.java
+++ b/src/main/java/com/management/controller/GoodsPlanController.java
@@ -59,9 +59,9 @@ public class GoodsPlanController {
         JSONObject getGoodsPlan = crmRequestUtil.getCRMList(Arrays.asList(
                 //new Filter("IS", "erp_id__c", Arrays.asList("")),
                 new Filter("EQ", "business_status__c", Arrays.asList("option_normal__c")),
-                new Filter("IN", "sync_status__c", Arrays.asList(syncStatus)),
+                //new Filter("IN", "sync_status__c", Arrays.asList(syncStatus)),
                 new Filter("GT", "create_time", Arrays.asList("1748923200000")),
-                //new Filter("EQ", "name", Arrays.asList("YHJH20250508-0002")),
+                new Filter("EQ", "name", Arrays.asList("YHJH2508040004")),
                 new Filter("EQ", "life_status", Arrays.asList("normal"))
         ), "purchase_plan__c");
 
@@ -972,9 +972,26 @@ public class GoodsPlanController {
         }
 
         trackingNumMap.put("f9w5_deviceid", trackingNumData.getString("device_id_third__c") != null ? trackingNumData.getString("device_id_third__c") : "");//设备ID（第三方编号）
-        trackingNumMap.put("f9w5_apn", trackingNumData.getString("apn_parameters__c") != null ? trackingNumData.getString("apn_parameters__c") : "无");//APN参数
-        trackingNumMap.put("f9w5_ip", trackingNumData.getString("ip_address__c") != null ? trackingNumData.getString("ip_address__c") : "无");//ip
-        trackingNumMap.put("f9w5_port", trackingNumData.getString("port__c") != null ? trackingNumData.getString("port__c") : "无");//端口
+
+        String apn = trackingNumData.getString("apn_parameters__c") != null ? trackingNumData.getString("apn_parameters__c") : "";
+
+        if (!"".equals(apn)) {
+            apn = "无";
+        }
+
+        trackingNumMap.put("f9w5_apn", apn);//APN参数
+
+        String ip = trackingNumData.getString("ip__c") != null ? trackingNumData.getString("ip__c") : "";
+
+        if (!"".equals(ip)) {
+            ip = "无";
+        }
+
+        trackingNumMap.put("f9w5_ip", ip);//ip
+
+        String port = trackingNumData.getString("port__c") != null ? trackingNumData.getString("port__c") : "";
+
+        trackingNumMap.put("f9w5_port", port);//端口
 
         //是否插卡
         String isCard = trackingNumData.getString("is_card_inserted__c") != null ? trackingNumData.getString("is_card_inserted__c") : "";
@@ -1051,7 +1068,13 @@ public class GoodsPlanController {
 
         trackingNumMap.put("f9w5_auxiliarytype", auxiliarychanneltype);
         //维护时间段
-        trackingNumMap.put("f9w5_maintenancetime", trackingNumData.getString("maintenance_time_period__c") != null ? trackingNumData.getString("maintenance_time_period__c") : "无");
+        String maintenanceTime = trackingNumData.getString("maintenance_time_period__c") != null ? trackingNumData.getString("maintenance_time_period__c") : "";
+
+        if ("".equals(maintenanceTime)) {
+            maintenanceTime = "无";
+        }
+
+        trackingNumMap.put("f9w5_maintenancetime", maintenanceTime);
         //出厂内外卡选择
         trackingNumMap.put("f9w5_inoutcard", trackingNumData.getString("factory_external_card_choi__c__r") != null ? trackingNumData.getString("factory_external_card_choi__c__r") : "");
         //出厂平台选择