From b895e0b5908e4da5273ab3b5ecc4c82755342d6d Mon Sep 17 00:00:00 2001
From: itzhang <2019326567@qq.com>
Date: Mon, 14 Jul 2025 18:53:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C=E5=92=8C?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E6=96=87=E4=BB=B6=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=9B=9E=E5=86=99=E6=83=85=E5=86=B5=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/management/controller/DesignController.java | 1 +
 src/main/java/com/management/controller/XSHTController.java   | 4 +++-
 .../java/com/management/tzcontroller/TZXSHTController.java    | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/management/controller/DesignController.java b/src/main/java/com/management/controller/DesignController.java
index 03b5f64..bda004f 100644
--- a/src/main/java/com/management/controller/DesignController.java
+++ b/src/main/java/com/management/controller/DesignController.java
@@ -57,6 +57,7 @@ public class DesignController {
                 //new Filter("IS", "erp_id__c", Arrays.asList("")),
                 new Filter("IN", "sync_status__c", Arrays.asList(syncStatus)),
                 //new Filter("EQ", "name", Arrays.asList("SJWJ250528-0022")),
+                new Filter("N", "is_initial__c", Arrays.asList("yes")),
                 new Filter("GT", "create_time", Arrays.asList("1748923200000")),
                 new Filter("EQ", "life_status", Arrays.asList("normal"))
         ), "design_file__c");
diff --git a/src/main/java/com/management/controller/XSHTController.java b/src/main/java/com/management/controller/XSHTController.java
index 1244907..ea395ac 100644
--- a/src/main/java/com/management/controller/XSHTController.java
+++ b/src/main/java/com/management/controller/XSHTController.java
@@ -90,7 +90,7 @@ public class XSHTController {
             //合同名称
             String contractName = contractData.getString("zhy_contract_number__c") != null ? contractData.getString("zhy_contract_number__c") : "";
 
-            if ("".equals(contractName) || !contractName.contains("ZHY")){
+            if ("".equals(contractName)) {
                 log.info("合同名称不存在，将不再向下执行");
                 continue;
             }
@@ -518,6 +518,8 @@ public class XSHTController {
 
             System.out.println("回写结果为：" + backRes);
 
+            logMap.put("send_memo", JSON.toJSONString(backRes));
+
             //开始记录日志
             JSONObject logRes = new JSONObject();
             try {
diff --git a/src/main/java/com/management/tzcontroller/TZXSHTController.java b/src/main/java/com/management/tzcontroller/TZXSHTController.java
index 7a29421..b9236ce 100644
--- a/src/main/java/com/management/tzcontroller/TZXSHTController.java
+++ b/src/main/java/com/management/tzcontroller/TZXSHTController.java
@@ -73,7 +73,7 @@ public class TZXSHTController {
             String salesOrderId = salesOrderData.getString("_id");//唯一id
             String salesOrderName = salesOrderData.getString("zhy_contract_number__c") != null ? salesOrderData.getString("zhy_contract_number__c") : "";
 
-            if ("".equals(salesOrderName) || !salesOrderName.contains("ZHY")){
+            if ("".equals(salesOrderName)) {
                 log.info("合同名称不存在，将不再向下执行");
                 continue;
             }
@@ -207,6 +207,8 @@ public class TZXSHTController {
 
             System.out.println("回写结果为：" + backRes);
 
+            logMap.put("send_memo", JSON.toJSONString(backRes));
+
             //开始记录日志
             JSONObject logRes = new JSONObject();