gzw 测试环境代码更新

高章伟

2023-03-03 d8dc84a3d56df839895f1c417a4d9cbee763d262

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

@@ -30,7 +30,7 @@
        initTypeList();

        if (Id != null) {
            resList = [select Rental_Start_Date__c,Rental_Apply__r.Name, First_RAESD_Model_No_F__c, First_RAESD__r.SerialNumber_F__c, First_RAESD__r.Fixture_QRCode_F__c, RAES_Status__c
            resList = [select Rental_Apply__r.Name, First_RAESD_Model_No_F__c, First_RAESD__r.SerialNumber_F__c, First_RAESD__r.Fixture_QRCode_F__c, RAES_Status__c
                    from Rental_Apply_Equipment_Set__c
                    where Rental_Apply__r.Name = :id order by Name
                    //AND Cancel_Select__c = false
@@ -48,7 +48,7 @@
                        raesdSet.add(raesd.Id);
                    }
                }
                resList = [select Rental_Start_Date__c,Id, Rental_Apply__c, Rental_Apply__r.Name, First_RAESD_Model_No_F__c, First_RAESD__r.SerialNumber_F__c, First_RAESD__r.Fixture_QRCode_F__c, RAES_Status__c
                resList = [select Id, Rental_Apply__c, Rental_Apply__r.Name, First_RAESD_Model_No_F__c, First_RAESD__r.SerialNumber_F__c, First_RAESD__r.Fixture_QRCode_F__c, RAES_Status__c
                        from Rental_Apply_Equipment_Set__c
                       where (First_RAESD__c in :raesdSet
                                or ((First_RAESD__r.Canceled__c in :raesdSet or First_RAESD__r.Canceled__r.Canceled__c in :raesdSet)
@@ -99,6 +99,7 @@
            config.RAESD_Action_Type__c = selectedType;
            FixtureUtil.withoutUpsertObjects(new System_UserSetting__c[]{config});
        }

    }

    //// 出库