最近一月修改内容

高章伟

2022-03-10 1312ba82d4c880bdb5357d28e0d4af5b285f610f

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

@@ -174,7 +174,7 @@
        deptCheck_PIC = currUser.Dept__c; //20210618 1650 you
        String cunFangDi = ApexPages.currentPage().getParameters().get('cunFangDi');
        hasConsumAsset = false;
        system.debug(cunFangDi+'==177='+bieCunFangDi);
        system.debug(cunFangDi+'==177=='+bieCunFangDi);
        if (cunFangDi != null) bieCunFangDi = cunFangDi;
        //20210628 you 1650 办事处看不到 货架号
        if (bieCunFangDi=='广州 备品中心' || bieCunFangDi=='北京 备品中心' || bieCunFangDi=='上海 备品中心') {
@@ -204,11 +204,15 @@
        
        statusMap = new Map<String, List<String>>();
        //备品搬家 20210706  SFDC-C5CC5S 暂停
        Date today = Date.today();
        List<Inventory_Header_Copy__c> ihList = [
            select Id, Inventory_Status__c, Name, Internal_asset_location__c, Inventory_Start_Date__c, Fixture_Header__c
              from Inventory_Header_Copy__c
             where Inventory_Status__c <> '已批准' and Internal_asset_location__c =:bieCunFangDi
                and Inventory_Start_Date__c = LAST_N_DAYS:30
                // 20220225 ljh 113盘点
                // and Inventory_Start_Date__c = LAST_N_DAYS:30
                and Inventory_Start_Date__c = :today
                // 20220225 ljh 113盘点
                ORDER BY Fixture_Header__c NULLS FIRST];
        // List<Inventory_Header_Copy__c> ihList = [
        //     select Id, Inventory_Status__c, Name, Internal_asset_location__c, Inventory_Start_Date__c, Fixture_Header__c
@@ -536,8 +540,10 @@
            return;
        }
        // 备品搬家 SFDC-C5CC5S 暂停
        List<Inventory_Header_Copy__c> ihList = [select Id, Inventory_Status__c, Name, Internal_asset_location__c, Inventory_Start_Date__c from Inventory_Header_Copy__c where Internal_asset_location__c =:bieCunFangDi and Inventory_Start_Date__c = LAST_N_DAYS:30];
        // List<Inventory_Header_Copy__c> ihList = [select Id, Inventory_Status__c, Name, Internal_asset_location__c, Inventory_Start_Date__c from Inventory_Header_Copy__c where Internal_asset_location__c =:bieCunFangDi and Inventory_Start_Date__c = LAST_N_DAYS:1];
        // 20220225 ljh 113盘点
        // List<Inventory_Header_Copy__c> ihList = [select Id, Inventory_Status__c, Name, Internal_asset_location__c, Inventory_Start_Date__c from Inventory_Header_Copy__c where Internal_asset_location__c =:bieCunFangDi and Inventory_Start_Date__c = LAST_N_DAYS:30];
        Date today = Date.today();
        List<Inventory_Header_Copy__c> ihList = [select Id, Inventory_Status__c, Name, Internal_asset_location__c, Inventory_Start_Date__c from Inventory_Header_Copy__c where Internal_asset_location__c =:bieCunFangDi and Inventory_Start_Date__c =:today];
        if (ihList.size() > 0) {
            if (ihList[0].Inventory_Status__c == null) {
                //do nothing
@@ -564,15 +570,11 @@
        ih_new.Inventory_Start_Date__c = Date.today();
        ih_new.InventorySubmit_PIC__c = String.isBlank(submitPIC) ? null : submitPIC;
        ih_new.InventoryCheck_PIC__c = String.isBlank(checkPIC) ? null : checkPIC;
        ih_new.UniqueKey__c = bieCunFangDi+':'+Date.today().toStartOfMonth();
        // ih_new.UniqueKey__c = bieCunFangDi+':'+Date.today().toStartOfMonth();
        ih_new.UniqueKey__c = bieCunFangDi+':'+Date.today();
        //.toStartOfMonth(); 备品搬家  uniqueKey保证唯一  SFDC-C5CC5S
        
        // FixtureUtil.withoutUpsertIh(new List<Inventory_Header_Copy__c> {ih_new});
        /*public static void withoutUpsertIh(List<Inventory_Header__c> sobj) {
            if (!sobj.isEmpty()) upsert sobj UniqueKey__c;
        }*/
        // List<Inventory_Header_Copy__c> sobj = new List<Inventory_Header_Copy__c> {ih_new};
        // if (!sobj.isEmpty()) upsert sobj UniqueKey__c;
        FixtureUtil.withoutUpsertIhCopy(new List<Inventory_Header_Copy__c> {ih_new});
        // InventoryStartAssetSnapshotBatch istarter = new InventoryStartAssetSnapshotBatch(bieCunFangDi, ih_new);
        InventoryStartAssetSnapshotCopyBatch istarter = new InventoryStartAssetSnapshotCopyBatch(bieCunFangDi, ih_new);
@@ -581,7 +583,7 @@
        ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '开始盘点处理，请等待Batch处理结束'));
    }

    public void save() {
    /*public void save() {
        doneFlg = false;
        // 类别为备品或为空 <=> 类别!=耗材
        if (assetCategory != '耗材' && inventoryHeader!=null && String.isNotBlank(inventoryHeader.Id) && System.Approval.isLocked(inventoryHeader.Id)) {
@@ -690,7 +692,10 @@
                        , Fixture_Header__c
                        from Inventory_Header_Copy__c
                        where Inventory_Status__c <> null and Inventory_Status__c <> '已批准' and Internal_asset_location__c =:bieCunFangDi
                          and Inventory_Start_Date__c = LAST_N_DAYS:30
                          // 20220225 ljh 113盘点
                        // and Inventory_Start_Date__c = LAST_N_DAYS:30
                          and Inventory_Start_Date__c = LAST_N_DAYS:1
                          // 20220225 ljh 113盘点
                          ORDER BY Fixture_Header__c nulls first
                        ];
        // ihList = [select Id,Inventory_Status__c, Name, Internal_asset_location__c, Inventory_Start_Date__c
@@ -833,13 +838,13 @@
                    //add by rentx 20210901 end
                }
                // 113 盘点Copy
                /*List<AggregateResult> consumAssetList = [
                        Select Internal_Asset_Flg__c fix, Asset_Status__c status, sum(toAbandon_amount__c) abAmount, sum(Amount__c) amount, sum(Inventory_Count__c) acAmount
                        From Consum_Inventory_Detail__c
                        Where Inventory_Header_Copy__c = : ih.Id
                        and Asset_Status__c != '已消耗明细'
                        group by Internal_Asset_Flg__c, Asset_Status__c];
                consumAssetMap = getInitData(consumAssetList, 'consum');*/
                // List<AggregateResult> consumAssetList = [
                //         Select Internal_Asset_Flg__c fix, Asset_Status__c status, sum(toAbandon_amount__c) abAmount, sum(Amount__c) amount, sum(Inventory_Count__c) acAmount
                //         From Consum_Inventory_Detail__c
                //         Where Inventory_Header_Copy__c = : ih.Id
                //         and Asset_Status__c != '已消耗明细'
                //         group by Internal_Asset_Flg__c, Asset_Status__c];
                // consumAssetMap = getInitData(consumAssetList, 'consum');
            }
            else{
                inventoryDetailList = Database.query(soqlAsset);
@@ -874,7 +879,7 @@
        Id[] usrArray = usrList[0].InventoryUser__c.split(',');
        inventoryUserList = [select id, name from user where id in :usrArray];

    }
    }*/

    /**
     * 获取初始化时页面显示的数据