buli
2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
<<<<<<< HEAD
trigger ConsumableOrderDetail2Trigger on Consumable_order_details2__c(after insert, after update, after delete) {
    Set<String> orderSet = new Set<String>();
 
    if (StaticParameter.EscapeOrderDetail2Trigger) {
        return;
    }
    if (Trigger.isInsert) {
        for (Consumable_order_details2__c local : Trigger.New) {
            if (local.Consumable_order_minor__c != null && local.Dealer_Returned__c == false)
                orderSet.add(local.Consumable_order_minor__c);
        }
    }
 
    if (Trigger.isUpdate) {
        for (Consumable_order_details2__c local : Trigger.New) {
            //if (local.Consumable_order_minor__c!=null &&
            //    local.Dealer_Arrive__c != Trigger.oldMap.get(local.Id).get('Dealer_Arrive__c'))
            if (local.Consumable_order_minor__c != null)
                orderSet.add(local.Consumable_order_minor__c);
        }
    }
 
    if (Trigger.isDelete) {
        for (Consumable_order_details2__c local : Trigger.old) {
            if (local.Consumable_order_minor__c != null)
                orderSet.add(local.Consumable_order_minor__c);
        }
    }
 
    if (orderSet.size() > 0) {
        // 2018年8月9日 HWAG-B3D9UV  替换 SQL start by 张玉山
        list<Consumable_order_details2__c> allresults = [
            SELECT Consumable_order_minor__c, Deliver_date__c, Dealer_Returned__c, Dealer_Arrive__c, RemoveBox_No__c, Cancellation_Date__c
            FROM Consumable_order_details2__c
            WHERE Consumable_order_minor__c IN :orderSet
        ];
        // 2018年8月9日 HWAG-B3D9UV  end by 张玉山
 
        // 2018年8月9日 HWAG-B3D9UV  替换下面原有SQL 使用 map 完成赋值 start by 张玉山
        map<string, Integer> orderSetResults = new Map<string, Integer>();
        for (Consumable_order_details2__c results1 : allresults) {
            if (
                results1.Dealer_Arrive__c == false ||
                results1.Dealer_Returned__c == true ||
                (results1.RemoveBox_No__c != null &&
                results1.RemoveBox_No__c != 1)
            ) {
=======
trigger ConsumableOrderDetail2Trigger on Consumable_order_details2__c (after insert, after update, after delete) {
    Set<String> orderSet = new Set<String>();
    
    if (StaticParameter.EscapeOrderDetail2Trigger) {
        return ;
    }
    if (trigger.isInsert){
        for (Consumable_order_details2__c local : Trigger.New) {         
            if (local.Consumable_order_minor__c!=null && 
                local.Dealer_Returned__c == false)
            orderSet.add(local.Consumable_order_minor__c);
        }
    }
 
    if (trigger.isUpdate){
        for (Consumable_order_details2__c local : Trigger.New) {         
            //if (local.Consumable_order_minor__c!=null &&
            //    local.Dealer_Arrive__c != Trigger.oldMap.get(local.Id).get('Dealer_Arrive__c'))
            if (local.Consumable_order_minor__c!=null) orderSet.add(local.Consumable_order_minor__c);
        }
    }
 
    if (trigger.isDelete){
        for (Consumable_order_details2__c local : Trigger.old) {
            if (local.Consumable_order_minor__c!=null) orderSet.add(local.Consumable_order_minor__c);
        }
    }
 
        
    if (orderSet.size()>0){
        // 2018年8月9日 HWAG-B3D9UV  替换 SQL start by 张玉山
        list<Consumable_order_details2__c> allresults = 
        [SELECT Consumable_order_minor__c, Deliver_date__c, 
            Dealer_Returned__c, Dealer_Arrive__c, RemoveBox_No__c,Cancellation_Date__c
            FROM Consumable_order_details2__c
             WHERE Consumable_order_minor__c in :orderSet ];
        // 2018年8月9日 HWAG-B3D9UV  end by 张玉山
        
        // 2018年8月9日 HWAG-B3D9UV  替换下面原有SQL 使用 map 完成赋值 start by 张玉山
        map<string,Integer> orderSetResults =  new map<string,Integer>();
        for(Consumable_order_details2__c results1 : allresults){
            if(results1.Dealer_Arrive__c == false || results1.Dealer_Returned__c== true
                || (results1.RemoveBox_No__c !=null &&  results1.RemoveBox_No__c !=1)){
>>>>>>> LEXCommunityLiJun
                continue;
            }
            string Consumable_order_minor_str = String.valueOf(results1.Consumable_order_minor__c);
 
<<<<<<< HEAD
            if (orderSetResults.containsKey(Consumable_order_minor_str)) {
                orderSetResults.put(Consumable_order_minor_str, orderSetResults.get(Consumable_order_minor_str) + 1);
            } else {
                orderSetResults.put(Consumable_order_minor_str, 1);
=======
            if(orderSetResults.containsKey(Consumable_order_minor_str)){
                orderSetResults.put(Consumable_order_minor_str,
                    orderSetResults.get(Consumable_order_minor_str)+1);
            }else{
                orderSetResults.put(Consumable_order_minor_str,1);
>>>>>>> LEXCommunityLiJun
            }
        }
 
        List<Consumable_Order__c> consumableOrderlist = new List<Consumable_Order__c>();
<<<<<<< HEAD
        for (String strOrder : orderSet) {
            Integer cnt = 0;
            for (string key : orderSetResults.keySet()) {
                if (key.equals(strOrder)) {
=======
        for (String strOrder:orderSet){
            Integer cnt =0;
            for (string key : orderSetResults.keySet()) {
                if(key.equals(strOrder)){
>>>>>>> LEXCommunityLiJun
                    cnt = orderSetResults.get(key);
                    break;
                }
            }
 
            Consumable_Order__c consumableOrder = new Consumable_Order__c();
            consumableOrder.Id = strOrder;
            consumableOrder.OrderNumber_arrived__c = cnt;
            consumableOrderlist.add(consumableOrder);
        }
        // 2018年8月9日 HWAG-B3D9UV 替换下面原有SQL 使用 map 完成赋值 end end by 张玉山
<<<<<<< HEAD
 
=======
        
>>>>>>> LEXCommunityLiJun
        /* 2018年8月9日 HWAG-B3D9UV  原有SQL 与赋值 start by 张玉山
        AggregateResult[] results = [SELECT Consumable_order_minor__c,count(Id) cnt 
                                     FROM Consumable_order_details2__c 
                                     WHERE Consumable_order_minor__c in :orderSet 
                                     AND Dealer_Arrive__c = true 
                                     AND Dealer_Returned__c= false 
                                     AND (RemoveBox_No__c=null or RemoveBox_No__c=1)
                                     group by Consumable_order_minor__c];
 
        List<Consumable_Order__c> consumableOrderlist = new List<Consumable_Order__c>();
        for (String strOrder:orderSet){
            Integer cnt =0;
            for(AggregateResult ar: results){
                 if(String.valueOf(ar.get('Consumable_order_minor__c')) == strOrder){
                    cnt = Integer.valueOf(ar.get('cnt'));
                    break;
                 }
            }
            Consumable_Order__c consumableOrder = new Consumable_Order__c();
            consumableOrder.Id = strOrder;
            consumableOrder.OrderNumber_arrived__c = cnt;
            consumableOrderlist.add(consumableOrder);
        }
        2018年8月9日 HWAG-B3D9UV  原有SQL 与赋值 end by 张玉山
        */
<<<<<<< HEAD
        if (consumableOrderlist.size() > 0) {
            update consumableOrderlist;
=======
        if (consumableOrderlist.size() > 0){
           update consumableOrderlist;
>>>>>>> LEXCommunityLiJun
        }
 
        //更新消耗品订单的发货日期
        // 2018年8月9日 HWAG-B3D9UV  替换下面原有SQL 使用 map 完成赋值  start by 张玉山
<<<<<<< HEAD
        Set<string> resultsKeySet = new Set<String>();
        map<string, Date> DeliverdateResults = new Map<string, Date>(); //最新发货时间
        map<string, Date> DeliverdateminResults = new Map<string, Date>(); //最早发货时间
        for (Consumable_order_details2__c results1 : allresults) {
            if (results1.Dealer_Arrive__c == true || results1.Dealer_Returned__c == true) {
                continue;
            }
            string Consumable_order_minor_str = String.valueOf(results1.Consumable_order_minor__c);
            if (DeliverdateResults.containsKey(Consumable_order_minor_str)) {
                if (DeliverdateResults.get(Consumable_order_minor_str) < results1.Deliver_date__c) {
                    DeliverdateResults.put(Consumable_order_minor_str, results1.Deliver_date__c);
                    resultsKeySet.add(Consumable_order_minor_str);
                }
            } else {
                DeliverdateResults.put(Consumable_order_minor_str, results1.Deliver_date__c);
                resultsKeySet.add(Consumable_order_minor_str);
            }
            //获取最早发货时间 pk part1 start
            if (DeliverdateminResults.containsKey(Consumable_order_minor_str)) {
                if (DeliverdateminResults.get(Consumable_order_minor_str) > results1.Deliver_date__c) {
                    DeliverdateminResults.put(Consumable_order_minor_str, results1.Deliver_date__c);
                    resultsKeySet.add(Consumable_order_minor_str);
                }
            } else {
                DeliverdateminResults.put(Consumable_order_minor_str, results1.Deliver_date__c);
=======
        Set<string> resultsKeySet =  new Set<String>();
        map<string,Date> DeliverdateResults =  new map<string,Date>();//最新发货时间
        map<string,Date> DeliverdateminResults =  new map<string,Date>();//最早发货时间
        for(Consumable_order_details2__c results1 : allresults){
            if(results1.Dealer_Arrive__c == true || results1.Dealer_Returned__c== true){
                continue;
            }
            string Consumable_order_minor_str = String.valueOf(results1.Consumable_order_minor__c);
            if(DeliverdateResults.containsKey(Consumable_order_minor_str)){
                if(DeliverdateResults.get(Consumable_order_minor_str)
                    < results1.Deliver_date__c
                    ){
                    DeliverdateResults.put(Consumable_order_minor_str,results1.Deliver_date__c);
                    resultsKeySet.add(Consumable_order_minor_str);
                }
            }else{
                DeliverdateResults.put(Consumable_order_minor_str,results1.Deliver_date__c);
                resultsKeySet.add(Consumable_order_minor_str);
            }
            //获取最早发货时间 pk part1 start
            if(DeliverdateminResults.containsKey(Consumable_order_minor_str)){
                if(DeliverdateminResults.get(Consumable_order_minor_str)
                    > results1.Deliver_date__c
                    ){
                    DeliverdateminResults.put(Consumable_order_minor_str,results1.Deliver_date__c);
                    resultsKeySet.add(Consumable_order_minor_str);
                }
            }else{
                DeliverdateminResults.put(Consumable_order_minor_str,results1.Deliver_date__c);
>>>>>>> LEXCommunityLiJun
                resultsKeySet.add(Consumable_order_minor_str);
            }
            //获取最早发货时间 pk part1 end
        }
<<<<<<< HEAD
 
        //两个DeliverdateResults.keySet(),DeliverdateminResults.keySet() 合并作为一个List ,遍历List
        //获取最早发货时间 pk part2 start
        consumableOrderlist = new List<Consumable_Order__c>();
        for (string temp : resultsKeySet) {
            Consumable_Order__c consumableOrder1 = new Consumable_Order__c();
            consumableOrder1.Id = temp;
            if (DeliverdateResults.get(temp) != null) {
                consumableOrder1.Shipment_Date__c = DeliverdateResults.get(temp);
            }
            if (DeliverdateminResults.get(temp) != null) {
                consumableOrder1.First_Delivery__c = DeliverdateResults.get(temp);
            }
            consumableOrderlist.add(consumableOrder1);
        }
 
        //获取最早发货时间 pk part2 end
        // List<Consumable_Order__c> consumableOrderminlist = new List<Consumable_Order__c>();//最早发货时间
        // for (string key : DeliverdateminResults.keySet()) {
        //    if(DeliverdateminResults.get(key)!=null){
        //         Consumable_Order__c consumableOrder1 = new Consumable_Order__c();
        //         consumableOrder1.Id = key;
        //         consumableOrder1.First_Delivery__c = DeliverdateResults.get(key);
        //         consumableOrderminlist.add(consumableOrder1);
        //     }
        // }
 
        // 2018年8月9日 HWAG-B3D9UV  替换下面原有SQL 使用 map 完成赋值  end by 张玉山
 
        //获取早发货日期 start
        // system.debug('DeliverdateResults==============' + DeliverdateResults);
        // system.debug('走到最早发货日期');
        // map<string,Date> DeliverdateminResults =  new map<string,Date>();
        // for(Consumable_order_details2__c results1 : allresults){
        //     if(results1.Dealer_Arrive__c == true || results1.Dealer_Returned__c== true){
        //         continue;
        //     }
        //     string Consumable_order_minor_str = String.valueOf(results1.Consumable_order_minor__c);
        //     if(DeliverdateminResults.containsKey(Consumable_order_minor_str)){
        //         if(DeliverdateminResults.get(Consumable_order_minor_str)
        //             > results1.Deliver_date__c
        //             ){
        //                 DeliverdateminResults.put(Consumable_order_minor_str,results1.Deliver_date__c);
        //         }
 
        //     }else{
        //         DeliverdateminResults.put(Consumable_order_minor_str,results1.Deliver_date__c);
        //     }
        // }
        // List<Consumable_Order__c> consumableOrderminlist = new List<Consumable_Order__c>();
        // for (string key : DeliverdateminResults.keySet()) {
        //    if(DeliverdateminResults.get(key)!=null){
        //         Consumable_Order__c consumableOrder1 = new Consumable_Order__c();
        //         consumableOrder1.Id = key;
        //         consumableOrder1.First_Delivery__c = DeliverdateResults.get(key);
        //         consumableOrderminlist.add(consumableOrder1);
        //     }
        // }
 
        // if(consumableOrderminlist.size() > 0){
        //     update consumableOrderminlist;
        // }
        // system.debug('DeliverdateResults==============' + DeliverdateResults);
        // //获取最早发货日期 end
 
=======
        
        //两个DeliverdateResults.keySet(),DeliverdateminResults.keySet() 合并作为一个List ,遍历List
        //获取最早发货时间 pk part2 start
        consumableOrderlist = new List<Consumable_Order__c>();
        for(string temp : resultsKeySet){
            Consumable_Order__c consumableOrder1 = new Consumable_Order__c();
            consumableOrder1.Id = temp;
            if(DeliverdateResults.get(temp)!=null){
                consumableOrder1.Shipment_Date__c = DeliverdateResults.get(temp);
            }
            if(DeliverdateminResults.get(temp)!=null){
                consumableOrder1.First_Delivery__c = DeliverdateResults.get(temp);
            }
            consumableOrderlist.add(consumableOrder1);
        }
        
        //获取最早发货时间 pk part2 end
        // List<Consumable_Order__c> consumableOrderminlist = new List<Consumable_Order__c>();//最早发货时间
        // for (string key : DeliverdateminResults.keySet()) {
        //    if(DeliverdateminResults.get(key)!=null){
        //         Consumable_Order__c consumableOrder1 = new Consumable_Order__c();
        //         consumableOrder1.Id = key;
        //         consumableOrder1.First_Delivery__c = DeliverdateResults.get(key);
        //         consumableOrderminlist.add(consumableOrder1);
        //     }
        // }
        
        // 2018年8月9日 HWAG-B3D9UV  替换下面原有SQL 使用 map 完成赋值  end by 张玉山
        
        //获取早发货日期 start
        // system.debug('DeliverdateResults==============' + DeliverdateResults);
        // system.debug('走到最早发货日期');
        // map<string,Date> DeliverdateminResults =  new map<string,Date>();
        // for(Consumable_order_details2__c results1 : allresults){
        //     if(results1.Dealer_Arrive__c == true || results1.Dealer_Returned__c== true){
        //         continue;
        //     }
        //     string Consumable_order_minor_str = String.valueOf(results1.Consumable_order_minor__c);
        //     if(DeliverdateminResults.containsKey(Consumable_order_minor_str)){
        //         if(DeliverdateminResults.get(Consumable_order_minor_str)
        //             > results1.Deliver_date__c
        //             ){
        //                 DeliverdateminResults.put(Consumable_order_minor_str,results1.Deliver_date__c);
        //         }
 
        //     }else{
        //         DeliverdateminResults.put(Consumable_order_minor_str,results1.Deliver_date__c);
        //     }
        // }
        // List<Consumable_Order__c> consumableOrderminlist = new List<Consumable_Order__c>();
        // for (string key : DeliverdateminResults.keySet()) {
        //    if(DeliverdateminResults.get(key)!=null){
        //         Consumable_Order__c consumableOrder1 = new Consumable_Order__c();
        //         consumableOrder1.Id = key;
        //         consumableOrder1.First_Delivery__c = DeliverdateResults.get(key);
        //         consumableOrderminlist.add(consumableOrder1);
        //     }
        // }
 
        // if(consumableOrderminlist.size() > 0){
        //     update consumableOrderminlist; 
        // }
        // system.debug('DeliverdateResults==============' + DeliverdateResults);
        // //获取最早发货日期 end
 
>>>>>>> LEXCommunityLiJun
        /* 2018年8月9日 HWAG-B3D9UV  原有SQL 与赋值 start by 张玉山
        AggregateResult[] results1 = [SELECT Consumable_order_minor__c,max(Deliver_date__c) Deliver_date__c
                                      FROM Consumable_order_details2__c 
                                      WHERE Consumable_order_minor__c in :orderSet 
                                      AND Dealer_Arrive__c = false 
                                      AND Dealer_Returned__c= false 
                                      group by Consumable_order_minor__c];
 
        consumableOrderlist = new List<Consumable_Order__c>();
        for(AggregateResult ar: results1){
            if (ar.get('Deliver_date__c')!=null){
                Consumable_Order__c consumableOrder1 = new Consumable_Order__c();
                consumableOrder1.Id =String.valueOf(ar.get('Consumable_order_minor__c'));
                consumableOrder1.Shipment_Date__c = Date.valueOf(ar.get('Deliver_date__c'));
                consumableOrderlist.add(consumableOrder1);
            }
        }
        2018年8月9日 HWAG-B3D9UV  原有SQL 与赋值 end by 张玉山 */
<<<<<<< HEAD
        if (consumableOrderlist.size() > 0) {
            update consumableOrderlist;
        }
 
        //更新待确认收货数量
        // 2018年8月9日 HWAG-B3D9UV  替换下面原有SQL 使用 map 完成赋值  start by 张玉山
        map<string, Integer> resultsMap2 = new Map<string, Integer>();
        for (Consumable_order_details2__c results1 : allresults) {
            if (results1.Dealer_Arrive__c == true || results1.Dealer_Returned__c == true || results1.Cancellation_Date__c != null) {
                continue;
            }
            string Consumable_order_minor_str = String.valueOf(results1.Consumable_order_minor__c);
            if (resultsMap2.containsKey(Consumable_order_minor_str)) {
                resultsMap2.put(Consumable_order_minor_str, resultsMap2.get(Consumable_order_minor_str) + 1);
            } else {
                resultsMap2.put(Consumable_order_minor_str, 1);
            }
        }
        consumableOrderlist = new List<Consumable_Order__c>();
        for (String strOrder : orderSet) {
            Integer cnt = 0;
            for (string key : resultsMap2.keySet()) {
                if (key.equals(strOrder)) {
                    cnt = resultsMap2.get(key);
                    break;
                }
            }
 
            Consumable_Order__c consumableOrder2 = new Consumable_Order__c();
            consumableOrder2.Id = strOrder;
            consumableOrder2.Delivery_detail_count__c = cnt;
            if (consumableOrder2.Delivery_detail_count__c == 0) {
                consumableOrder2.More_than_seven_days__c = 0;
            }
            consumableOrderlist.add(consumableOrder2);
        }
 
        // 2018年8月9日 HWAG-B3D9UV  替换下面原有SQL 使用 map 完成赋值  end by 张玉山
 
=======
        if (consumableOrderlist.size() > 0){
           update consumableOrderlist;
        }
        
        //更新待确认收货数量
        // 2018年8月9日 HWAG-B3D9UV  替换下面原有SQL 使用 map 完成赋值  start by 张玉山
        map<string,Integer> resultsMap2 =  new map<string,Integer>();
        for(Consumable_order_details2__c results1 : allresults){
            if(results1.Dealer_Arrive__c == true || results1.Dealer_Returned__c== true ||
                results1.Cancellation_Date__c!=null){
                continue;
            }
            string Consumable_order_minor_str = String.valueOf(results1.Consumable_order_minor__c);
            if(resultsMap2.containsKey(Consumable_order_minor_str)){
                    resultsMap2.put(Consumable_order_minor_str,
                        resultsMap2.get(Consumable_order_minor_str)+1);
            }else{
                resultsMap2.put(Consumable_order_minor_str,1);
            }
        }
        consumableOrderlist = new List<Consumable_Order__c>();
        for (String strOrder:orderSet){
            Integer cnt =0;
            for (string key : resultsMap2.keySet()) {
                if(key.equals(strOrder)){
                    cnt = resultsMap2.get(key);
                    break;
                }
            }
 
            Consumable_Order__c consumableOrder2 = new Consumable_Order__c();
            consumableOrder2.Id = strOrder;
            consumableOrder2.Delivery_detail_count__c = cnt;
            if(consumableOrder2.Delivery_detail_count__c == 0){consumableOrder2.More_than_seven_days__c = 0;}
            consumableOrderlist.add(consumableOrder2);
        }
 
        // 2018年8月9日 HWAG-B3D9UV  替换下面原有SQL 使用 map 完成赋值  end by 张玉山
    
>>>>>>> LEXCommunityLiJun
        /* 2018年8月9日 HWAG-B3D9UV  原有SQL 与赋值 start by 张玉山
        AggregateResult[] results2 = [SELECT Consumable_order_minor__c,count(Id) cnt 
                                      FROM Consumable_order_details2__c 
                                      WHERE Consumable_order_minor__c in :orderSet 
                                      AND Dealer_Arrive__c = false
                                      AND Dealer_Returned__c= false
                                      AND Cancellation_Date__c = null  
                                      group by Consumable_order_minor__c];
 
        consumableOrderlist = new List<Consumable_Order__c>();
        for (String strOrder:orderSet){
            Integer cnt =0;
            for(AggregateResult ar: results2){
                 if(String.valueOf(ar.get('Consumable_order_minor__c')) == strOrder){
                    cnt = Integer.valueOf(ar.get('cnt'));
                    break;
                 }
            }
            Consumable_Order__c consumableOrder2 = new Consumable_Order__c();
            consumableOrder2.Id = strOrder;
            consumableOrder2.Delivery_detail_count__c = cnt;
            consumableOrderlist.add(consumableOrder2);
        }
        2018年8月9日 HWAG-B3D9UV  原有SQL 与赋值 end by 张玉山 */
<<<<<<< HEAD
        if (consumableOrderlist.size() > 0) {
            update consumableOrderlist;
        }
    }
    //Back up by DTT - Li Jun 2023-06-14 Start for reduce soql times
    // 2018年8月9日 HWAG-B3D9UV  获取所有的record ID start by 张玉山
    //List<RecordType> allrtList = [select Id,DeveloperName from RecordType where SobjectType = 'Consumable_orderdetails__c'];
    // 2018年8月9日 HWAG-B3D9UV  获取所有的record ID end by 张玉山
    //Back up by DTT - Li Jun 2023-06-14 Start
    //到货和返品时,生成或修改消费品订货明细
    Set<String> arrivedSet = new Set<String>();
    Set<String> returnSet = new Set<String>();
    if (Trigger.isUpdate || Trigger.isInsert || Trigger.isDelete) {
        if (Trigger.isUpdate || Trigger.isInsert) {
            for (Consumable_order_details2__c detail2 : Trigger.New) {
                Consumable_order_details2__c oldDetail2 = null;
                if (Trigger.isUpdate)
                    oldDetail2 = Trigger.oldMap.get(detail2.Id);
                if (detail2.Consumable_Arrived_order__c != null) {
                    arrivedSet.add(detail2.Consumable_Arrived_order__c);
                }
 
                if ((oldDetail2 == null || oldDetail2.Consumable_Return_order__c == null) && detail2.Consumable_Return_order__c != null) {
                    returnSet.add(detail2.Consumable_Return_order__c);
                }
            }
        }
        if (Trigger.isDelete) {
            for (Consumable_order_details2__c det2 : Trigger.old) {
                if (det2.Consumable_Arrived_order__c != null) {
                    arrivedSet.add(det2.Consumable_Arrived_order__c);
                }
 
                if (det2.Consumable_Return_order__c != null) {
                    returnSet.add(det2.Consumable_Return_order__c);
                }
            }
        }
        System.debug('arrivedSet +++++' + arrivedSet);
        // 2018年8月14日 HWAG-B3D9UV 在进行NFM110处理时 跳过arrivedset  start by 张玉山
        if (StaticParameter.EscapeConsumableOrderDetail2Trigger) {
            return;
        }
        // 2018年8月14日 HWAG-B3D9UV 在进行NFM110处理时 跳过arrivedset  start by 张玉山
        if (arrivedSet.size() > 0) {
            Map<Id, Consumable_order__c> arrivedMap = new Map<Id, Consumable_order__c>(
                [
                    SELECT Id, RecordType.DeveloperName, Name
                    FROM Consumable_order__c
                    WHERE Id IN :arrivedSet
                ]
            );
            List<Consumable_orderdetails__c> detail1List = [
                SELECT Id, Name, Asset_Model_No__c, Consumable_count__c, Consumable_order__c
                FROM Consumable_orderdetails__c
                WHERE Consumable_order__c IN :arrivedSet
            ];
            Map<String, Consumable_orderdetails__c> detail1Map = new Map<String, Consumable_orderdetails__c>();
            for (Consumable_orderdetails__c detail1 : detail1List) {
                String key = '' + detail1.Consumable_order__c + detail1.Asset_Model_No__c;
                detail1Map.put(key, detail1);
            }
 
            arrivedSet.clear();
            for (Consumable_order__c arrivedCo : arrivedMap.values()) {
                if (arrivedCo.RecordType.DeveloperName == 'Arrive') {
                    arrivedSet.add(arrivedCo.Id);
                }
            }
 
            AggregateResult[] results = [
                SELECT Consumable_Arrived_order__c, Asset_Model_No__c, count(bar_code__c) recordCount
                FROM Consumable_order_details2__c
                WHERE
                    Consumable_Arrived_order__c IN :arrivedSet
                    AND Dealer_Arrive__c = TRUE
                    //and Dealer_Returned__c <> true
                    AND (RemoveBox_No__c = NULL
                    OR RemoveBox_No__c = 1)
                GROUP BY Consumable_Arrived_order__c, Asset_Model_No__c
            ];
            Map<String, Integer> keyCount = new Map<String, Integer>();
 
            for (AggregateResult ar : results) {
                String key = '' + ar.get('Consumable_Arrived_order__c') + ar.get('Asset_Model_No__c');
                keyCount.put(key, Integer.valueOf(ar.get('recordCount')));
            }
            //Back up by DTT - Li Jun 2023-06-14 Start
            // 2018年8月9日 HWAG-B3D9UV  替代下面SQL select start by 张玉山
            // List<RecordType> rtList = new List<RecordType>();
            // for(RecordType rtl : allrtList){
            //     if('Detail1_Arrival'.equals(rtl.DeveloperName)){
            //         rtList.add(rtl);
            //     }
            // }
            // 2018年8月9日 HWAG-B3D9UV  替代下面SQL select end by 张玉山
            //Back up by DTT - Li Jun 2023-06-14 End
 
=======
        if (consumableOrderlist.size() > 0){
           update consumableOrderlist;
        }
    }
    //Back up by DTT - Li Jun 2023-06-14 Start for reduce soql times
    // 2018年8月9日 HWAG-B3D9UV  获取所有的record ID start by 张玉山
    //List<RecordType> allrtList = [select Id,DeveloperName from RecordType where SobjectType = 'Consumable_orderdetails__c'];
    // 2018年8月9日 HWAG-B3D9UV  获取所有的record ID end by 张玉山
    //Back up by DTT - Li Jun 2023-06-14 Start
    //到货和返品时,生成或修改消费品订货明细
    Set<String> arrivedSet = new Set<String>();
    Set<String> returnSet = new Set<String>();
    if (trigger.isUpdate || trigger.isInsert || trigger.isDelete){
        if (trigger.isUpdate || trigger.isInsert){
            for (Consumable_order_details2__c detail2 : Trigger.New) {
                Consumable_order_details2__c oldDetail2 = null;
                if (Trigger.isUpdate) oldDetail2 = Trigger.oldMap.get(detail2.Id);
                if (detail2.Consumable_Arrived_order__c != null) {
                    arrivedSet.add(detail2.Consumable_Arrived_order__c);
                }
 
                if ((oldDetail2 == null || oldDetail2.Consumable_Return_order__c == null) && detail2.Consumable_Return_order__c != null) {
                    returnSet.add(detail2.Consumable_Return_order__c);
                }
            }
        }
        if (trigger.isDelete){
            for (Consumable_order_details2__c det2 : Trigger.old) {                            
                if (det2.Consumable_Arrived_order__c != null) {
                    arrivedSet.add(det2.Consumable_Arrived_order__c);
                }
 
                if (det2.Consumable_Return_order__c != null) {
                    returnSet.add(det2.Consumable_Return_order__c);
                }
            }
        }
        System.debug('arrivedSet +++++' + arrivedSet);
    // 2018年8月14日 HWAG-B3D9UV 在进行NFM110处理时 跳过arrivedset  start by 张玉山
        if (StaticParameter.EscapeConsumableOrderDetail2Trigger) {
        return ;
        }
    // 2018年8月14日 HWAG-B3D9UV 在进行NFM110处理时 跳过arrivedset  start by 张玉山
        if (arrivedSet.size() > 0) {
            Map<Id, Consumable_order__c> arrivedMap = new Map<Id, Consumable_order__c>([select Id, RecordType.DeveloperName, Name from Consumable_order__c where Id in :arrivedSet]);
            List<Consumable_orderdetails__c> detail1List = [select Id, Name, Asset_Model_No__c, Consumable_count__c, Consumable_order__c from Consumable_orderdetails__c where Consumable_order__c in :arrivedSet];
            Map<String,Consumable_orderdetails__c> detail1Map = new Map<String,Consumable_orderdetails__c>();
            for (Consumable_orderdetails__c detail1 : detail1List) {
                String key = '' + detail1.Consumable_order__c + detail1.Asset_Model_No__c;
                detail1Map.put(key, detail1);
            }
 
            arrivedSet.clear();
            for (Consumable_order__c arrivedCo : arrivedMap.values()) {
                if (arrivedCo.RecordType.DeveloperName == 'Arrive') {
                    arrivedSet.add(arrivedCo.Id);
                }
            }
 
            AggregateResult[] results = [select Consumable_Arrived_order__c, Asset_Model_No__c, count(bar_code__c) recordCount 
                                         from Consumable_order_details2__c 
                                         where Consumable_Arrived_order__c in :arrivedSet 
                                         and Dealer_Arrive__c = true
                                         //and Dealer_Returned__c <> true
                                         AND (RemoveBox_No__c=null or RemoveBox_No__c=1) 
                                         group by Consumable_Arrived_order__c, Asset_Model_No__c];
            Map<String, Integer> keyCount = new Map<String, Integer>();
            
            for(AggregateResult ar: results){               
                String key = '' + ar.get('Consumable_Arrived_order__c') + ar.get('Asset_Model_No__c');
                keyCount.put(key, Integer.valueOf(ar.get('recordCount')));
            }
            //Back up by DTT - Li Jun 2023-06-14 Start
            // 2018年8月9日 HWAG-B3D9UV  替代下面SQL select start by 张玉山           
            // List<RecordType> rtList = new List<RecordType>();
            // for(RecordType rtl : allrtList){
            //     if('Detail1_Arrival'.equals(rtl.DeveloperName)){
            //         rtList.add(rtl);
            //     }
            // }
            // 2018年8月9日 HWAG-B3D9UV  替代下面SQL select end by 张玉山
            //Back up by DTT - Li Jun 2023-06-14 End          
 
>>>>>>> LEXCommunityLiJun
            /* 2018年8月9日 HWAG-B3D9UV  原获取 recordtype start by 张玉山
            List<RecordType> rtList = [select Id from RecordType where DeveloperName = 'Detail1_Arrival' and SobjectType = 'Consumable_orderdetails__c'];
             2018年8月9日 HWAG-B3D9UV  原获取 recordtype end by 张玉山 */
            //Back up by DTT - Li Jun 2023-06-14 Start
            // Id recordTypeId = null;
            // if (rtList.size() > 0) recordTypeId = rtList[0].Id;
<<<<<<< HEAD
            //Back up by DTT - Li Jun 2023-06-14 End
            Id recordtypeId = Schema.SObjectType.Consumable_Orderdetails__c.getRecordTypeInfosByDeveloperName()
                .get('Detail1_Arrival')
                .getRecordTypeId();
            results = [
                SELECT Consumable_order__c, count(Id) noCount
                FROM Consumable_orderdetails__c
                WHERE Consumable_order__c IN :arrivedSet
                GROUP BY Consumable_order__c
            ];
            System.debug('results +++++' + results);
            Map<Id, Integer> noCount = new Map<Id, Integer>();
            for (AggregateResult ar : results) {
                noCount.put((Id) ar.get('Consumable_order__c'), Integer.valueOf(ar.get('noCount')));
=======
            //Back up by DTT - Li Jun 2023-06-14 End            
            Id recordtypeId = Schema.SObjectType.Consumable_Orderdetails__c.getRecordTypeInfosByDeveloperName().get('Detail1_Arrival').getRecordTypeId();
            results = [select Consumable_order__c, count(Id) noCount 
                       from Consumable_orderdetails__c 
                       where Consumable_order__c in :arrivedSet 
                       group by Consumable_order__c];
            System.debug('results +++++' + results);
            Map<Id, Integer> noCount = new Map<Id, Integer>();
            for(AggregateResult ar: results){
                noCount.put((Id)ar.get('Consumable_order__c'), Integer.valueOf(ar.get('noCount')));
>>>>>>> LEXCommunityLiJun
            }
            System.debug('noCount +++++' + noCount);
            Map<String, Consumable_orderdetails__c> upsertMap = new Map<String, Consumable_orderdetails__c>();
            Map<String, Consumable_orderdetails__c> deletetMap = new Map<String, Consumable_orderdetails__c>();
            Map<String, String> assetModelNoMap = new Map<String, String>();
<<<<<<< HEAD
            if (Trigger.isUpdate || Trigger.isInsert) {
                for (Consumable_order_details2__c detail2 : Trigger.New) {
                    //Dataloaderで初期在庫登録をしたあと、データ修正が入ったときに明細1が更新されない。
                    //if (trigger.isUpdate && detail2.ManualRegisteredStock__c == true) continue;
                    if (detail2.Consumable_Arrived_order__c == null)
                        continue;
=======
            if (trigger.isUpdate || trigger.isInsert){
                for (Consumable_order_details2__c detail2 : Trigger.New) {  
                    //Dataloaderで初期在庫登録をしたあと、データ修正が入ったときに明細1が更新されない。
                    //if (trigger.isUpdate && detail2.ManualRegisteredStock__c == true) continue;                  
                    if (detail2.Consumable_Arrived_order__c == null) continue;
>>>>>>> LEXCommunityLiJun
                    String key = '' + detail2.Consumable_Arrived_order__c + detail2.Asset_Model_No__c;
                    //if (upsertMap.get(key) != null) continue;
                    Integer count = keyCount.get(key);
                    Consumable_orderdetails__c detail1 = detail1Map.get(key);
 
<<<<<<< HEAD
                    if (detail1 == null)
                        detail1 = new Consumable_orderdetails__c();
=======
                    if (detail1 == null) detail1 = new Consumable_orderdetails__c();
>>>>>>> LEXCommunityLiJun
                    detail1.Consumable_Arrivecount__c = count;
                    if (detail1.Id == null) {
                        Consumable_order__c co = arrivedMap.get(detail2.Consumable_Arrived_order__c);
                        Integer index = noCount.get(co.Id);
<<<<<<< HEAD
                        if (index == null)
                            index = 0;
                        if (assetModelNoMap.containsKey(detail2.Asset_Model_No__c)) {
                            continue;
                        } else {
=======
                        if (index == null) index = 0;
                        if(assetModelNoMap.containsKey(detail2.Asset_Model_No__c)){
                            continue;
                        }else{
>>>>>>> LEXCommunityLiJun
                            assetModelNoMap.put(detail2.Asset_Model_No__c, detail2.Asset_Model_No__c);
                            noCount.put(co.Id, index + 1);
                        }
                        noCount.put(co.Id, index + 1);
<<<<<<< HEAD
                        String newName = co.Name + '-';
=======
                        String newName = co.Name+'-';
>>>>>>> LEXCommunityLiJun
                        System.debug('index +++++' + index);
                        if (index < 99) {
                            newName += '0';
                        }
                        if (index < 9) {
                            newName += '0';
                        }
                        newName += String.valueOf(index + 1);
                        System.debug('newName +++++' + newName);
                        detail1.Name = newName;
                        //detail1.Asset_Model_No__c = detail2.Asset_Model_No__c;
                        detail1.Consumable_product__c = detail2.Consumable_product__c;
                        detail1.Consumable_order__c = co.Id;
                        detail1.RecordTypeId = recordTypeId;
                        //detail1.Consumable_principal__c = co.Id;
                        detail1.Intra_Trade_List_RMB__c = detail2.Intra_Trade_List_RMB__c;
<<<<<<< HEAD
=======
                        
>>>>>>> LEXCommunityLiJun
                    }
                    upsertMap.put(key, detail1);
                }
            }
 
<<<<<<< HEAD
            if (Trigger.isUpdate) {
                for (Consumable_order_details2__c detail2 : Trigger.old) {
                    //Dataloaderで初期在庫登録をしたあと、データ修正が入ったときに明細1が更新されない。
                    //if (detail2.ManualRegisteredStock__c == true) continue;
                    if (detail2.Consumable_Arrived_order__c == null)
                        continue;
                    String key = '' + detail2.Consumable_Arrived_order__c + detail2.Asset_Model_No__c;
                    //if (upsertMap.get(key) != null) continue;
                    Integer count = keyCount.get(key);
                    Consumable_orderdetails__c detail1 = detail1Map.get(key);
                    if ((count == null || count == 0) && detail1 != null) {
                        //delete detail1;
                        deletetMap.put(key, detail1);
                        continue;
                    }
                    if (detail1 == null)
                        continue;
                    detail1.Consumable_Arrivecount__c = count;
 
                    if (detail1.Id == null) {
                        Consumable_order__c co = arrivedMap.get(detail2.Consumable_Arrived_order__c);
                        Integer index = noCount.get(co.Id);
                        if (index == null)
                            index = 0;
                        System.debug('indexUp +++++' + index);
                        noCount.put(co.Id, index + 1);
                        System.debug('noCountUp +++++' + noCount);
                        String newName = co.Name + '-';
                        if (index < 99) {
                            newName += '0';
                        }
                        if (index < 9) {
                            newName += '0';
                        }
                        newName += String.valueOf(index + 1);
                        System.debug('newNameUp +++++' + newName);
                        detail1.Name = newName;
                        //detail1.Asset_Model_No__c = detail2.Asset_Model_No__c;
                        detail1.Consumable_product__c = detail2.Consumable_product__c;
                        detail1.Consumable_order__c = co.Id;
                        detail1.RecordTypeId = recordTypeId;
                        //detail1.Consumable_principal__c = co.Id;
                        detail1.Intra_Trade_List_RMB__c = detail2.Intra_Trade_List_RMB__c;
=======
            if (trigger.isUpdate){               
                for (Consumable_order_details2__c detail2 : Trigger.old) { 
                    //Dataloaderで初期在庫登録をしたあと、データ修正が入ったときに明細1が更新されない。  
                    //if (detail2.ManualRegisteredStock__c == true) continue;                  
                    if (detail2.Consumable_Arrived_order__c == null) continue;
                    String key = '' + detail2.Consumable_Arrived_order__c + detail2.Asset_Model_No__c;                    
                    //if (upsertMap.get(key) != null) continue;
                    Integer count = keyCount.get(key);               
                    Consumable_orderdetails__c detail1 = detail1Map.get(key);
                    if ((count == null || count ==0) && detail1 !=null){                      
                        //delete detail1;
                        deletetMap.put(key,detail1);
                        continue;
                    }
                    if (detail1 == null) continue;
                    detail1.Consumable_Arrivecount__c = count;
 
                    if (detail1.Id == null) {
                            Consumable_order__c co = arrivedMap.get(detail2.Consumable_Arrived_order__c);
                            Integer index = noCount.get(co.Id);
                            if (index == null) index = 0;
                            System.debug('indexUp +++++' + index);
                            noCount.put(co.Id, index + 1);
                            System.debug('noCountUp +++++' + noCount);
                            String newName = co.Name+'-';
                            if (index < 99) {
                                newName += '0';
                            }
                            if (index < 9) {
                                newName += '0';
                            }
                            newName += String.valueOf(index + 1);
                            System.debug('newNameUp +++++' + newName);
                            detail1.Name = newName;
                            //detail1.Asset_Model_No__c = detail2.Asset_Model_No__c;
                            detail1.Consumable_product__c = detail2.Consumable_product__c;
                            detail1.Consumable_order__c = co.Id;
                            detail1.RecordTypeId = recordTypeId;
                            //detail1.Consumable_principal__c = co.Id;
                            detail1.Intra_Trade_List_RMB__c = detail2.Intra_Trade_List_RMB__c;
                        
                        
>>>>>>> LEXCommunityLiJun
                    }
                    upsertMap.put(key, detail1);
                }
            }
 
<<<<<<< HEAD
            if (Trigger.isDelete) {
                for (Consumable_order_details2__c detail2 : Trigger.old) {
                    if (detail2.Consumable_Arrived_order__c == null)
                        continue;
=======
            if (trigger.isDelete){
                for (Consumable_order_details2__c detail2 : Trigger.old) {
                    if (detail2.Consumable_Arrived_order__c == null) continue;
>>>>>>> LEXCommunityLiJun
                    String key = '' + detail2.Consumable_Arrived_order__c + detail2.Asset_Model_No__c;
                    //if (upsertMap.get(key) != null) continue;
                    Integer count = keyCount.get(key);
                    Consumable_orderdetails__c detail1 = detail1Map.get(key);
<<<<<<< HEAD
                    if ((count == null || count == 0) && detail1 != null) {
                        //delete detail1;
                        deletetMap.put(key, detail1);
                        continue;
                    }
                    if (detail1 == null)
                        detail1 = new Consumable_orderdetails__c();
=======
                    if ((count == null || count ==0) && detail1 !=null){                      
                        //delete detail1;
                        deletetMap.put(key,detail1);
                        continue;
                    }
                    if (detail1 == null) detail1 = new Consumable_orderdetails__c();
>>>>>>> LEXCommunityLiJun
                    detail1.Consumable_Arrivecount__c = count;
 
                    if (detail1.Id == null) {
                        Consumable_order__c co = arrivedMap.get(detail2.Consumable_Arrived_order__c);
                        Integer index = noCount.get(co.Id);
<<<<<<< HEAD
                        if (index == null)
                            index = 0;
                        noCount.put(co.Id, index + 1);
                        String newName = co.Name + '-';
=======
                        if (index == null) index = 0;
                        noCount.put(co.Id, index + 1);
                        String newName = co.Name+'-';
>>>>>>> LEXCommunityLiJun
                        if (index < 99) {
                            newName += '0';
                        }
                        if (index < 9) {
                            newName += '0';
                        }
                        newName += String.valueOf(index + 1);
                        detail1.Name = newName;
                        //detail1.Asset_Model_No__c = detail2.Asset_Model_No__c;
                        detail1.Consumable_product__c = detail2.Consumable_product__c;
                        detail1.Consumable_order__c = co.Id;
                        detail1.RecordTypeId = recordTypeId;
                        //detail1.Consumable_principal__c = co.Id;
                        detail1.Intra_Trade_List_RMB__c = detail2.Intra_Trade_List_RMB__c;
<<<<<<< HEAD
                    }
                    upsertMap.put(key, detail1);
                }
            }
 
            Database.upsert(upsertMap.values(), true);
            if (deletetMap.size() > 0) {
                Database.delete(deletetMap.values(), true);
            }
        }
    }
    // 2018年8月14日 HWAG-B3D9UV 在进行NFM110处理时 跳过returnSet  start by 张玉山
 
    if (Trigger.isUpdate || Trigger.isInsert) {
        if (StaticParameter.EscapeConsumableOrderDetail2Trigger) {
            return;
        }
        // 2018年8月14日 HWAG-B3D9UV 在进行NFM110处理时 跳过returnSet  start by 张玉山
        if (returnSet.size() > 0) {
            Map<Id, Consumable_order__c> returnMap = new Map<Id, Consumable_order__c>(
                [
                    SELECT Id, RecordType.DeveloperName, Name
                    FROM Consumable_order__c
                    WHERE Id IN :returnSet
                ]
            );
            List<Consumable_orderdetails__c> detail1List = [
                SELECT Id, Name, Asset_Model_No__c, Consumable_count__c, Consumable_order__c
                FROM Consumable_orderdetails__c
                WHERE Consumable_order__c IN :returnSet
            ];
            Map<String, Consumable_orderdetails__c> detail1Map = new Map<String, Consumable_orderdetails__c>();
 
            for (Consumable_orderdetails__c detail1 : detail1List) {
                String key = '' + detail1.Consumable_order__c + detail1.Asset_Model_No__c;
                detail1Map.put(key, detail1);
            }
 
=======
                        
                    }
                    upsertMap.put(key, detail1);
                }
            }
 
            Database.upsert(upsertMap.values(), true);
            if(deletetMap.size()>0){
                Database.delete(deletetMap.values(),true);
            }
 
        }
    }
        // 2018年8月14日 HWAG-B3D9UV 在进行NFM110处理时 跳过returnSet  start by 张玉山
 
    if (trigger.isUpdate || trigger.isInsert){
        if (StaticParameter.EscapeConsumableOrderDetail2Trigger) {
        return ;
    }
    // 2018年8月14日 HWAG-B3D9UV 在进行NFM110处理时 跳过returnSet  start by 张玉山
        if (returnSet.size() > 0) {
            Map<Id, Consumable_order__c> returnMap = new Map<Id, Consumable_order__c>([select Id, RecordType.DeveloperName, Name from Consumable_order__c where Id in :returnSet]);
            List<Consumable_orderdetails__c> detail1List = [select Id, Name, Asset_Model_No__c, Consumable_count__c, Consumable_order__c from Consumable_orderdetails__c where Consumable_order__c in :returnSet];
            Map<String,Consumable_orderdetails__c> detail1Map = new Map<String,Consumable_orderdetails__c>();
            
            for (Consumable_orderdetails__c detail1 : detail1List) {
                String key = '' + detail1.Consumable_order__c + detail1.Asset_Model_No__c;
                detail1Map.put(key, detail1);
            }
 
>>>>>>> LEXCommunityLiJun
            returnSet.clear();
            for (Consumable_order__c returnCo : returnMap.values()) {
                if (returnCo.RecordType.DeveloperName == 'ReturnGoods') {
                    returnSet.add(returnCo.Id);
                }
            }
 
<<<<<<< HEAD
            AggregateResult[] results = [
                SELECT Consumable_Return_order__c, Asset_Model_No__c, count(Id) recordCount
                FROM Consumable_order_details2__c
                WHERE Consumable_Return_order__c IN :returnSet AND Dealer_Returned__c = TRUE
                GROUP BY Consumable_Return_order__c, Asset_Model_No__c
            ];
            Map<String, Integer> keyCount = new Map<String, Integer>();
            for (AggregateResult ar : results) {
                String key = '' + ar.get('Consumable_Return_order__c') + ar.get('Asset_Model_No__c');
                keyCount.put(key, Integer.valueOf(ar.get('recordCount')));
            }
            //Back up by DTT - Li Jun 2023-06-14 Start for reduce soql times
=======
            AggregateResult[] results = [select Consumable_Return_order__c, Asset_Model_No__c, count(Id) recordCount 
                                         from Consumable_order_details2__c 
                                         where Consumable_Return_order__c in :returnSet 
                                         and Dealer_Returned__c = true 
                                         group by Consumable_Return_order__c, Asset_Model_No__c];
            Map<String, Integer> keyCount = new Map<String, Integer>();
            for(AggregateResult ar: results){
                String key = '' + ar.get('Consumable_Return_order__c') + ar.get('Asset_Model_No__c');
                keyCount.put(key, Integer.valueOf(ar.get('recordCount')));
            }
             //Back up by DTT - Li Jun 2023-06-14 Start for reduce soql times
>>>>>>> LEXCommunityLiJun
            // 2018年8月9日 HWAG-B3D9UV  替代下面SQL select start by 张玉山
            // List<RecordType> rtList = new List<RecordType>();
            // for(RecordType rtl : allrtList){
            //     if('Detail1_ReturnGoods'.equals(rtl.DeveloperName)){
            //         rtList.add(rtl);
            //     }
            // }
            // 2018年8月9日 HWAG-B3D9UV  替代下面SQL select end by 张玉山
<<<<<<< HEAD
            //Back up by DTT - Li Jun 2023-06-14 End
=======
             //Back up by DTT - Li Jun 2023-06-14 End
>>>>>>> LEXCommunityLiJun
            /* 2018年8月9日 HWAG-B3D9UV  原获取 recordtype start by 张玉山
            List<RecordType> rtList = [select Id from RecordType where DeveloperName = 'Detail1_ReturnGoods' and SobjectType = 'Consumable_orderdetails__c'];
             2018年8月9日 HWAG-B3D9UV  原获取 recordtype end by 张玉山 */
 
<<<<<<< HEAD
            Id recordTypeId = Schema.SObjectType.Consumable_Orderdetails__c.getRecordTypeInfosByDeveloperName()
                .get('Detail1_ReturnGoods')
                .getRecordTypeId();
            //if (rtList.size() > 0) recordTypeId = rtList[0].Id;
 
            results = [
                SELECT Consumable_order__c, count(Id) noCount
                FROM Consumable_orderdetails__c
                WHERE Consumable_order__c IN :returnSet
                GROUP BY Consumable_order__c
            ];
            Map<Id, Integer> noCount = new Map<Id, Integer>();
            for (AggregateResult ar : results) {
                noCount.put((Id) ar.get('Consumable_order__c'), Integer.valueOf(ar.get('noCount')));
=======
            Id recordTypeId = Schema.SObjectType.Consumable_Orderdetails__c.getRecordTypeInfosByDeveloperName().get('Detail1_ReturnGoods').getRecordTypeId();
            //if (rtList.size() > 0) recordTypeId = rtList[0].Id;
 
            results = [select Consumable_order__c, count(Id) noCount 
                       from Consumable_orderdetails__c 
                       where Consumable_order__c in :returnSet 
                       group by Consumable_order__c];
            Map<Id, Integer> noCount = new Map<Id, Integer>();
            for(AggregateResult ar: results){
                noCount.put((Id)ar.get('Consumable_order__c'), Integer.valueOf(ar.get('noCount')));
>>>>>>> LEXCommunityLiJun
            }
 
            Map<String, Consumable_orderdetails__c> upsertMap = new Map<String, Consumable_orderdetails__c>();
            Map<String, Integer> updatedSaleCount = new Map<String, Integer>();
            Set<Id> updatedSaleId = new Set<Id>();
            Map<String, Integer> updatedShipmentCount = new Map<String, Integer>();
            Set<Id> updatedShipmentId = new Set<Id>();
            Map<String, Integer> updatedConInvoiceCount = new Map<String, Integer>();
            Map<String, String> shipmentIdMap = new Map<String, String>();
            Set<Id> updatedConInvoiceId = new Set<Id>();
            Integer returnCount = 0;
 
            for (Consumable_order_details2__c detail2 : Trigger.New) {
                Consumable_order_details2__c oldDetail2 = null;
<<<<<<< HEAD
                if (detail2.Consumable_Return_order__c == null)
                    continue;
 
                String key = '' + detail2.Consumable_Return_order__c + detail2.Asset_Model_No__c;
 
                if (Trigger.isUpdate)
                    oldDetail2 = Trigger.oldMap.get(detail2.Id);
=======
                if (detail2.Consumable_Return_order__c == null) continue;
 
                String key = '' + detail2.Consumable_Return_order__c + detail2.Asset_Model_No__c;
 
                if(Trigger.isUpdate) oldDetail2 = Trigger.oldMap.get(detail2.Id);
>>>>>>> LEXCommunityLiJun
                if (oldDetail2 != null) {
                    if (keyCount.containsKey(key)) {
                        returnCount += 1;
                        if (oldDetail2.Consumable_Sale_order__c != null) {
<<<<<<< HEAD
                            Integer sCount = updatedSaleCount.containsKey(
                                    '' + oldDetail2.Consumable_Sale_order__c + detail2.Asset_Model_No__c
                                )
                                ? updatedSaleCount.get('' + oldDetail2.Consumable_Sale_order__c + detail2.Asset_Model_No__c)
                                : 0;
                            sCount += 1;
                            updatedSaleCount.put('' + oldDetail2.Consumable_Sale_order__c + detail2.Asset_Model_No__c, sCount);
                            updatedSaleId.add(oldDetail2.Consumable_Sale_order__c);
                        }
                        if (oldDetail2.Consumable_Shipment_order__c != null) {
                            Integer sCount = updatedShipmentCount.containsKey(
                                    '' + oldDetail2.Consumable_Shipment_order__c + detail2.Asset_Model_No__c
                                )
                                ? updatedShipmentCount.get('' + oldDetail2.Consumable_Shipment_order__c + detail2.Asset_Model_No__c)
                                : 0;
                            sCount += 1;
 
                            updatedShipmentCount.put('' + oldDetail2.Consumable_Shipment_order__c + detail2.Asset_Model_No__c, sCount);
=======
                            Integer sCount = updatedSaleCount.containsKey(''+oldDetail2.Consumable_Sale_order__c+detail2.Asset_Model_No__c) ? updatedSaleCount.get(''+oldDetail2.Consumable_Sale_order__c+detail2.Asset_Model_No__c) : 0;
                            sCount += 1;
                            updatedSaleCount.put(''+oldDetail2.Consumable_Sale_order__c+detail2.Asset_Model_No__c, sCount);
                            updatedSaleId.add(oldDetail2.Consumable_Sale_order__c);
                        }
                        if (oldDetail2.Consumable_Shipment_order__c != null) {
                            Integer sCount = updatedShipmentCount.containsKey(''+oldDetail2.Consumable_Shipment_order__c+detail2.Asset_Model_No__c) ? updatedShipmentCount.get(''+oldDetail2.Consumable_Shipment_order__c+detail2.Asset_Model_No__c) : 0;
                            sCount += 1;
                            
                            updatedShipmentCount.put(''+oldDetail2.Consumable_Shipment_order__c+detail2.Asset_Model_No__c, sCount);
>>>>>>> LEXCommunityLiJun
                            updatedShipmentId.add(oldDetail2.Consumable_Shipment_order__c);
                        }
                        /*if (oldDetail2.Invoice_No__c != null) {
                            Integer sCount = updatedConInvoiceCount.containsKey(''+oldDetail2.Invoice_No__c+oldDetail2.Consumable_Sale_order__c+detail2.Asset_Model_No__c) ? updatedConInvoiceCount.get(''+oldDetail2.Invoice_No__c+oldDetail2.Consumable_Sale_order__c+detail2.Asset_Model_No__c) : 0;
                            sCount += 1;
                            if(oldDetail2.Consumable_Shipment_order__c == null){
                                shipmentIdMap.put(''+oldDetail2.Consumable_Sale_order__c+detail2.Asset_Model_No__c, oldDetail2.Consumable_Sale_order__c);
                                updatedConInvoiceCount.put(''+oldDetail2.Invoice_No__c+oldDetail2.Consumable_Sale_order__c+detail2.Asset_Model_No__c, sCount);
                            }else{
                                shipmentIdMap.put(''+oldDetail2.Consumable_Shipment_order__c+detail2.Asset_Model_No__c, oldDetail2.Consumable_Shipment_order__c);
                                updatedConInvoiceCount.put(''+oldDetail2.Invoice_No__c+oldDetail2.Consumable_Shipment_order__c+detail2.Asset_Model_No__c, sCount);
                            }
                            
                            updatedConInvoiceId.add(oldDetail2.Invoice_No__c);
                        }*/
                    }
                }
<<<<<<< HEAD
                if (upsertMap.get(key) != null)
                    continue;
=======
                if (upsertMap.get(key) != null) continue;
>>>>>>> LEXCommunityLiJun
                Integer count = keyCount.get(key);
 
                Consumable_orderdetails__c detail1 = detail1Map.get(key);
 
<<<<<<< HEAD
                if (detail1 == null)
                    detail1 = new Consumable_orderdetails__c();
=======
                if (detail1 == null) detail1 = new Consumable_orderdetails__c();
>>>>>>> LEXCommunityLiJun
                detail1.RrturnPro_count__c = count;
 
                if (detail1.Id == null) {
                    Consumable_order__c co = returnMap.get(detail2.Consumable_Return_order__c);
                    Integer index = noCount.get(co.Id);
<<<<<<< HEAD
                    if (index == null)
                        index = 0;
                    noCount.put(co.Id, index + 1);
                    String newName = co.Name + '-';
=======
                    if (index == null) index = 0;
                    noCount.put(co.Id, index + 1);
                    String newName = co.Name+'-';
>>>>>>> LEXCommunityLiJun
                    if (index < 99) {
                        newName += '0';
                    }
                    if (index < 9) {
                        newName += '0';
                    }
                    newName += String.valueOf(index + 1);
                    detail1.Name = newName;
                    //detail1.Asset_Model_No__c = detail2.Asset_Model_No__c;
                    detail1.Consumable_product__c = detail2.Consumable_product__c;
                    detail1.Consumable_order__c = co.Id;
                    detail1.RecordTypeId = recordTypeId;
                    //detail1.Consumable_principal__c = co.Id;
                    detail1.Intra_Trade_List_RMB__c = detail2.Intra_Trade_List_RMB__c;
<<<<<<< HEAD
=======
                    
>>>>>>> LEXCommunityLiJun
                }
                upsertMap.put(key, detail1);
            }
 
            Database.upsert(upsertMap.values(), true);
            // 2018年8月8日 HWAG-B3D9UV 减少 select 数量 start by 张玉山
<<<<<<< HEAD
            List<Consumable_orderdetails__c> Consumable_orderdetailsList = [
                SELECT Id, Name, Asset_Model_No__c, RrturnPro_count__c, Consumable_order__c, Invoicedet1_OD_link__c
                FROM Consumable_orderdetails__c
                WHERE
                    Consumable_order__c IN :updatedSaleId
                    OR Consumable_order__c IN :updatedShipmentId
                    OR Consumable_order__c IN :updatedConInvoiceId
            ];
 
            List<Consumable_orderdetails__c> detail1SaleList = new List<Consumable_orderdetails__c>();
 
            for (Consumable_orderdetails__c orderdetails : Consumable_orderdetailsList) {
                if (updatedSaleId.contains(orderdetails.id) && 'Sale'.equals(orderdetails.Consumable_order__r.RecordType.DeveloperName)) {
                    detail1SaleList.add(orderdetails);
                }
            }
 
            List<Consumable_orderdetails__c> detail1ShipmentList = new List<Consumable_orderdetails__c>();
 
            for (Consumable_orderdetails__c orderdetails : Consumable_orderdetailsList) {
                if (
                    updatedShipmentId.contains(orderdetails.id) &&
                    'Shipment'.equals(orderdetails.Consumable_order__r.RecordType.DeveloperName)
                ) {
                    detail1ShipmentList.add(orderdetails);
                }
            }
 
            List<Consumable_orderdetails__c> detail1ConInvoiceList = new List<Consumable_orderdetails__c>();
 
            for (Consumable_orderdetails__c orderdetails : Consumable_orderdetailsList) {
                if (
                    updatedConInvoiceId.contains(orderdetails.id) &&
                    'Order_Invoice'.equals(orderdetails.Consumable_order__r.RecordType.DeveloperName)
                ) {
=======
            List<Consumable_orderdetails__c> Consumable_orderdetailsList =
                        [select Id, Name, Asset_Model_No__c, RrturnPro_count__c, 
            Consumable_order__c,Invoicedet1_OD_link__c 
            from Consumable_orderdetails__c 
            where Consumable_order__c in :updatedSaleId  
                or Consumable_order__c in :updatedShipmentId 
                or Consumable_order__c in :updatedConInvoiceId];
            
            List<Consumable_orderdetails__c> detail1SaleList 
            = new List<Consumable_orderdetails__c>();
            
            for (Consumable_orderdetails__c orderdetails : Consumable_orderdetailsList){
                if(updatedSaleId.contains(orderdetails.id) 
                    && 'Sale'.equals(orderdetails.Consumable_order__r.RecordType.DeveloperName)){
                    detail1SaleList.add(orderdetails);
                }
            }
 
            List<Consumable_orderdetails__c> detail1ShipmentList 
            = new List<Consumable_orderdetails__c>();
 
            for (Consumable_orderdetails__c orderdetails : Consumable_orderdetailsList){
                if(updatedShipmentId.contains(orderdetails.id) 
                    && 'Shipment'.equals(orderdetails.Consumable_order__r.RecordType.DeveloperName)){
                    detail1ShipmentList.add(orderdetails);
                }
            }
 
            List<Consumable_orderdetails__c> detail1ConInvoiceList 
            = new List<Consumable_orderdetails__c>();
 
            for (Consumable_orderdetails__c orderdetails : Consumable_orderdetailsList){
                if(updatedConInvoiceId.contains(orderdetails.id) 
                    && 'Order_Invoice'.equals(orderdetails.Consumable_order__r.RecordType.DeveloperName)){
>>>>>>> LEXCommunityLiJun
                    detail1ConInvoiceList.add(orderdetails);
                }
            }
            // 2018年8月8日 HWAG-B3D9UV 减少 select 数量 end by 张玉山
            /* 2018年8月8日 HWAG-B3D9UV 注释 替换为上面的那个 end by 张玉山
            List<Consumable_orderdetails__c> detail1SaleList = 
            [select Id, Name, Asset_Model_No__c, RrturnPro_count__c, Consumable_order__c 
            from Consumable_orderdetails__c 
            where Consumable_order__c in :updatedSaleId 
            and Consumable_order__r.RecordType.DeveloperName = 'Sale'];
            
            List<Consumable_orderdetails__c> detail1ShipmentList = 
            [select Id, Name, Asset_Model_No__c, RrturnPro_count__c, Consumable_order__c 
            from Consumable_orderdetails__c 
            where Consumable_order__c in :updatedShipmentId 
            and Consumable_order__r.RecordType.DeveloperName = 'Shipment'];
            
            List<Consumable_orderdetails__c> detail1ConInvoiceList = 
            [select Id, Name, Asset_Model_No__c, RrturnPro_count__c, 
            Consumable_order__c,Invoicedet1_OD_link__c 
            from Consumable_orderdetails__c 
            where Consumable_order__c in :updatedConInvoiceId 
            and Consumable_order__r.RecordType.DeveloperName = 'Order_Invoice'];
            */
            List<Consumable_orderdetails__c> updateData = new List<Consumable_orderdetails__c>();
 
            for (Consumable_orderdetails__c detail1Sale : detail1SaleList) {
<<<<<<< HEAD
                Integer count = updatedSaleCount.get('' + detail1Sale.Consumable_order__c + detail1Sale.Asset_Model_No__c);
=======
                Integer count = updatedSaleCount.get(''+detail1Sale.Consumable_order__c+detail1Sale.Asset_Model_No__c);
>>>>>>> LEXCommunityLiJun
                if (count != null) {
                    detail1Sale.RrturnPro_count__c += count;
                    updateData.add(detail1Sale);
                }
<<<<<<< HEAD
            }
            for (Consumable_orderdetails__c detail1Shipment : detail1ShipmentList) {
                Integer count = updatedShipmentCount.get('' + detail1Shipment.Consumable_order__c + detail1Shipment.Asset_Model_No__c);
=======
                
            }
            for (Consumable_orderdetails__c detail1Shipment : detail1ShipmentList) {
                Integer count = updatedShipmentCount.get(''+detail1Shipment.Consumable_order__c+detail1Shipment.Asset_Model_No__c);
>>>>>>> LEXCommunityLiJun
                if (count != null) {
                    detail1Shipment.RrturnPro_count__c += count;
                    updateData.add(detail1Shipment);
                }
            }
            for (Consumable_orderdetails__c detail1ConInvoice : detail1ConInvoiceList) {
<<<<<<< HEAD
                Integer count = updatedConInvoiceCount.get(
                    '' +
                        detail1ConInvoice.Consumable_order__c +
                        detail1ConInvoice.Invoicedet1_OD_link__c +
                        detail1ConInvoice.Asset_Model_No__c
                );
                if (
                    count != null &&
                    (detail1ConInvoice.Invoicedet1_OD_link__c ==
                    shipmentIdMap.get('' + detail1ConInvoice.Invoicedet1_OD_link__c + detail1ConInvoice.Asset_Model_No__c))
                ) {
=======
                Integer count = updatedConInvoiceCount.get(''+detail1ConInvoice.Consumable_order__c+detail1ConInvoice.Invoicedet1_OD_link__c+detail1ConInvoice.Asset_Model_No__c);
                if (count != null && (detail1ConInvoice.Invoicedet1_OD_link__c  == shipmentIdMap.get(''+detail1ConInvoice.Invoicedet1_OD_link__c+detail1ConInvoice.Asset_Model_No__c)) ) {
>>>>>>> LEXCommunityLiJun
                    detail1ConInvoice.RrturnPro_count__c += count;
                    //updateData.add(detail1ConInvoice);
                }
            }
 
            Database.upsert(updateData, true);
        }
<<<<<<< HEAD
    }
}
=======
 
    }
}
>>>>>>> LEXCommunityLiJun