From 1312ba82d4c880bdb5357d28e0d4af5b285f610f Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 10 三月 2022 15:54:39 +0800
Subject: [PATCH] 最近一月修改内容

---
 force-app/main/default/classes/NFM603Controller.cls |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/classes/NFM603Controller.cls b/force-app/main/default/classes/NFM603Controller.cls
index b62e5c9..4bbc673 100644
--- a/force-app/main/default/classes/NFM603Controller.cls
+++ b/force-app/main/default/classes/NFM603Controller.cls
@@ -41,6 +41,10 @@
         public String QuotationGread; //鎶ヤ环绛夌骇(new)
         public String detectionResult; //妫�娴嬬粨鏋�
         public String cus_dn; //DN鍙�
+        //淇悊澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220308 start
+        public String OTSRepairOrder;
+        //淇悊澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220308 end
+
         //閫佷慨鐗╂祦
         public String deliveryLogisticsMode; //閫佷慨鐗╂祦鏂瑰紡
         public String engineerSendDate; //宸ョ▼甯堜慨鐞嗗搧瀵勯�佹棩
@@ -216,6 +220,7 @@
                 RcSorcDate__c,
                 SorcAcceptDate__c,
                 SorcOgzDate__c,
+                RcOgzDate__c,
                 Returns_Product_waySAP__c,
                 DnNO__c,
                 OgzAcceptDate__c,
@@ -233,7 +238,10 @@
                 Repair_Final_Inspection_DateTime__c,
                 Repair_Shipped_DateTime__c,
                 Repair_Discount_approval_DateTime_form__c,
-                Agreed_DateTime__c
+                Agreed_DateTime__c,
+                //淇悊澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220308 start
+                OTSRepairOrder__c
+                //淇悊澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220308 end
                 from Repair__c where id in: repairOrderIdList
             ];
         }
@@ -366,10 +374,17 @@
                 info.OgzAcceptDate = NFMUtil.formatDateTime2Str(repair.OgzAcceptDateTime__c);//OGZ鍙楃悊鏃ワ紙灏忕▼搴忥級
                 //update        wangweipeng         2022/02/16           end
 
-                info.SorcOgzDate = NFMUtil.formatDate2StrDateTime(repair.SorcOgzDate__c);
+                // info.SorcOgzDate = NFMUtil.formatDate2StrDateTime(repair.SorcOgzDate__c);RcOgzDate__c
+
+                //update   zhangyuheng    2022/03/07
+                info.SorcOgzDate = NFMUtil.formatDate2StrDateTime(repair.RcOgzDate__c);
 
                 info.cus_dn = repair.DnNO__c;
+                //淇悊澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220308 start
+                info.OTSRepairOrder = repair.OTSRepairOrder__c;
+                //淇悊澧炲姞OTS杩愬崟鍙峰瓧娈� thh 20220308 end
                 repairs.add(info);
+                System.debug('repairs1:' + repairs);
             }
             logstr += '\nend';
             if (repairs.size() > 0) {

--
Gitblit v1.9.1