|
@@ -347,11 +347,12 @@ export default {
|
347
|
347
|
return 0
|
348
|
348
|
}
|
349
|
349
|
},
|
350
|
|
- getEndWarehouseInfo(val,val3,val1,val2){
|
|
350
|
+ getEndWarehouseInfo(val,val3,val1,val2,val4){
|
351
|
351
|
var count = 0
|
352
|
352
|
var count_one = 0
|
353
|
353
|
var count_two = 0
|
354
|
354
|
var count_three =0
|
|
355
|
+ var count_four = 0
|
355
|
356
|
var all_count = 0
|
356
|
357
|
if(val!=null && val.length >0){
|
357
|
358
|
for(let i=0;i<val.length;i++){
|
|
@@ -373,7 +374,12 @@ export default {
|
373
|
374
|
count_two +=val2[i].count
|
374
|
375
|
}
|
375
|
376
|
}
|
376
|
|
- all_count = count- count_three + count_one - count_two
|
|
377
|
+ if(val4!=null&&val4.length >0){
|
|
378
|
+ for(let i=0;i<val4.length;i++){
|
|
379
|
+ count_four +=val4[i].count
|
|
380
|
+ }
|
|
381
|
+ }
|
|
382
|
+ all_count = count- count_three + count_one - count_two + count_four
|
377
|
383
|
if(all_count >0){
|
378
|
384
|
return all_count
|
379
|
385
|
}else{
|