From f00c243080bb5ca3ca7b269cae66d46e75f5ab5e Mon Sep 17 00:00:00 2001
From: itzhang <2019326567@qq.com>
Date: Sun, 29 Jun 2025 10:22:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E7=AD=9B=E9=80=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=9B=B4=E6=96=B0=EF=BC=8C=E9=87=91=E8=9D=B6=E8=B5=B7?=
 =?UTF-8?q?=E5=88=9D=E5=90=88=E5=90=8C=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/management/controller/PastContractController.java  | 2 +-
 .../java/com/management/tzcontroller/DeliveryReqController.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/management/controller/PastContractController.java b/src/main/java/com/management/controller/PastContractController.java
index b028c42..64e92e5 100644
--- a/src/main/java/com/management/controller/PastContractController.java
+++ b/src/main/java/com/management/controller/PastContractController.java
@@ -345,7 +345,7 @@ public class PastContractController {
                 contractDetailMap.put("linetype_number", contractTypeStr);//行类型
                 contractDetailMap.put("goodsname", contractDetailData.getString("product_name__c"));//产品名称
                 //contractDetailMap.put("material_number", contractDetailData.getString("product_id__r"));//物料编号
-                contractDetailMap.put("material_number", "TEST0001");//todo 物料编号
+                contractDetailMap.put("material_number", "80800001");//todo 物料编号
                 contractDetailMap.put("specification", contractDetailData.getString("specification__c") != null ? contractDetailData.getString("specification__c") : "");//规格
                 contractDetailMap.put("baseunit", contractDetailData.getString("unit__c__r") != null ? contractDetailData.getString("unit__c__r") : "");//单位
                 //contractDetailMap.put("baseunit", "TEST0001");//todo 单位
diff --git a/src/main/java/com/management/tzcontroller/DeliveryReqController.java b/src/main/java/com/management/tzcontroller/DeliveryReqController.java
index 51533dc..97bd762 100644
--- a/src/main/java/com/management/tzcontroller/DeliveryReqController.java
+++ b/src/main/java/com/management/tzcontroller/DeliveryReqController.java
@@ -53,6 +53,7 @@ public class DeliveryReqController {
         JSONObject getDelivery = crmRequestUtil.getCRMList(Arrays.asList(
                 new Filter("GT", "last_modified_time", Arrays.asList("1748923200000")),
                 new Filter("EQ", "life_status", Arrays.asList("normal")),
+                new Filter("EQ", "sync_status__c", Arrays.asList("option_sync_success__c")),
                 //new Filter("EQ", "name", Arrays.asList("FHSQ202505270013")),
                 new Filter("IN", "ledger_sync_status__c", Arrays.asList(syncStatus))
         ), "shipping_application__c");
@@ -262,6 +263,7 @@ public class DeliveryReqController {
         JSONObject getRefund = crmRequestUtil.getCRMList(Arrays.asList(
                 new Filter("GT", "last_modified_time", Arrays.asList("1748923200000")),
                 new Filter("EQ", "life_status", Arrays.asList("normal")),
+                new Filter("EQ", "sync_status__c", Arrays.asList("option_sync_success__c")),
                 //new Filter("EQ", "name", Arrays.asList("FHSQ202505270013")),
                 new Filter("IN", "ledger_sync_status__c", Arrays.asList(syncStatus))
         ), "return_application__c");