gzw 测试环境代码更新

高章伟

2023-03-03 d8dc84a3d56df839895f1c417a4d9cbee763d262

 force-app/main/default/classes/NFM401Controller.cls

@@ -235,7 +235,10 @@
                                                Return_Without_Repair_Date__c,
                                                PAE_DetermineAC__c,
                                                ASReportedCode__c,
                                                Delivered_Product__r.unknow_serial_NO_product__c
                                                Delivered_Product__r.unknow_serial_NO_product__c,
                                                // add by lc WLIG-CGRBFX 2022-08-03 start
                                                Delivered_Product__r.Serinumber_Asset_number_Equ__c
                                                // add by lc WLIG-CGRBFX 2022-08-03 end
                                            from Repair__c
                                            where Id in : repairIds];

@@ -317,6 +320,9 @@
                                                Hospital__r.Address__c,
                                                //add by rentongxiao 2020-09-21 end
                                                nonyushohin__r.unknow_serial_NO_product__c,
                                                // add by lc WLIG-CGRBFX 2022-08-03 start
                                                nonyushohin__r.Serinumber_Asset_number_Equ__c,
                                                // add by lc WLIG-CGRBFX 2022-08-03 end
                                                nonyushohin__c,
                                                QIS_Submit_day__c,
                                                QIS_no_for_m_BC__c
@@ -352,14 +358,21 @@
                        RepairRequest.AWARE_DATE = NFMUtil.formatDate2Str(rr.DateReceiptQuestions__c) ;
                    }
                    RepairRequest.INVESTIGATION_REQUIRED = null ;
                    RepairRequest.ASSIGN_TO = 'OSH RA' ;  
                    // 20220507 ljh WLIG-CF56M9 start
                    // RepairRequest.ASSIGN_TO = 'OSH RA' ; 
                    RepairRequest.ASSIGN_TO = 'OSH G-QARA' ;
                    // 20220507 ljh WLIG-CF56M9 end

                    RepairRequest.INITIATOR_LOCATION = 'Olympus Medical : OSH';

                }else if (statu == 'R2') {
                    RepairRequest.INITIATOR_LOCATION = 'Olympus Medical : OSH';

                    RepairRequest.INITIATOR = username;
                    RepairRequest.ASSIGN_TO = 'OSH RA' ;
                    // 20220507 ljh WLIG-CF56M9 start
                    // RepairRequest.ASSIGN_TO = 'OSH RA' ;
                    RepairRequest.ASSIGN_TO = 'OSH G-QARA' ;
                    // 20220507 ljh WLIG-CF56M9 end

                    RepairRequest.INVESTIGATION_REQUIRED = null ;
                    // gzw 20211229 AE的时候，不管PAE判断结果，需要Aware Date。 fix start
@@ -443,14 +456,18 @@
                RepairRequest.CUSTOMER_TELEPHONE =  String.isBlank(rr.HospitalPhone__c)  ? '/' : rr.HospitalPhone__c;
                RepairRequest.COUNTRY = 'China' ;
                RepairRequest.ITEM_CODE = rr.OT_CODE__c ;
                RepairRequest.LOT_SERIAL = rr.Delivered_Product__r.unknow_serial_NO_product__c == true ? 'Unknown' : rr.SerialNumber__c.indexOf('(') > 0 ? rr.SerialNumber__c.subString(0,rr.SerialNumber__c.indexOf('(')) : rr.SerialNumber__c ;
                // add by lc WLIG-CGRBFX 2022-08-03 start
                //RepairRequest.LOT_SERIAL = rr.Delivered_Product__r.unknow_serial_NO_product__c == true ? 'Unknown' : rr.SerialNumber__c.indexOf('(') > 0 ? rr.SerialNumber__c.subString(0,rr.SerialNumber__c.indexOf('(')) : rr.SerialNumber__c ;
                RepairRequest.LOT_SERIAL = rr.Delivered_Product__r.unknow_serial_NO_product__c || rr.Delivered_Product__r.Serinumber_Asset_number_Equ__c ? 'Unknown' : rr.SerialNumber__c.indexOf('(') > 0 ? rr.SerialNumber__c.subString(0,rr.SerialNumber__c.indexOf('(')) : rr.SerialNumber__c ;
                // add by lc WLIG-CGRBFX 2022-08-03 end

                RepairRequest.PRODUCT_RECEIPT_DATE = NFMUtil.formatDate2Str(rr.Repair_Ordered_Date__c);
                RepairRequest.EVALUATION_RESULT = null;
                RepairRequest.INITIATION_DATE = NFMUtil.formatDate2Str(rr.FSE_ApplyForRepair_Day__c) ;
                
                // 精琢科技  2022-03-03 LJPH-CC5ANQ 【委托】之前会传一个1900-1-1的日期，导致报错，现在改为传null zxk  start
                if(rr.PurchaseOrInstallationDate__c != null){
                // gzw fix 20220427 1900-1-1 send null
                if(rr.PurchaseOrInstallationDate__c != null && rr.PurchaseOrInstallationDate__c.year() != 1900){
                    RepairRequest.INSTALLATION_DATE = NFMUtil.formatDate2Str(rr.PurchaseOrInstallationDate__c) ;
                }else{
                    RepairRequest.INSTALLATION_DATE =  null;
@@ -591,8 +608,10 @@
                RepairRequest.COUNTRY = 'China' ;
                RepairRequest.ITEM_CODE = qr.ProductCode_Ext__c ;
                if (qr.nonyushohin__c != null) {
                    RepairRequest.LOT_SERIAL = qr.nonyushohin__r.unknow_serial_NO_product__c == true ? 'Unknown' : qr.lot_or_serial__c.indexOf('(') > 0 ? qr.lot_or_serial__c.subString(0,qr.lot_or_serial__c.indexOf('(')) : qr.lot_or_serial__c ;

                    // add by lc WLIG-CGRBFX 2022-08-03 start
                    //RepairRequest.LOT_SERIAL = qr.nonyushohin__r.unknow_serial_NO_product__c == true ? 'Unknown' : qr.lot_or_serial__c.indexOf('(') > 0 ? qr.lot_or_serial__c.subString(0,qr.lot_or_serial__c.indexOf('(')) : qr.lot_or_serial__c ;
                    RepairRequest.LOT_SERIAL = qr.nonyushohin__r.unknow_serial_NO_product__c || qr.nonyushohin__r.Serinumber_Asset_number_Equ__c ? 'Unknown' : qr.lot_or_serial__c.indexOf('(') > 0 ? qr.lot_or_serial__c.subString(0,qr.lot_or_serial__c.indexOf('(')) : qr.lot_or_serial__c ;
                    // add by lc WLIG-CGRBFX 2022-08-03 end
                }

                RepairRequest.EVALUATION_RESULT = null ;
@@ -603,7 +622,8 @@

                RepairRequest.INITIATION_DATE = NFMUtil.formatDate2Str(qr.QIS_Submit_day__c) ;
                // 精琢科技  2022-03-03 LJPH-CC5ANQ 【委托】之前会传一个1900-1-1的日期，导致报错，现在改为传null zxk  start
                if(qr.QISInstallDate__c != null){
                // gzw fix 20220427 1900-1-1 send null
                if(qr.QISInstallDate__c != null && qr.QISInstallDate__c.year() != 1900){
                    RepairRequest.INSTALLATION_DATE = NFMUtil.formatDate2Str(qr.QISInstallDate__c) ;
                }else{
                    RepairRequest.INSTALLATION_DATE =  null;
@@ -703,14 +723,20 @@

                if (statu == 'Q1') {
                    RepairRequest.AWARE_DATE = NFMUtil.formatDate2Str(qr.Trable_occur_daY_collect__c);
                    RepairRequest.ASSIGN_TO = 'OSH RA' ;
                    // 20220507 ljh WLIG-CF56M9 start
                    // RepairRequest.ASSIGN_TO = 'OSH RA' ;
                    RepairRequest.ASSIGN_TO = 'OSH G-QARA' ;
                    // 20220507 ljh WLIG-CF56M9 end
                        
                }else if (statu == 'Q2') {

                    if (qr.AE_DetermineResult__c == 'nonAE' && qr.PAE_Determine__c == 'nonPAE' && qr.PAE_DetermineAC__c == 'nonPAE') {
                        RepairRequest.ASSIGN_TO = 'OSH QA';
                    }else{
                        RepairRequest.ASSIGN_TO = 'OSH RA';
                        // 20220507 ljh WLIG-CF56M9 start
                        // RepairRequest.ASSIGN_TO = 'OSH RA';
                        RepairRequest.ASSIGN_TO = 'OSH G-QARA';
                        // 20220507 ljh WLIG-CF56M9 end
                    }
                    RepairRequest.EVALUATION_INITIATION_DATE = NFMUtil.formatDate2Str(Date.today()) ;

@@ -807,6 +833,15 @@
        // emas.add(UserInfo.getUserEmail());
        //收信人
        toMailList.add(UserInfo.getUserEmail());
        // 20220607 ljh add start
        String uid = UserInfo.getUserId();
        String BUid = System.Label.Batch_User_Id;
        if (uid.substring(0,15) == BUid.substring(0,15)) {
            for(String email : System.Label.RepairETQ.split(',')){
                toMailList.add(email);
            }
        }
        // 20220607 ljh add start
        //抄送人
        toccList.add('Hiroki_Hotta@olympus.com.cn');
        toccList.add('olympus@prec-tech.com');